[Pkg-voip-commits] r4561 - in /pwlib/trunk/debian: changelog control control.in libpt-dbg-develop.dirs libpt-dbg-ptrace.dirs libpt-dev.dirs patches/soname.dpatch rules
kilian at alioth.debian.org
kilian at alioth.debian.org
Sat Sep 22 12:25:27 UTC 2007
Author: kilian
Date: Sat Sep 22 12:25:27 2007
New Revision: 4561
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4561
Log:
Move into new SONAME space to complete ldbl128 transition. (Closes: #430293)
* Bump build-deps on debhelper to >= 5 to quiet linda error.
* Install *.h files only into PWLIBDIR/include, not /usr/include
* Generate debian/control from debian/control.in to overcome heavy editing
for SONAME changes.
* Remove obsolete *.dirs files in debian/
Added:
pwlib/trunk/debian/control.in
- copied, changed from r4554, pwlib/trunk/debian/control
pwlib/trunk/debian/patches/soname.dpatch (with props)
Removed:
pwlib/trunk/debian/libpt-dbg-develop.dirs
pwlib/trunk/debian/libpt-dbg-ptrace.dirs
Modified:
pwlib/trunk/debian/changelog
pwlib/trunk/debian/control
pwlib/trunk/debian/libpt-dev.dirs
pwlib/trunk/debian/rules
Modified: pwlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/changelog?rev=4561&op=diff
==============================================================================
--- pwlib/trunk/debian/changelog (original)
+++ pwlib/trunk/debian/changelog Sat Sep 22 12:25:27 2007
@@ -2,6 +2,7 @@
* NOT RELEASED YET
* New upstream release. (gcc-4.2 clean. Yeah!)
+ Move into new SONAME space to complete ldbl128 transition. (Closes: #430293)
[ Kilian Krause ]
* Add dpkg-dev (>= 1.13.19) to Build-Deps to allow use of binary:Version.
@@ -13,13 +14,18 @@
* Remove last ignore make clean errors
* Removing DFSG-repack due to infringing files have been removed upstream.
* Add Homepage field as added in dpkg-dev 1.14.6.
+ * Bump build-deps on debhelper to >= 5 to quiet linda error.
+ * Install *.h files only into PWLIBDIR/include, not /usr/include
+ * Generate debian/control from debian/control.in to overcome heavy editing
+ for SONAME changes.
+ * Remove obsolete *.dirs files in debian/
[ 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> Sat, 22 Sep 2007 12:08:50 +0200
+ -- Kilian Krause <kilian at debian.org> Sat, 22 Sep 2007 14:23:35 +0200
pwlib (1.10.7~dfsg1-4) unstable; urgency=high
Modified: pwlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/control?rev=4561&op=diff
==============================================================================
--- pwlib/trunk/debian/control (original)
+++ pwlib/trunk/debian/control Sat Sep 22 12:25:27 2007
@@ -3,31 +3,33 @@
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: debhelper (>= 5), 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.10.10, libpt-1.10.10-ptrace, libpt-1.10.10-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
Homepage: http://www.voxgratia.org/
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.10.10
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.10.10-plugins-alsa|libpt-1.10.10-plugins-oss, libpt-1.10.10-plugins-v4l|libpt-1.10.10-plugins-v4l2|libpt-1.10.10-plugins-avc|libpt-1.10.10-plugins-dc
+Conflicts: libpt-1.10.10-ptrace, libpt-1.10.10-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
a method to produce applications to run on both Microsoft Windows and
Unix X-Window systems.
-Package: libpt-1.10.0-ptrace
+Package: libpt-1.10.10-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.10.10, libpt-1.10.10-develop, libpt-1.10.10-plugins-v4l, libpt-1.10.10-plugins-v4l2, libpt-1.10.10-plugins-avc, libpt-1.10.10-plugins-dc, libpt-1.10.10-plugins-oss, libpt-1.10.10-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
@@ -40,11 +42,11 @@
.
The package also contains all plugins and debug symbols.
-Package: libpt-1.10.0-develop
+Package: libpt-1.10.10-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.10.10, libpt-1.10.10-ptrace, libpt-1.10.10-plugins-v4l, libpt-1.10.10-plugins-v4l2, libpt-1.10.10-plugins-avc, libpt-1.10.10-plugins-dc, libpt-1.10.10-plugins-oss, libpt-1.10.10-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
@@ -61,8 +63,7 @@
Package: libpt-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.10.10 (= ${binary:Version})|libpt-1.10.10-ptrace (= ${binary:Version})|libpt-1.10.10-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
@@ -74,12 +75,11 @@
libpt_r_s.a - ptrace-enabled opt version
libpt_d_s.a - ptrace-enabled debug version
-Package: libpt-dbg
+Package: libpt-1.10.10-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: libpt-1.10.0 (= ${binary:Version})
-Conflicts: libpt-dbg-ptrace, libpt-dbg-develop
+Depends: libpt-1.10.10 (= ${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
@@ -98,7 +98,7 @@
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-Package: libpt-plugins-v4l
+Package: libpt-1.10.10-plugins-v4l
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -107,7 +107,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.10.10-plugins-v4l2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -116,7 +116,7 @@
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt-plugins-avc
+Package: libpt-1.10.10-plugins-avc
Architecture: any
Depends: ${shlibs:Depends}
Description: PWLib Video Plugin for IEEE1394 (FireWire) AVC devices
@@ -124,7 +124,7 @@
on FireWire. Install this package, if you want to use such a video
device.
-Package: libpt-plugins-dc
+Package: libpt-1.10.10-plugins-dc
Architecture: any
Depends: ${shlibs:Depends}
Description: PWLib Video Plugin for IEEE1394 (Firewire) DC Devices
@@ -132,7 +132,7 @@
on Firewire. Install this package, if you want to use such a video
device.
-Package: libpt-plugins-oss
+Package: libpt-1.10.10-plugins-oss
Architecture: any
Depends: ${shlibs:Depends}
Description: Portable Windows Library Audio Plugins for the OSS Interface
@@ -140,7 +140,7 @@
System interface. Install this package, if you are utilising this
interface..
-Package: libpt-plugins-alsa
+Package: libpt-1.10.10-plugins-alsa
Architecture: any
Depends: ${shlibs:Depends}
Recommends: alsa-base
Copied: pwlib/trunk/debian/control.in (from r4554, pwlib/trunk/debian/control)
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/control.in?rev=4561&op=diff
==============================================================================
--- pwlib/trunk/debian/control (original)
+++ pwlib/trunk/debian/control.in Sat Sep 22 12:25:27 2007
@@ -3,31 +3,33 @@
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: debhelper (>= 5), 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: @@PACKAGE@@, @@PACKAGE@@-ptrace, @@PACKAGE@@-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
Homepage: http://www.voxgratia.org/
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: @@PACKAGE@@
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}, @@PACKAGE@@-plugins-alsa|@@PACKAGE@@-plugins-oss, @@PACKAGE@@-plugins-v4l|@@PACKAGE@@-plugins-v4l2|@@PACKAGE@@-plugins-avc|@@PACKAGE@@-plugins-dc
+Conflicts: @@PACKAGE@@-ptrace, @@PACKAGE@@-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
a method to produce applications to run on both Microsoft Windows and
Unix X-Window systems.
-Package: libpt-1.10.0-ptrace
+Package: @@PACKAGE@@-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: @@PACKAGE@@, @@PACKAGE@@-develop, @@PACKAGE@@-plugins-v4l, @@PACKAGE@@-plugins-v4l2, @@PACKAGE@@-plugins-avc, @@PACKAGE@@-plugins-dc, @@PACKAGE@@-plugins-oss, @@PACKAGE@@-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
@@ -40,11 +42,11 @@
.
The package also contains all plugins and debug symbols.
-Package: libpt-1.10.0-develop
+Package: @@PACKAGE@@-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: @@PACKAGE@@, @@PACKAGE@@-ptrace, @@PACKAGE@@-plugins-v4l, @@PACKAGE@@-plugins-v4l2, @@PACKAGE@@-plugins-avc, @@PACKAGE@@-plugins-dc, @@PACKAGE@@-plugins-oss, @@PACKAGE@@-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
@@ -61,8 +63,7 @@
Package: libpt-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: @@PACKAGE@@ (= ${binary:Version})|@@PACKAGE@@-ptrace (= ${binary:Version})|@@PACKAGE@@-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
@@ -74,12 +75,11 @@
libpt_r_s.a - ptrace-enabled opt version
libpt_d_s.a - ptrace-enabled debug version
-Package: libpt-dbg
+Package: @@PACKAGE@@-dbg
Section: libdevel
Priority: extra
Architecture: any
-Depends: libpt-1.10.0 (= ${binary:Version})
-Conflicts: libpt-dbg-ptrace, libpt-dbg-develop
+Depends: @@PACKAGE@@ (= ${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
@@ -98,7 +98,7 @@
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-Package: libpt-plugins-v4l
+Package: @@PACKAGE@@-plugins-v4l
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -107,7 +107,7 @@
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt-plugins-v4l2
+Package: @@PACKAGE@@-plugins-v4l2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -116,7 +116,7 @@
devices. Install this package, if you want to use a video device
that is not attached to FireWire.
-Package: libpt-plugins-avc
+Package: @@PACKAGE@@-plugins-avc
Architecture: any
Depends: ${shlibs:Depends}
Description: PWLib Video Plugin for IEEE1394 (FireWire) AVC devices
@@ -124,7 +124,7 @@
on FireWire. Install this package, if you want to use such a video
device.
-Package: libpt-plugins-dc
+Package: @@PACKAGE@@-plugins-dc
Architecture: any
Depends: ${shlibs:Depends}
Description: PWLib Video Plugin for IEEE1394 (Firewire) DC Devices
@@ -132,7 +132,7 @@
on Firewire. Install this package, if you want to use such a video
device.
-Package: libpt-plugins-oss
+Package: @@PACKAGE@@-plugins-oss
Architecture: any
Depends: ${shlibs:Depends}
Description: Portable Windows Library Audio Plugins for the OSS Interface
@@ -140,7 +140,7 @@
System interface. Install this package, if you are utilising this
interface..
-Package: libpt-plugins-alsa
+Package: @@PACKAGE@@-plugins-alsa
Architecture: any
Depends: ${shlibs:Depends}
Recommends: alsa-base
Modified: pwlib/trunk/debian/libpt-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/libpt-dev.dirs?rev=4561&op=diff
==============================================================================
--- pwlib/trunk/debian/libpt-dev.dirs (original)
+++ pwlib/trunk/debian/libpt-dev.dirs Sat Sep 22 12:25:27 2007
@@ -1,6 +1,4 @@
usr/include
usr/lib
-usr/lib/pwlib-ptrace
-usr/lib/pwlib-develop
usr/share/pwlib/include
usr/bin
Added: pwlib/trunk/debian/patches/soname.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/patches/soname.dpatch?rev=4561&op=file
==============================================================================
--- pwlib/trunk/debian/patches/soname.dpatch (added)
+++ pwlib/trunk/debian/patches/soname.dpatch Sat Sep 22 12:25:27 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## soname.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If we wanted, we could tweak the SONAME here.
+
+ at DPATCH@
+diff -urNad pwlib-1.10.10~/make/lib.mak pwlib-1.10.10/make/lib.mak
+--- pwlib-1.10.10~/make/lib.mak 2005-09-25 12:51:23.000000000 +0200
++++ pwlib-1.10.10/make/lib.mak 2007-09-22 13:21:36.000000000 +0200
+@@ -144,7 +144,7 @@
+ endif
+ endif
+
+-LIB_SONAME = $(LIBNAME_PAT)
++LIB_SONAME = $(LIBNAME_MIN)
+
+ CLEAN_FILES += $(LIBDIR)/$(LIBNAME_PAT) $(LIBDIR)/$(LIB_FILENAME) $(LIBDIR)/$(LIBNAME_MAJ) $(LIBDIR)/$(LIBNAME_MIN)
+
Propchange: pwlib/trunk/debian/patches/soname.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: pwlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/trunk/debian/rules?rev=4561&op=diff
==============================================================================
--- pwlib/trunk/debian/rules (original)
+++ pwlib/trunk/debian/rules Sat Sep 22 12:25:27 2007
@@ -1,18 +1,10 @@
#!/usr/bin/make -f
-# 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
+PACKAGE=libpt-1.10.10
# 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) -N$(PACKAGE)-dbg -Nlibpt-dev -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-oss
+STRIP_EXCLUDES += -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-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)
@@ -159,6 +151,7 @@
clean: clean-patched unpatch
clean-patched:
$(checkdir)
+ sed -e 's#@@PACKAGE@@#$(PACKAGE)#g' debian/control.in >debian/control
rm -f build-arch-stamp build-indep-stamp patch-stamp
if [ -f Makefile ];then \
$(MAKE) PWLIBDIR=$(CURDIR) clean || true ; \
@@ -179,7 +172,7 @@
rm -f debian/*substvars
rm -f debian/*.debhelper
rm -rf html
- rm -f debian/libpt-*.*.docs
+ rm -f debian/libpt-*.*.docs debian/libpt-*.*.dirs
rm -f core a.out
dh_clean
@@ -195,53 +188,23 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
-
- #INSTALL#
+
install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib \
$(CURDIR)/debian/$(PACKAGE)-ptrace/usr/lib \
$(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
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)
-
+
+# $(PACKAGE)-dbg (will be filled by dh_strip)
+ cp debian/libpt-dbg.dirs debian/$(PACKAGE)-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)
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)
-
+
cp -vr include/pt* debian/libpt-dev/usr/include
cp -vr make `pwd`/debian/libpt-dev/usr/share/pwlib
sed -i -e 's#$$(PWLIBDIR)/include/ptlib/unix#/usr/include/ptlib/unix#g' \
@@ -269,45 +232,45 @@
make/ptbuildopts.mak > debian/libpt-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
-
- 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
+
+ cp version.h debian/libpt-dev/usr/include/ptlib/
+ ln -s ../../include/ptlib/version.h debian/libpt-dev/usr/share/pwlib/
+ # make sure we have no *.h files in /usr/include
+ mv debian/libpt-dev/usr/include/*.h debian/libpt-dev/usr/share/pwlib/include
ln -s ../../../include/ptlib debian/libpt-dev/usr/share/pwlib/include
# should not be part of a distribution package:
-rm -f `find debian/libpt-dev/ -name "*.in"`
-
+
# plugins
- #libpt-plugins-v4l
- install -d -m 755 debian/libpt-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-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
+ debian/$(PACKAGE)-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/
+ #$(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-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/
+ 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-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/
+ 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-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/
+ 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-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/
+ 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-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/
@@ -340,13 +303,12 @@
dh_installdocs
dh_installman
dh_installchangelogs ChangeLog
-
+
# Remove all CVS sub-directories
find debian -name "CVS" -type d|xargs rm -rf
find debian -name .cvsignore -exec rm -f {} \;
-
+
dh_link
-
dh_compress
dh_fixperms
# a new variable will be needed if an epoch is introduced to our versioning
@@ -360,10 +322,10 @@
binary-strip:
dh_testdir
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=$(PACKAGE)-dbg
+ # 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
@@ -371,11 +333,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) $(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-dbg/usr/lib && \
+ cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
rm -rf debian/$$pack/usr/lib/debug; \
done
endif
More information about the Pkg-voip-commits
mailing list