better treatment of dependencies

diff --git a/debian/changelog b/debian/changelog
index f4c9614d4ebef47d54d56ed7c7ca48b6f78a4a78..34709a88db41c86e6b494c39c647b08433182c00 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ chiark-utils (4.1.21) unstable; urgency=low
     and refer to the FSF and GNU websites instead.
   * update copyright dates in backup/.
   * Fix some out of date email addresses.
+  * summer and watershed's shlibdeps go into Recommends since
+    bits of the package are useable without them.
+  * seddery libgmp3 dependencies to libgmp3 | libgmp3c2 since
+    we are C and not C++ and care nothing for C++ ABI transitions.
+  * Document the dependency relationships in the Description.
 
  -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 21 Sep 2007 21:58:33 +0100
 

diff --git a/debian/control b/debian/control
index b68e74213db062a7a7cc8827d36dc2dc381253cf..006ff680a0eb7e4d461a618434631db5a3cfddf8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -61,6 +61,7 @@ Description: readbuffer/writebuffer: prevents tape drive seesawing, etc.
 Package: chiark-utils-bin
 Architecture: any
 Depends: ${shlibs:Depends}
+Recommends: ${shlibs:Recommends}
 Suggests: ${shlibs:Suggests}
 Section: utils
 Priority: extra
@@ -82,6 +83,9 @@ Description: chiark system administration utilities
  idempotent command.  (This is the same utility as shipped separately
  in Ubuntu's udev, but with slightly different defaults and a
  different install location.)
+ .
+ summer and watershed require the installation of the Recommended
+ crypto libraries; xacpi-simple needs the Suggested X libraries.
 
 Package: chiark-really
 Section: admin

diff --git a/debian/rules b/debian/rules
index e0c537338315b9d12b10782825543361f97f599a..39826a257e786f72ce9024a14265542d5ed782b3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -115,9 +115,21 @@ binary-arch:       checkroot build binary-prep
                $t/chiark-rwbuffer/usr/bin/*
        dpkg-shlibdeps -Tdebian/sv-chiark-really \
                $t/chiark-really/usr/sbin/*
-       dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin \
-               $t/chiark-utils-bin/usr/bin/[^x]* \
-               -dSuggests $t/chiark-utils-bin/usr/bin/x*
+       set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
+               case "$$f" in \
+               */xacpi-simple)         d=Suggests      ;; \
+               */watershed|*/summer)   d=Recommends    ;; \
+               *)                      d=Depends       ;; \
+               esac; \
+               a="$$a -d$$d $$f"; \
+           done; set -x; \
+           dpkg-shlibdeps -Tdebian/sv-chiark-utils-bin $$a
+       perl -i~ -pe '                                          \
+               next unless m/^shlibs:/;                        \
+               s/$$/,/; s/=/=, /;                              \
+               s/, libgmp3(?:c2)?,/, libgmp3 | libgmp3c2,/;    \
+               s/=, /=/; s/,$$//;                              \
+               ' debian/sv-*[!~]
        set -e; for p in $(packages_arch); \
                do debian/rules binary-one p=$$p; done