From c1372c51e9a43de7cb4669458dfdf9b036ae60d8 Mon Sep 17 00:00:00 2001
From: ianmdlvl <ianmdlvl>
Date: Fri, 21 Sep 2007 21:48:31 +0000
Subject: [PATCH] better treatment of dependencies

---
 debian/changelog |  5 +++++
 debian/control   |  4 ++++
 debian/rules     | 18 +++++++++++++++---
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4c9614..34709a8 100644
--- 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 b68e742..006ff68 100644
--- 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 e0c5373..39826a2 100755
--- 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
 
-- 
2.30.2