chiark / gitweb /
* use dh_strip rather than doing it ourselves. Closes #436624.
authorianmdlvl <ianmdlvl>
Sat, 22 Sep 2007 01:29:54 +0000 (01:29 +0000)
committerianmdlvl <ianmdlvl>
Sat, 22 Sep 2007 01:29:54 +0000 (01:29 +0000)
debian/changelog
debian/control
debian/rules
settings.make

index ada9c23..ee4363d 100644 (file)
@@ -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.
 
  --
 
index b5593de..a8822a0 100644 (file)
@@ -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
index 71c4f17..7ac91e2 100755 (executable)
@@ -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 \
index 52a4f73..d008a35 100644 (file)
@@ -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