[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxmu: Changes to 'debian-unstable'



 debian/changelog |    2 ++
 debian/rules     |   25 ++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 1bca2ffd31fa433a07e94413fe86805479bde11a
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Mar 14 19:42:45 2010 +0100

    Don't pass both -s and -Nfoo/-pfoo to dh_strip.
    
    This resulted in an empty libxmuu1-dbg.
    Thanks to Luca Falavigna for the report.

diff --git a/debian/changelog b/debian/changelog
index 28b695f..7f2ea30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libxmu (2:1.0.5-2) UNRELEASED; urgency=low
   * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
     good reason.  Thanks, Colin Watson!
   * Remove myself from Uploaders
+  * Don't pass both -s and -Nfoo/-pfoo to dh_strip.  This resulted in an empty
+    libxmuu1-dbg.  Thanks to Luca Falavigna for the report.
 
  -- Julien Cristau <jcristau@debian.org>  Sat, 16 Jan 2010 16:47:39 +0000
 
diff --git a/debian/rules b/debian/rules
index 881508a..8743212 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,26 +70,25 @@ install: build
 	cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
-binary-arch: DH_OPTIONS=-s
 binary-arch: install
 	dh_testdir
 	dh_testroot
 
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp --list-missing -Xusr/include -X.la
-	dh_installchangelogs ChangeLog
-	dh_link
+	dh_installdocs -s
+	dh_install -s --sourcedir=debian/tmp --list-missing -Xusr/include -X.la
+	dh_installchangelogs -s ChangeLog
+	dh_link -s
 	dh_strip -Nlibxmu6 -Nlibxmuu1
 	dh_strip -plibxmu6 --dbg-package=libxmu6-dbg
 	dh_strip -plibxmuu1 --dbg-package=libxmuu1-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s
+	dh_shlibdeps -s
+	dh_installdeb -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 # Build architecture-independent files here.
 binary-indep: DH_OPTIONS=-i


Reply to: