From 76415873c03f50b8d952db149fe5b6b7eda09a05 Mon Sep 17 00:00:00 2001
From: ianmdlvl <ianmdlvl>
Date: Sat, 22 Sep 2007 01:29:54 +0000
Subject: [PATCH] * use dh_strip rather than doing it ourselves.  Closes
 #436624.

---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 3 ++-
 settings.make    | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ada9c23..ee4363d 100644
--- 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 b5593de..a8822a0 100644
--- 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 71c4f17..7ac91e2 100755
--- 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 52a4f73..d008a35 100644
--- 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
-- 
2.30.2