Do not run dpkg-shlibdeps on adns and nettle plugins. Use correct syntax for avoidin...

diff --git a/debian/README b/debian/README
index badaab4bfb26a213232b4d1a6440c097061ecaa6..7102c8aac8bc9bf5af794199ae32aa87cc835cea 100644 (file)
--- a/debian/README
+++ b/debian/README
@@ -34,3 +34,11 @@ all of the extensions.  It is a set of common routines which will be
 loaded automatically when required.  Each extension must be loaded
 explicitly with the Tcl `load' command to bring the additional
 commands into the Tcl command namespace.
+
+To use the adns and nettle bindings you need to have the appropriate
+libraries installed too, although these are not listed as
+dependencies.  Programs which use these extensions should list
+dependencies on (currently) libadns1 and libnettle2.  Regrettably,
+there is no clear way to get the dependencies completely correct in
+the case where chiark-tcl is rebuilt against some other versions of
+adns and/or nettle.

diff --git a/debian/changelog b/debian/changelog
index 24b64f685557b19b7241a2329b9ae73c53e52a6d..6b91a92e3b1b0bde223534435aa77137f85dbf38 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+chiark-tcl (1.0.1) unstable; urgency=low
+
+  * Do not run dpkg-shlibdeps on adns and nettle plugins.
+    This prevents them turning up in Depends - see the README.
+  * Use correct syntax for avoiding compressing doc/*/*.[ch].txt.
+
+ --
+
 chiark-tcl (1.0.0) unstable; urgency=low
 
   * Initial release.  Extensions included:  adns cdb crypto hbytes

diff --git a/debian/control b/debian/control
index d5dcde9518f82a78103b644e4ff752aa584222be..ed9f4a13b5a7f56f0c6a296a87bfcd8f3364c855 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: Tcl interfaces for adns, cdb, crypto, etc.
   * hbytes: bytestrings with hex as string representation but efficient
  To make sensible use of these you will need a version of Tcl installed
  (this package is compatible with at least Tcl 8.0 to 8.4 inclusive).
- To use the adns, cdb and nettle bindings you need to have the
+ To use the adns and nettle bindings you need to have the
  appropriate libraries installed too.
 Depends: ${shlibs:Depends}
 

diff --git a/debian/rules b/debian/rules
index c3e4eeed108e0d2766ea63bac1298623f2f258a1..323a3f37535646472035b34a94a172f689f0e39b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -65,10 +65,10 @@ binary-arch:        checkroot build
        dh_installchangelogs
        dh_strip
 
-       dh_shlibdeps
+       dh_shlibdeps -Xchiark_tcl_adns -Xchiark_tcl_crypto
 
        # be consistent about what we compress:
-       dh_compress -X'*.[ch].txt'
+       dh_compress -X.c.txt -X.h.txt
 
        dh_fixperms
        dh_gencontrol