[Pkg-voip-commits] r4520 - in /pwlib-titan/trunk/debian: changelog rules

[kilian at alioth.debian.org]

Author: kilian
Date: Wed Sep 19 10:33:48 2007
New Revision: 4520

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4520
Log:
* Remove circular dependencies from plugins.
* Remove implicit rules-ignores-make-clean error
* Fix dh_strip call to use $(PACKAGE) for all packs properly.

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

Modified: pwlib-titan/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/changelog?rev=4520&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/changelog (original)
+++ pwlib-titan/trunk/debian/changelog Wed Sep 19 10:33:48 2007
@@ -5,18 +5,20 @@
 
   [ Kilian Krause ]
   * Add dpkg-dev (>= 1.13.19) to Build-Deps to allow use of binary:Version.
-  * Remove circular dependencies from plugins. (Closes: #437383)
+  * Remove circular dependencies from plugins.
   * Remove get-orig-source until upstream provides the tarball on their
     website again.
   * Fixup debian/watch.
   * Remove compat symlinks.
+  * Remove implicit rules-ignores-make-clean error
+  * Fix dh_strip call to use $(PACKAGE) for all packs properly.
 
   [ Faidon Liambotis ]
   * Adapt shlibs to depend on the upstream's version number and not the Debian
     version number, since we don't extend the ABI. This also imitates
     debhelper's behavior.
 
- -- Kilian Krause <kilian at debian.org>  Fri, 24 Aug 2007 16:57:29 +0200
+ -- Kilian Krause <kilian at debian.org>  Wed, 19 Sep 2007 12:33:35 +0200
 
 pwlib (1.10.7~dfsg1-4) unstable; urgency=high
 

Modified: pwlib-titan/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib-titan/trunk/debian/rules?rev=4520&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/rules (original)
+++ pwlib-titan/trunk/debian/rules Wed Sep 19 10:33:48 2007
@@ -152,28 +152,28 @@
 clean: clean-patched unpatch
 clean-patched:
 	$(checkdir)
-	-rm -f build-arch-stamp build-indep-stamp patch-stamp
-	-if [ -f Makefile ];then \
+	rm -f build-arch-stamp build-indep-stamp patch-stamp
+	if [ -f Makefile ];then \
 		$(MAKE) PWLIBDIR=$(CURDIR) clean || true ; \
 		$(MAKE) PWLIBDIR=$(CURDIR) -C samples/hello_world/ clean||true ; \
 	fi
-	-rm -rf samples/hello_world/obj_*
-	-rm -f include/ptbuildopts.h
-	-rm -f Makefile config.log config.status autotools
-	-rm -f config.sub config.guess plugins/config.sub plugins/config.guess
-	-rm -f plugins/Makefile plugins/config.status plugins/config.log
-	-rm -rf lib
-	-rm -f make/ptbuildopts.mak make/ptlib-config include/ptbuildopts.h
-	-rm -rf plugins/pwlib*
-	-rm -f  plugins/Makefile plugins/config.status plugins/config.log
-	-rm -f `find . -name "*~"`
-	-rm -rf `find debian/* -type d -name "libpt-*"`
-	-rm -rf  debian/files* core
-	-rm -f debian/*substvars
-	-rm -f debian/*.debhelper
-	-rm -rf html
-	-rm -f debian/libpt-*.*.docs debian/libpt-*.*.manpages debian/libpt-*.*.dirs
-	-rm -f core a.out
+	rm -rf samples/hello_world/obj_*
+	rm -f include/ptbuildopts.h
+	rm -f Makefile config.log config.status autotools
+	rm -f config.sub config.guess plugins/config.sub plugins/config.guess
+	rm -f plugins/Makefile plugins/config.status plugins/config.log
+	rm -rf lib
+	rm -f make/ptbuildopts.mak make/ptlib-config include/ptbuildopts.h
+	rm -rf plugins/pwlib*
+	rm -f  plugins/Makefile plugins/config.status plugins/config.log
+	rm -f `find . -name "*~"`
+	rm -rf `find debian/* -type d -name "libpt-*"`
+	rm -rf  debian/files* core
+	rm -f debian/*substvars
+	rm -f debian/*.debhelper
+	rm -rf html
+	rm -f debian/libpt-*.*.docs debian/libpt-*.*.manpages debian/libpt-*.*.dirs
+	rm -f core a.out
 	dh_clean
 
 install: install-indep install-arch
@@ -330,7 +330,7 @@
 	dh_testroot
 	
 ifneq (4,$(DH_COMPAT))
-	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libpt-$(SHLIBSVER)-dbg
+	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-dbg
 	# can't ship those in libpt-$(SHLIBSVER)-dbg due to namespace overlap
 	dh_strip -p$(PACKAGE)-ptrace $(STRIP_EXCLUDES) -N$(PACKAGE)-develop --dbg-package=$(PACKAGE)-ptrace
 	dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) -N$(PACKAGE)-ptrace --dbg-package=$(PACKAGE)-develop
@@ -339,11 +339,11 @@
 	# we need to workaround that manually
 	dh_strip --exclude=libpt_d --keep-debug
 
-	for pack in $(PACKAGE) libpt-$(SHLIBSVER)-plugins-alsa libpt-$(SHLIBSVER)-plugins-oss \
-		libpt-$(SHLIBSVER)-plugins-v4l libpt-$(SHLIBSVER)-plugins-v4l2 libpt-$(SHLIBSVER)-plugins-avc \
-		libpt-$(SHLIBSVER)-plugins-dc ; \
+	for pack in $(PACKAGE) $(PACKAGE)-plugins-alsa $(PACKAGE)-plugins-oss \
+		$(PACKAGE)-plugins-v4l $(PACKAGE)-plugins-v4l2 $(PACKAGE)-plugins-avc \
+		$(PACKAGE)-plugins-dc ; \
 	do \
-		cp -af debian/$$pack/usr/lib/debug debian/libpt-$(SHLIBSVER)-dbg/usr/lib && \
+		cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
 			rm -rf debian/$$pack/usr/lib/debug; \
 	done
 endif