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

kilian at alioth.debian.org kilian at alioth.debian.org
Sat Sep 22 12:44:36 UTC 2007 

Author: kilian
Date: Sat Sep 22 12:44:36 2007
New Revision: 4562

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4562
Log:
Switch from libpt-$(SHLIBSVER) to $(PACKAGE) for making the whole thing a bit more legible.

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=4562&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/changelog (original)
+++ pwlib-titan/trunk/debian/changelog Sat Sep 22 12:44:36 2007
@@ -19,7 +19,7 @@
     version number, since we don't extend the ABI. This also imitates
     debhelper's behavior.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 22 Sep 2007 12:08:50 +0200
+ -- Kilian Krause <kilian at debian.org>  Sat, 22 Sep 2007 14:43:52 +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=4562&op=diff
==============================================================================
--- pwlib-titan/trunk/debian/rules (original)
+++ pwlib-titan/trunk/debian/rules Sat Sep 22 12:44:36 2007
@@ -11,7 +11,7 @@
 endif
 
 SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-PACKAGE=libpt-$(SHLIBSVER)
+PACKAGE=$(PACKAGE)
 
 CFLAGS := -g
 
@@ -146,7 +146,7 @@
 build-indep: build-indep-stamp
 build-indep-stamp:
 	$(MAKE) docs
-	cp debian/libpt-doc.docs debian/libpt-$(SHLIBSVER)-doc.docs
+	cp debian/libpt-doc.docs debian/$(PACKAGE)-doc.docs
 	touch build-indep-stamp
 
 clean: clean-patched unpatch
@@ -198,80 +198,80 @@
 	install -m 755 lib/debug/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
 	cp debian/libpt.docs debian/$(PACKAGE).docs
 
-#	libpt-$(SHLIBSVER)-dbg (will be filled by dh_strip)
-	cp debian/libpt-dbg.dirs debian/libpt-$(SHLIBSVER)-dbg.dirs
-
-#	libpt-$(SHLIBSVER)-dev
-	ln -s libpt.so.$(SHLIBSVER) debian/libpt-$(SHLIBSVER)-dev/usr/lib/libpt.so
-	ln -s libpt.so.$(SHLIBSVER) debian/libpt-$(SHLIBSVER)-dev/usr/lib/libpt.so.$(VER_MAJOR).$(VER_MINOR)
-	ln -s libpt.so.$(SHLIBSVER) debian/libpt-$(SHLIBSVER)-dev/usr/lib/libpt.so.$(VER_MAJOR)
-
-	cp -vr include/pt* debian/libpt-$(SHLIBSVER)-dev/usr/include
-	cp -vr make `pwd`/debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib
+#	$(PACKAGE)-dbg (will be filled by dh_strip)
+	cp debian/libpt-dbg.dirs debian/$(PACKAGE)-dbg.dirs
+
+#	$(PACKAGE)-dev
+	ln -s libpt.so.$(SHLIBSVER) debian/$(PACKAGE)-dev/usr/lib/libpt.so
+	ln -s libpt.so.$(SHLIBSVER) debian/$(PACKAGE)-dev/usr/lib/libpt.so.$(VER_MAJOR).$(VER_MINOR)
+	ln -s libpt.so.$(SHLIBSVER) debian/$(PACKAGE)-dev/usr/lib/libpt.so.$(VER_MAJOR)
+
+	cp -vr include/pt* debian/$(PACKAGE)-dev/usr/include
+	cp -vr make `pwd`/debian/$(PACKAGE)-dev/usr/share/pwlib
 	sed -i -e 's#$$(PWLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
-	    -e 's#$$(PWLIBDIR)/lib#/usr/lib#g' debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/make/unix.mak
-	# copy static opt version to libpt-$(SHLIBSVER)-dev
-	install -m 755 lib/notrace/libpt_s.a debian/libpt-$(SHLIBSVER)-dev/usr/lib
-	install -m 755 lib/opt/libpt_s.a debian/libpt-$(SHLIBSVER)-dev/usr/lib/libpt_r_s.a
-	install -m 755 lib/debug/libpt_s.a debian/libpt-$(SHLIBSVER)-dev/usr/lib/libpt_d_s.a
-	find debian/libpt-$(SHLIBSVER)-dev/usr/include -type f -exec chmod 644 {} \;
-	# ptlib-config in libpt-$(SHLIBSVER)-dev
+	    -e 's#$$(PWLIBDIR)/lib#/usr/lib#g' debian/$(PACKAGE)-dev/usr/share/pwlib/make/unix.mak
+	# copy static opt version to $(PACKAGE)-dev
+	install -m 755 lib/notrace/libpt_s.a debian/$(PACKAGE)-dev/usr/lib
+	install -m 755 lib/opt/libpt_s.a debian/$(PACKAGE)-dev/usr/lib/libpt_r_s.a
+	install -m 755 lib/debug/libpt_s.a debian/$(PACKAGE)-dev/usr/lib/libpt_d_s.a
+	find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
+	# ptlib-config in $(PACKAGE)-dev
 	# changing build/machine dependent data in ptlib-config
-	-rm -f `find debian/libpt-$(SHLIBSVER)-dev/ -name ptlib-config`
+	-rm -f `find debian/$(PACKAGE)-dev/ -name ptlib-config`
 	sed -e 's#^OSRELEASE=.*#OSRELEASE=\"\"#g' \
 	    -e 's#^LIBDIR=.*#LIBDIR=\"/usr/lib\"#g' \
 	    -e 's#^\(CCFLAGS=.*-DP_LINUX\)='$(UNAME_R)'\(.*\)\"#\1 \2 -DPHAS_TEMPLATES -I/usr/include/ptlib -I/usr/include/ptlib/unix\"#g' \
 	    -e 's#^\(LIBS=.*\)\"#\1 -lpt\"#g' \
