* use dh_strip rather than doing it ourselves. Closes #436624.

diff --git a/debian/changelog b/debian/changelog
index ada9c238916ecd02306d8ef0d8803146b24821fc..ee4363d7ef3272e1f3957c55c3e160898a6ba41e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ chiark-utils (4.1.22) unstable; urgency=low
   * backup-snaprsync passes -B to summer.
   * copyright notices for various scripts.
   * many scripts mentioned in Description and debian/copyright.
+  * use dh_strip rather than doing it ourselves.  Closes #436624.
 
  --
 

diff --git a/debian/control b/debian/control
index b5593deacb52704f2f0eb1aff0a95ad9194cb6e6..a8822a0f0b127cce343a508c17764beb4f16b078 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: chiark-utils
 Section: admin
 Priority: extra
 Maintainer: Ian Jackson <ian@chiark.greenend.org.uk>
-Build-Depends: libx11-dev, libnettle-dev
+Build-Depends: libx11-dev, libnettle-dev, debhelper
 Standards-Version: 3.2.1.0
 
 Package: chiark-backup

diff --git a/debian/rules b/debian/rules
index 71c4f17f3bc6bb6d36269b001c879ce72cbe2566..7ac91e218d491536c56eb651c445001d5c09e5bc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,6 @@ binary-prep:
        install -d $t/chiark-really/usr/share/man/man8
        cd $t/chiark-utils-bin/usr/sbin && \
                mv really $t/chiark-really/usr/sbin/
-       strip --strip-unneeded --remove-section .note --remove-section .comment $t/chiark-really/usr/sbin/really
        cd $t/chiark-utils-bin/usr/share/man/man8 && \
                mv really.8 $t/chiark-really/usr/share/man/man8/
        rm      $t/chiark-utils-bin/usr/sbin/trivsoundd \
@@ -111,6 +110,8 @@ binary-indep:       checkroot build binary-prep
 
 binary-arch:   checkroot build binary-prep
        $(checkdir)
+       set -ex; for p in chiark-really chiark-utils-bin chiark-rwbuffer; do \
+               dh_strip -p$$p -Pdebian/tmp/$$p; done
        dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer \
                $t/chiark-rwbuffer/usr/bin/*
        dpkg-shlibdeps -Tdebian/sv-chiark-really \

diff --git a/settings.make b/settings.make
index 52a4f7373b2f164e1d8e61e8bfb5c95dfb5a0ec2..d008a354adf29fdd1404c3b18a6f7e57038541da 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -48,8 +48,10 @@ mandir=${prefix}/man
 man1dir=${mandir}/man1
 man8dir=${mandir}/man8
 
+# INSTALL_PROGRAM_STRIP_OPT=-s
+
 INSTALL=               install -c
 INSTALL_SHARE=         $(INSTALL) -m 644 -o root -g $(SYSTEM_GROUP)
 INSTALL_SCRIPT=                $(INSTALL) -m 755 -o root -g $(SYSTEM_GROUP)
-INSTALL_PROGRAM=       $(INSTALL_SCRIPT) -s
+INSTALL_PROGRAM=       $(INSTALL_SCRIPT) $(INSTALL_PROGRAM_STRIP_OPT)
 INSTALL_DIRECTORY=     $(INSTALL) -m 2755 -o root -g $(SYSTEM_GROUP) -d