[Pkg-voip-commits] r4407 - / pwlib-titan pwlib-titan/trunk/debian pwlib-titan/trunk/debian/patches

kilian at alioth.debian.org kilian at alioth.debian.org
Thu Sep 6 09:03:51 UTC 2007 

Author: kilian
Date: 2007-09-06 09:03:51 +0000 (Thu, 06 Sep 2007)
New Revision: 4407

Added:
   pwlib-titan/
   pwlib-titan/build-area
   pwlib-titan/tags/
   pwlib-titan/tarballs
   pwlib-titan/trunk/
Removed:
   pwlib-titan/trunk/debian/libpt-dbg-develop.dirs
   pwlib-titan/trunk/debian/libpt-dbg-ptrace.dirs
Modified:
   pwlib-titan/trunk/debian/changelog
   pwlib-titan/trunk/debian/control
   pwlib-titan/trunk/debian/patches/00list
   pwlib-titan/trunk/debian/rules
   pwlib-titan/trunk/debian/watch
Log:
initial fork into new namespace for PWLib Titan (development branch) release 1.11.1.


Added: pwlib-titan/build-area
===================================================================
--- pwlib-titan/build-area	                        (rev 0)
+++ pwlib-titan/build-area	2007-09-06 09:03:51 UTC (rev 4407)
@@ -0,0 +1 @@
+link ../build-area/
\ No newline at end of file


Property changes on: pwlib-titan/build-area
___________________________________________________________________
Name: svn:special
   + *

Added: pwlib-titan/tarballs
===================================================================
--- pwlib-titan/tarballs	                        (rev 0)
+++ pwlib-titan/tarballs	2007-09-06 09:03:51 UTC (rev 4407)
@@ -0,0 +1 @@
+link ../tarballs/
\ No newline at end of file


Property changes on: pwlib-titan/tarballs
___________________________________________________________________
Name: svn:special
   + *

Copied: pwlib-titan/trunk (from rev 4406, pwlib/trunk)

Modified: pwlib-titan/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/changelog	2007-09-06 09:03:51 UTC (rev 4407)
@@ -1,5 +1,6 @@
-pwlib (1.10.7~dfsg1-5) UNRELEASED; urgency=low
+pwlib-titan (1.11.1-1) UNRELEASED; urgency=low
 
+  * New upstream release (unstable branch).
   * NOT RELEASED YET
 
   [ Kilian Krause ]
@@ -8,6 +9,7 @@
   * Remove get-orig-source until upstream provides the tarball on their
     website again.
   * Fixup debian/watch.
+  * Remove compat symlinks.
 
   [ Faidon Liambotis ]
   * Adapt shlibs to depend on the upstream's version number and not the Debian

Modified: pwlib-titan/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/control	2007-09-06 09:03:51 UTC (rev 4407)
@@ -1,21 +1,20 @@
-Source: pwlib
+Source: pwlib-titan
 Section: libs
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
 Build-Depends: debhelper (>=4.9.0), libdc1394-13-dev, bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-dev, libavc1394-dev, libraw1394-dev, libdv-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers|linux-libc-dev, binutils (>= 2.14.90.0.7), dpkg-dev (>= 1.13.19)
 Build-Depends-Indep: doxygen
-Build-Conflicts: libpt-1.10.0, libpt-1.10.0-ptrace, libpt-1.10.0-develop, libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
+Build-Conflicts: libpt-1.11.1, libpt-1.11.1-ptrace, libpt-1.11.1-develop, libpt-1.10.0, libpt-1.10.0-ptrace, libpt-1.10.0-develop, libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
 Standards-Version: 3.6.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
+XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/pwlib/trunk
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/pwlib?op=log
 
-Package: libpt-1.10.0
+Package: libpt-1.11.1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-plugins-alsa|libpt-plugins-oss, libpt-plugins-v4l|libpt-plugins-v4l2|libpt-plugins-avc|libpt-plugins-dc
-Replaces: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a
-Conflicts: libpt-1.10.0-ptrace, libpt-1.10.0-develop
+Depends: ${shlibs:Depends}, libpt-1.11.1-plugins-alsa|libpt-1.11.1-plugins-oss, libpt-1.11.1-plugins-v4l|libpt-1.11.1-plugins-v4l2|libpt-1.11.1-plugins-avc|libpt-1.11.1-plugins-dc
+Conflicts: libpt-1.11.1-ptrace, libpt-1.11.1-develop
 Description: Portable Windows Library
  This package contains the shared version of the library PWLib, which is
  a moderately large class library that has its genesis many years ago as
