[Pkg-voip-commits] r4519 - in /openh323-titan/trunk/debian: changelog rules

[kilian at alioth.debian.org]

Author: kilian
Date: Wed Sep 19 10:31:01 2007
New Revision: 4519

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4519
Log:
* Fix implicit rules-ignore-make-clean error.
* Adjust dh_strip call to new package namepace

Modified:
    openh323-titan/trunk/debian/changelog
    openh323-titan/trunk/debian/rules

Modified: openh323-titan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/changelog?rev=4519&op=diff
==============================================================================
--- openh323-titan/trunk/debian/changelog (original)
+++ openh323-titan/trunk/debian/changelog Wed Sep 19 10:31:01 2007
@@ -18,8 +18,10 @@
   * Update backport hooks.
   * Adjust debhelper build-dep to compat level in debian/compat.
   * Build-Depend on PWLib Titan release.
-
- -- Kilian Krause <kilian at debian.org>  Tue, 28 Aug 2007 14:12:10 +0200
+  * Fix implicit rules-ignore-make-clean error.
+  * Adjust dh_strip call to new package namepace
+
+ -- Kilian Krause <kilian at debian.org>  Wed, 19 Sep 2007 12:30:34 +0200
 
 openh323 (1.18.0.dfsg-4) unstable; urgency=high
 

Modified: openh323-titan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openh323-titan/trunk/debian/rules?rev=4519&op=diff
==============================================================================
--- openh323-titan/trunk/debian/rules (original)
+++ openh323-titan/trunk/debian/rules Wed Sep 19 10:31:01 2007
@@ -111,24 +111,24 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	-rm -f build-arch-stamp build-indep-stamp patch-stamp
-	-rm -f config.status config.log autotools
-	-if [ -f Makefile ];then \
+	rm -f build-arch-stamp build-indep-stamp patch-stamp
+	rm -f config.status config.log autotools
+	if [ -f Makefile ];then \
 		$(MAKE) $(MAKE_BUILD_PARAM) optclean clean ;\
 		$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
 	fi
-	-rm -rf samples/simple/obj*
-	-rm -f Makefile openh323u.mak include/openh323buildopts.h
-	-rm -rf lib
-	-rm -f src/speex/libspeex/Makefile
-	-rm -rf html
-	-rm -f `find . -name "*~"`
-	-rm -rf `find debian/* -type d -name libopenh323-*` debian/files* core
-	-rm -rf debian/simph323-titan/
-	-rm -f debian/*substvars
-	-rm -f debian/*.debhelper
-	-rm -f debian/libopenh323-*.*.docs debian/libopenh323-*.*.dirs
-	-rm -f config.sub config.guess plugins/config.sub plugins/config.guess
+	rm -rf samples/simple/obj*
+	rm -f Makefile openh323u.mak include/openh323buildopts.h
+	rm -rf lib
+	rm -f src/speex/libspeex/Makefile
+	rm -rf html
+	rm -f `find . -name "*~"`
+	rm -rf `find debian/* -type d -name libopenh323-*` debian/files* core
+	rm -rf debian/simph323-titan/
+	rm -f debian/*substvars
+	rm -f debian/*.debhelper
+	rm -f debian/libopenh323-*.*.docs debian/libopenh323-*.*.dirs
+	rm -f config.sub config.guess plugins/config.sub plugins/config.guess
 	dh_clean
 
 install: install-indep install-arch
@@ -217,20 +217,20 @@
 	dh_testdir
 	dh_testroot
 ifneq (4,$(DH_COMPAT))
-	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-develop --dbg-package=libopenh323-dbg
+	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-dbg
 	# can't ship those in libopenh323-dbg due to namespace overlap
-	dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) --dbg-package=libopenh323-develop
+	dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) --dbg-package=$(PACKAGE)-develop
 else
 	# As dh_strip does not work fine for multiple binary package
 	# we need to workaround that manually
 	dh_strip --exclude=libopenh323_d --keep-debug
 
 	for pack in $(PACKAGE) simph323-titan ; do \
-		cp -af debian/$$pack/usr/lib/debug debian/libopenh323-dbg/usr/lib && \
+		cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
 			rm -rf debian/$$pack/usr/lib/debug; \
 	done
 	for pack in -develop;do \
-		cp -af debian/$(PACKAGE)$$pack/usr/lib/debug debian/libopenh323-dbg$$pack/usr/lib && \
+		cp -af debian/$(PACKAGE)$$pack/usr/lib/debug debian/$(PACKAGE)-dbg$$pack/usr/lib && \
 			rm -rf debian/$(PACKAGE)$$pack/usr/lib/debug; \
 	done
 endif