-	    make/ptlib-config > debian/libpt-$(SHLIBSVER)-dev/usr/bin/ptlib-config
-	chmod 0755 debian/libpt-$(SHLIBSVER)-dev/usr/bin/ptlib-config
-	ln -s ../../../bin/ptlib-config debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/make/
+	    make/ptlib-config > debian/$(PACKAGE)-dev/usr/bin/ptlib-config
+	chmod 0755 debian/$(PACKAGE)-dev/usr/bin/ptlib-config
+	ln -s ../../../bin/ptlib-config debian/$(PACKAGE)-dev/usr/share/pwlib/make/
 	# erasing build host specific && unnecessary stuff off ptbuildopts.mak
-	-rm -f `find debian/libpt-$(SHLIBSVER)-dev/ -name ptbuildopts.mak`
+	-rm -f `find debian/$(PACKAGE)-dev/ -name ptbuildopts.mak`
 	sed -e 's#^PWLIBDIR.*#PWLIBDIR = /usr/share/pwlib#g' \
 	    -e 's#^OSRELEASE.*#OSRELEASE =#g' \
 	    -e 's#^\(STDCCFLAGS.*-DP_LINUX\)='$(UNAME_R)'\(.*\)#\1 \2#g' \
-	    make/ptbuildopts.mak > debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/make/ptbuildopts.mak
+	    make/ptbuildopts.mak > debian/$(PACKAGE)-dev/usr/share/pwlib/make/ptbuildopts.mak
 	# for using /usr/share/pwlib as a single PWLIBDIR
-	ln -s ../../lib debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib
-
-	cp version.h debian/libpt-$(SHLIBSVER)-dev/usr/include/ptlib
-	ln -s ../../include/ptlib/version.h debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib
-	ln -s ../../../include/ptbuildopts.h debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/include
-	ln -s ../../../include/ptlib.h debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/include
-	ln -s ../../../include/ptlib debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/include
+	ln -s ../../lib debian/$(PACKAGE)-dev/usr/share/pwlib
+
+	cp version.h debian/$(PACKAGE)-dev/usr/include/ptlib
+	ln -s ../../include/ptlib/version.h debian/$(PACKAGE)-dev/usr/share/pwlib
+	ln -s ../../../include/ptbuildopts.h debian/$(PACKAGE)-dev/usr/share/pwlib/include
+	ln -s ../../../include/ptlib.h debian/$(PACKAGE)-dev/usr/share/pwlib/include
+	ln -s ../../../include/ptlib debian/$(PACKAGE)-dev/usr/share/pwlib/include
 	# should not be part of a distribution package:
-	-rm -f `find debian/libpt-$(SHLIBSVER)-dev/ -name "*.in"`
+	-rm -f `find debian/$(PACKAGE)-dev/ -name "*.in"`
 
 # plugins
-	#libpt-$(SHLIBSVER)-plugins-v4l
-	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+	#$(PACKAGE)-plugins-v4l
+	install -d -m 755 debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 	cp plugins/pwlibn/device/videoinput/v4l_pwplugin.so \
-		debian/libpt-$(SHLIBSVER)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 		
-	#libpt-$(SHLIBSVER)-plugins-v4l2
-	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+	#$(PACKAGE)-plugins-v4l2
+	install -d -m 755 debian/$(PACKAGE)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 	cp plugins/pwlibn/device/videoinput/v4l2_pwplugin.so \
-		debian/libpt-$(SHLIBSVER)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
-
-	#libpt-$(SHLIBSVER)-plugins-avc
-	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/$(PACKAGE)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+
+	#$(PACKAGE)-plugins-avc
+	install -d -m 755 debian/$(PACKAGE)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 	cp plugins/pwlibn/device/videoinput/avc_pwplugin.so \
-		debian/libpt-$(SHLIBSVER)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
-
-	#libpt-$(SHLIBSVER)-plugins-dc
-	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/$(PACKAGE)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+
+	#$(PACKAGE)-plugins-dc
+	install -d -m 755 debian/$(PACKAGE)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 	cp plugins/pwlibn/device/videoinput/dc_pwplugin.so \
-		debian/libpt-$(SHLIBSVER)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
-
-	#libpt-$(SHLIBSVER)-plugins-oss
-	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+		debian/$(PACKAGE)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+
+	#$(PACKAGE)-plugins-oss
+	install -d -m 755 debian/$(PACKAGE)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
 	cp plugins/pwlibn/device/sound/oss_pwplugin.so \
-		debian/libpt-$(SHLIBSVER)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
-
-	#libpt-$(SHLIBSVER)-plugins-alsa
-	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+		debian/$(PACKAGE)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+
+	#$(PACKAGE)-plugins-alsa
+	install -d -m 755 debian/$(PACKAGE)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
 	cp plugins/pwlibn/device/sound/alsa_pwplugin.so \
-		debian/libpt-$(SHLIBSVER)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+		debian/$(PACKAGE)-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
 	
 	install -d -m 755 debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 	install -d -m 755 debian/$(PACKAGE)-ptrace/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
@@ -331,7 +331,7 @@
 	
 ifneq (4,$(DH_COMPAT))
 	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
+	# can't ship those in $(PACKAGE)-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
 else

More information about the Pkg-voip-commits mailing list