@@ -25,11 +24,11 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
-Package: libpt-1.10.0-ptrace
+Package: libpt-1.11.1-ptrace
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libpt-1.10.0, libpt-1.10.0-develop, libpt-plugins-v4l, libpt-plugins-v4l2, libpt-plugins-avc, libpt-plugins-dc, libpt-plugins-oss, libpt-plugins-alsa
+Conflicts: libpt-1.11.1, libpt-1.11.1-develop, libpt-1.11.1-plugins-v4l, libpt-1.11.1-plugins-v4l2, libpt-1.11.1-plugins-avc, libpt-1.11.1-plugins-dc, libpt-1.11.1-plugins-oss, libpt-1.11.1-plugins-alsa
 Description: Portable Windows Library - optimized version with extra ptrace code
  This package contains the shared version of the library PWLib, which is
  a moderately large class library that has its genesis many years ago as
@@ -45,11 +44,11 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
-Package: libpt-1.10.0-develop
+Package: libpt-1.11.1-develop
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libpt-1.10.0, libpt-1.10.0-ptrace, libpt-plugins-v4l, libpt-plugins-v4l2, libpt-plugins-avc, libpt-plugins-dc, libpt-plugins-oss, libpt-plugins-alsa
+Conflicts: libpt-1.11.1, libpt-1.11.1-ptrace, libpt-1.11.1-plugins-v4l, libpt-1.11.1-plugins-v4l2, libpt-1.11.1-plugins-avc, libpt-1.11.1-plugins-dc, libpt-1.11.1-plugins-oss, libpt-1.11.1-plugins-alsa
 Description: Portable Windows Library - binary developer version
  This package contains the shared version of the library PWLib, which is
  a moderately large class library that has its genesis many years ago as
@@ -66,11 +65,10 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
-Package: libpt-dev
+Package: libpt-1.11.1-dev
 Section: libdevel
 Architecture: any
-Depends: libpt-1.10.0 (= ${binary:Version})|libpt-1.10.0-ptrace (= ${binary:Version})|libpt-1.10.0-develop (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
-Conflicts: libpt-1.10.0 (<= 1.10.7~)
+Depends: libpt-1.11.1 (= ${binary:Version})|libpt-1.11.1-ptrace (= ${binary:Version})|libpt-1.11.1-develop (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
 Description: Portable Windows Library development files
  This package contains the headers and a static version of the library
  PWLib, which is a moderately large class library that has its genesis
@@ -85,12 +83,11 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
-Package: libpt-dbg
+Package: libpt-1.11.1-dbg
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libpt-1.10.0 (= ${binary:Version})
-Conflicts: libpt-dbg-ptrace, libpt-dbg-develop
+Depends: libpt-1.11.1 (= ${binary:Version})
 Description: Portable Windows Library development debug files
  This package contains the shared and static debug symbols of the library
  PWLib, which is a moderately large class library that has its genesis
@@ -102,7 +99,7 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
-Package: libpt-doc
+Package: libpt-1.11.1-doc
 Section: doc
 Priority: extra
 Architecture: all
@@ -115,7 +112,7 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
-Package: libpt-plugins-v4l
+Package: libpt-1.11.1-plugins-v4l
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -124,7 +121,7 @@
  devices.  Install this package, if you want to use a video device
  that is not attached to FireWire.
 
-Package: libpt-plugins-v4l2
+Package: libpt-1.11.1-plugins-v4l2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -134,7 +131,7 @@
  that is not attached to FireWire.
 
 
-Package: libpt-plugins-avc
+Package: libpt-1.11.1-plugins-avc
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: PWLib Video Plugin for IEEE1394 (FireWire) AVC devices
@@ -142,7 +139,7 @@
  on FireWire.  Install this package, if you want to use such a video
  device.
 
-Package: libpt-plugins-dc
+Package: libpt-1.11.1-plugins-dc
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: PWLib Video Plugin for IEEE1394 (Firewire) DC Devices
@@ -150,7 +147,7 @@
  on Firewire.  Install this package, if you want to use such a video 
  device.
 
-Package: libpt-plugins-oss
+Package: libpt-1.11.1-plugins-oss
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Portable Windows Library Audio Plugins for the OSS Interface
@@ -158,7 +155,7 @@
  System interface.  Install this package, if you are utilising this
  interface..
 
-Package: libpt-plugins-alsa
+Package: libpt-1.11.1-plugins-alsa
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: alsa-base

Deleted: pwlib-titan/trunk/debian/libpt-dbg-develop.dirs
===================================================================
--- pwlib/trunk/debian/libpt-dbg-develop.dirs	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/libpt-dbg-develop.dirs	2007-09-06 09:03:51 UTC (rev 4407)
@@ -1 +0,0 @@
-usr/lib/debug/usr/lib

Deleted: pwlib-titan/trunk/debian/libpt-dbg-ptrace.dirs
===================================================================
--- pwlib/trunk/debian/libpt-dbg-ptrace.dirs	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/libpt-dbg-ptrace.dirs	2007-09-06 09:03:51 UTC (rev 4407)
@@ -1 +0,0 @@
-usr/lib/debug/usr/lib

Modified: pwlib-titan/trunk/debian/patches/00list
===================================================================
--- pwlib/trunk/debian/patches/00list	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/patches/00list	2007-09-06 09:03:51 UTC (rev 4407)
@@ -1,6 +1,4 @@
 01_unix.mak_Os
-02_amd64
 04_names
 05_hppa
 06_plugins_shared
-v4l2_plugin_on_i386

Modified: pwlib-titan/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/rules	2007-09-06 09:03:51 UTC (rev 4407)
@@ -3,18 +3,12 @@
 export DH_COMPAT=5
 
 # Change this on API breakage
-export LIBPTCOMPAT=1.9.3
-export LIBPTCOMPAT2=1.10.0
-export LIBPTCOMPAT3=1.10.1
-export LIBPTCOMPAT4=1.10.2
-export LIBPTCOMPAT5=1.10.3
 
 #PACKAGE=libpt-$(LIBPTCOMPAT)
-PACKAGE=libpt-1.10.0
 
 # excludes for the -ptrace and -develop version
-STRIP_EXCLUDES = -N$(PACKAGE) -Nlibpt-dbg -Nlibpt-dev -Nlibpt-plugins-alsa -Nlibpt-plugins-oss 
-STRIP_EXCLUDES += -Nlibpt-plugins-v4l -Nlibpt-plugins-v4l2 -Nlibpt-plugins-avc -Nlibpt-plugins-dc
+STRIP_EXCLUDES = -N$(PACKAGE) -Nlibpt-1.11.1-dbg -Nlibpt-1.11.1-dev -Nlibpt-1.11.1-plugins-alsa -Nlibpt-1.11.1-plugins-oss 
+STRIP_EXCLUDES += -Nlibpt-1.11.1-plugins-v4l -Nlibpt-1.11.1-plugins-v4l2 -Nlibpt-1.11.1-plugins-avc -Nlibpt-1.11.1-plugins-dc
 
 ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
 VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
@@ -23,6 +17,7 @@
 endif
 
 SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+PACKAGE=libpt-$(SHLIBSVER)
 
 CFLAGS := -g
 
@@ -50,8 +45,7 @@
 DEBVERSION := $(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg[0-9]*$$//')
-#URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//' -e 's/\./_/g')
-URLVERSION := $(UPVERSION)
+URLVERSION := $(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//' -e 's/\./_/g')
 
 FILENAME := pwlib_$(UPVERSION)~dfsg1.orig.tar.gz
 UPFILENAME := pwlib_$(UPVERSION).orig.tar.gz
@@ -182,7 +176,7 @@
 	-rm -f debian/*substvars
 	-rm -f debian/*.debhelper
 	-rm -rf html
-	-rm -f debian/libpt-*.*.docs
+	-rm -f debian/libpt-*.*.docs debian/libpt-*.*.manpages debian/libpt-*.*.dirs
 	-rm -f core a.out
 	dh_clean
 
@@ -192,6 +186,7 @@
 	dh_testroot
 	dh_clean -k -i
 	dh_installdirs -i
+	cp debian/libpt-doc.docs debian/libpt-$(SHLIBSVER)-doc.docs
 
 install-arch:
 	dh_testdir
@@ -206,111 +201,84 @@
 	install -m 755 lib/notrace/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
 	install -m 755 lib/opt/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib
 	install -m 755 lib/debug/libpt.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
-ifneq ($(SHLIBSVER),$(LIBPTCOMPAT))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libpt.so.$(SHLIBSVER) \
-	    debian/$(PACKAGE)$$suffix/usr/lib/libpt.so.$(LIBPTCOMPAT); \
-	done
-endif
-ifneq ($(SHLIBSVER),$(LIBPTCOMPAT2))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libpt.so.$(SHLIBSVER) \
-	    debian/$(PACKAGE)$$suffix/usr/lib/libpt.so.$(LIBPTCOMPAT2); \
-	done
-endif
-ifneq ($(SHLIBSVER),$(LIBPTCOMPAT3))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libpt.so.$(SHLIBSVER) \
-	    debian/$(PACKAGE)$$suffix/usr/lib/libpt.so.$(LIBPTCOMPAT3); \
-	done
-endif
-ifneq ($(SHLIBSVER),$(LIBPTCOMPAT4))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libpt.so.$(SHLIBSVER) \
-	    debian/$(PACKAGE)$$suffix/usr/lib/libpt.so.$(LIBPTCOMPAT4); \
-	done
-endif
-ifneq ($(SHLIBSVER),$(LIBPTCOMPAT5))
-	for suffix in "" "-ptrace" "-develop";do \
-	ln -s libpt.so.$(SHLIBSVER) \
-	    debian/$(PACKAGE)$$suffix/usr/lib/libpt.so.$(LIBPTCOMPAT5); \
-	done
-endif
 	cp debian/libpt.docs debian/$(PACKAGE).docs
 
-#	libpt-dbg (will be filled by dh_strip)
+#	libpt-$(SHLIBSVER)-dbg (will be filled by dh_strip)
+	cp debian/libpt-dbg.dirs debian/libpt-$(SHLIBSVER)-dbg.dirs
 
-#	libpt-dev
-	ln -s libpt.so.$(SHLIBSVER) debian/libpt-dev/usr/lib/libpt.so
-	ln -s libpt.so.$(SHLIBSVER) debian/libpt-dev/usr/lib/libpt.so.$(VER_MAJOR).$(VER_MINOR)
-	ln -s libpt.so.$(SHLIBSVER) debian/libpt-dev/usr/lib/libpt.so.$(VER_MAJOR)
+#	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-dev/usr/include
-	cp -vr make `pwd`/debian/libpt-dev/usr/share/pwlib
+	cp -vr include/pt* debian/libpt-$(SHLIBSVER)-dev/usr/include
+	cp -vr make `pwd`/debian/libpt-$(SHLIBSVER)-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-dev/usr/share/pwlib/make/unix.mak
-	# copy static opt version to libpt-dev
-	install -m 755 lib/notrace/libpt_s.a debian/libpt-dev/usr/lib
-	install -m 755 lib/opt/libpt_s.a debian/libpt-dev/usr/lib/libpt_r_s.a
-	install -m 755 lib/debug/libpt_s.a debian/libpt-dev/usr/lib/libpt_d_s.a
-	find debian/libpt-dev/usr/include -type f -exec chmod 644 {} \;
-	# ptlib-config in libpt-dev
+	    -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
 	# changing build/machine dependent data in ptlib-config
-	-rm -f `find debian/libpt-dev/ -name ptlib-config`
+	-rm -f `find debian/libpt-$(SHLIBSVER)-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-dev/usr/bin/ptlib-config
-	chmod 0755 debian/libpt-dev/usr/bin/ptlib-config
-	ln -s ../../../bin/ptlib-config debian/libpt-dev/usr/share/pwlib/make/
+	    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/
 	# erasing build host specific && unnecessary stuff off ptbuildopts.mak
-	-rm -f `find debian/libpt-dev/ -name ptbuildopts.mak`
+	-rm -f `find debian/libpt-$(SHLIBSVER)-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-dev/usr/share/pwlib/make/ptbuildopts.mak
+	    make/ptbuildopts.mak > debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib/make/ptbuildopts.mak
 	# for using /usr/share/pwlib as a single PWLIBDIR
-	ln -s ../../lib debian/libpt-dev/usr/share/pwlib
+	ln -s ../../lib debian/libpt-$(SHLIBSVER)-dev/usr/share/pwlib
 
-	cp version.h debian/libpt-dev/usr/include/ptlib
-	ln -s ../../include/ptlib/version.h debian/libpt-dev/usr/share/pwlib
-	ln -s ../../../include/ptbuildopts.h debian/libpt-dev/usr/share/pwlib/include
-	ln -s ../../../include/ptlib.h debian/libpt-dev/usr/share/pwlib/include
-	ln -s ../../../include/ptlib debian/libpt-dev/usr/share/pwlib/include
+	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
 	# should not be part of a distribution package:
-	-rm -f `find debian/libpt-dev/ -name "*.in"`
+	-rm -f `find debian/libpt-$(SHLIBSVER)-dev/ -name "*.in"`
+	cp debian/libpt-dev.dirs debian/libpt-$(SHLIBSVER)-dev.dirs
+	cp debian/libpt-dev.manpages debian/libpt-$(SHLIBSVER)-dev.manpages
 
 # plugins
-	#libpt-plugins-v4l
-	install -d -m 755 debian/libpt-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+	#libpt-$(SHLIBSVER)-plugins-v4l
+	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 	cp plugins/pwlibn/device/videoinput/v4l_pwplugin.so \
-		debian/libpt-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/libpt-$(SHLIBSVER)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 		
-	#libpt-plugins-v4l2
-	install -d -m 755 debian/libpt-plugins-v4l2/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/
 	cp plugins/pwlibn/device/videoinput/v4l2_pwplugin.so \
-		debian/libpt-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/libpt-$(SHLIBSVER)-plugins-v4l2/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 
-	#libpt-plugins-avc
-	install -d -m 755 debian/libpt-plugins-avc/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/
 	cp plugins/pwlibn/device/videoinput/avc_pwplugin.so \
-		debian/libpt-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/libpt-$(SHLIBSVER)-plugins-avc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 
-	#libpt-plugins-dc
-	install -d -m 755 debian/libpt-plugins-dc/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/
 	cp plugins/pwlibn/device/videoinput/dc_pwplugin.so \
-		debian/libpt-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+		debian/libpt-$(SHLIBSVER)-plugins-dc/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
 
-	#libpt-plugins-oss
-	install -d -m 755 debian/libpt-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+	#libpt-$(SHLIBSVER)-plugins-oss
+	install -d -m 755 debian/libpt-$(SHLIBSVER)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
 	cp plugins/pwlibn/device/sound/oss_pwplugin.so \
-		debian/libpt-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+		debian/libpt-$(SHLIBSVER)-plugins-oss/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
 
-	#libpt-plugins-alsa
-	install -d -m 755 debian/libpt-plugins-alsa/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/
 	cp plugins/pwlibn/device/sound/alsa_pwplugin.so \
-		debian/libpt-plugins-alsa/usr/lib/pwlib/$(SHLIBSVER)/device/sound/
+		debian/libpt-$(SHLIBSVER)-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/
@@ -365,8 +333,8 @@
 	dh_testroot
 	
 ifneq (4,$(DH_COMPAT))
-	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libpt-dbg
-	# can't ship those in libpt-dbg due to namespace overlap
+	dh_strip -N$(PACKAGE)-dbg -N$(PACKAGE)-ptrace -N$(PACKAGE)-develop --dbg-package=libpt-$(SHLIBSVER)-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
 else
@@ -374,11 +342,11 @@
 	# we need to workaround that manually
 	dh_strip --exclude=libpt_d --keep-debug
 
-	for pack in $(PACKAGE) libpt-plugins-alsa libpt-plugins-oss \
-		libpt-plugins-v4l libpt-plugins-v4l2 libpt-plugins-avc \
-		libpt-plugins-dc ; \
+	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 ; \
 	do \
-		cp -af debian/$$pack/usr/lib/debug debian/libpt-dbg/usr/lib && \
+		cp -af debian/$$pack/usr/lib/debug debian/libpt-$(SHLIBSVER)-dbg/usr/lib && \
 			rm -rf debian/$$pack/usr/lib/debug; \
 	done
 endif
@@ -396,7 +364,7 @@
 	@@echo "Debian version:          $(DEBVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
 
-get-orig-source.disabled:
+get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
 ifneq (,$(findstring dfsg,$(DEBVERSION)))

Modified: pwlib-titan/trunk/debian/watch
===================================================================
--- pwlib/trunk/debian/watch	2007-09-03 21:07:09 UTC (rev 4406)
+++ pwlib-titan/trunk/debian/watch	2007-09-06 09:03:51 UTC (rev 4407)
@@ -6,4 +6,4 @@
 # This the format for an FTP site:
 # Full‐site‐with‐pattern  [Version  [Action]]
 opts=dversionmangle=s/[\.~]dfsg(\d+)?//,uversionmangle=s/[_\.]+/\./g \
-  http://www.voxgratia.org/releases/pwlib-v(\d+)_(\d?[02468]+)_([\d_]+)-src[\.-]tar\.gz	debian	svn-upgrade
+  http://www.voxgratia.org/releases/pwlib-v(\d+)_(\d?[13579]+)_([\d_]+)-src[\.-]tar\.gz	debian	svn-upgrade

More information about the Pkg-voip-commits mailing list