[Pkg-voip-commits] r3589 - in pwlib/trunk/debian: . patches

kilian at alioth.debian.org kilian at alioth.debian.org
Sun May 20 14:27:17 UTC 2007 

Author: kilian
Date: 2007-05-20 14:27:17 +0000 (Sun, 20 May 2007)
New Revision: 3589

Added:
   pwlib/trunk/debian/libpt-dbg-develop.dirs
   pwlib/trunk/debian/libpt-dbg-ptrace.dirs
Modified:
   pwlib/trunk/debian/control
   pwlib/trunk/debian/libpt-dbg.dirs
   pwlib/trunk/debian/libpt-dev.dirs
   pwlib/trunk/debian/patches/04_names.dpatch
   pwlib/trunk/debian/rules
Log:
correct the debhelper behaviour with 4 and 5.


Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2007-05-20 11:39:07 UTC (rev 3588)
+++ pwlib/trunk/debian/control	2007-05-20 14:27:17 UTC (rev 3589)
@@ -15,7 +15,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a
-Conflicts: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a
+Conflicts: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-1.10.0-performance, libpt-1.10.0-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,10 +25,53 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
+Package: libpt-1.10.0-ptrace
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a
+Conflicts: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a, 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
+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
+ a method to produce applications to run on both Microsoft Windows and
+ Unix X-Window systems.
+ .
+ This version was compiled with just extra ptrace code and is therefore
+ suitable for development environments that do need more information on what
+ happens internally.
+ .
+ The package also contains all plugins.
+ .
+ For more information on PWLib visit the development homepage
+ http://www.voxgratia.org/
+
+Package: libpt-1.10.0-develop
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a
+Conflicts: libpt-1.8.7, libpt-1.8.3c2, libpt-1.8.3c2a, 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
+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
+ a method to produce applications to run on both Microsoft Windows and
+ Unix X-Window systems.
+ .
+ This version was compiled with just all ptrace and debug code and is therefore
+ suitable for development purposes. It should not be used in production
+ environments due to a very large overhead that will not scale well with a
+ large number of calls. 
+ .
+ The package also contains all plugins.
+ .
+ For more information on PWLib visit the development homepage
+ http://www.voxgratia.org/
+
 Package: libpt-dev
 Section: libdevel
 Architecture: any
-Depends: libpt-1.10.0 (= ${Source-Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Depends: libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-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
@@ -43,6 +86,7 @@
 Priority: extra
 Architecture: any
 Depends: libpt-1.10.0 (= ${Source-Version})
+Conflicts: libpt-dbg-ptrace, libpt-dbg-develop
 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
@@ -54,6 +98,44 @@
  For more information on PWLib visit the development homepage
  http://www.voxgratia.org/
 
+Package: libpt-dbg-ptrace
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libpt-1.10.0-ptrace (= ${Source-Version})
+Conflicts: libpt-dbg, libpt-dbg-develop
+Description: Portable Windows Library development debug files - ptrace version
+ This package contains the shared and static debug symbols 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. This is not the debug compiled
+ version of PWLib which would yield much more detailled information as a
+ compromise of benefit and compile power consumption.
+ .
+ The debug symbols come from libpt-1.10.0-ptrace rather than from libpt-1.10.0.
+ .
+ For more information on PWLib visit the development homepage
+ http://www.voxgratia.org/
+
+Package: libpt-dbg-develop
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libpt-1.10.0-develop (= ${Source-Version})
+Conflicts: libpt-dbg, libpt-dbg-ptrace
+Description: Portable Windows Library development debug files - debug version
+ This package contains the shared and static debug symbols 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. This is not the debug compiled
+ version of PWLib which would yield much more detailled information as a
+ compromise of benefit and compile power consumption.
+ .
+ The debug symbols come from libpt-1.10.0-develop rather than from libpt-1.10.0.
+ .
+ For more information on PWLib visit the development homepage
+ http://www.voxgratia.org/
+
 Package: libpt-doc
 Section: doc
 Priority: extra
@@ -70,7 +152,7 @@
 Package: libpt-plugins-v4l
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
 Description: Portable Windows Library Video Plugin for Video4Linux
  This package contains the PWLib plugin for usage with Video4Linux
  devices.  Install this package, if you want to use a video device
@@ -79,7 +161,7 @@
 Package: libpt-plugins-v4l2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
 Description: Portable Windows Library Video Plugin for Video4Linux v2
  This package contains the PWLib plugin for usage with Video4Linux v2
  devices.  Install this package, if you want to use a video device
@@ -88,7 +170,7 @@
 
 Package: libpt-plugins-avc
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
 Description: PWLib Video Plugin for IEEE1394 (FireWire) AVC devices
  This package contains the PWLib plugin for usage with AVC devices
  on FireWire.  Install this package, if you want to use such a video
@@ -96,7 +178,7 @@
 
 Package: libpt-plugins-dc
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
 Description: PWLib Video Plugin for IEEE1394 (Firewire) DC Devices
  This package contains the PWLib plugin for usage with DC Devices
  on Firewire.  Install this package, if you want to use such a video 
@@ -104,7 +186,7 @@
 
 Package: libpt-plugins-oss
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
 Description: Portable Windows Library Audio Plugins for the OSS Interface
  This package contains the PWLib plugin for usage with the Open Sound
  System interface.  Install this package, if you are utilising this
@@ -112,7 +194,7 @@
 
 Package: libpt-plugins-alsa
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.10.0 (= ${Source-Version})|libpt-1.10.0-ptrace (= ${Source-Version})|libpt-1.10.0-develop (= ${Source-Version})
 Recommends: alsa-base
 Description: Portable Windows Library Audio Plugin for the ALSA Interface
  This package contains the PWLib plugin for usage with the Advanced

Added: pwlib/trunk/debian/libpt-dbg-develop.dirs
===================================================================
--- pwlib/trunk/debian/libpt-dbg-develop.dirs	                        (rev 0)
+++ pwlib/trunk/debian/libpt-dbg-develop.dirs	2007-05-20 14:27:17 UTC (rev 3589)
@@ -0,0 +1 @@
+usr/lib/debug/usr/lib

Added: pwlib/trunk/debian/libpt-dbg-ptrace.dirs
===================================================================
--- pwlib/trunk/debian/libpt-dbg-ptrace.dirs	                        (rev 0)
+++ pwlib/trunk/debian/libpt-dbg-ptrace.dirs	2007-05-20 14:27:17 UTC (rev 3589)
@@ -0,0 +1 @@
+usr/lib/debug/usr/lib

Modified: pwlib/trunk/debian/libpt-dbg.dirs
===================================================================
--- pwlib/trunk/debian/libpt-dbg.dirs	2007-05-20 11:39:07 UTC (rev 3588)
+++ pwlib/trunk/debian/libpt-dbg.dirs	2007-05-20 14:27:17 UTC (rev 3589)
@@ -1,2 +1 @@
-usr/lib
-usr/lib/debug
+usr/lib/debug/usr/lib

Modified: pwlib/trunk/debian/libpt-dev.dirs
===================================================================
--- pwlib/trunk/debian/libpt-dev.dirs	2007-05-20 11:39:07 UTC (rev 3588)
+++ pwlib/trunk/debian/libpt-dev.dirs	2007-05-20 14:27:17 UTC (rev 3589)
@@ -1,4 +1,6 @@
 usr/include
 usr/lib
+usr/lib/pwlib-ptrace
+usr/lib/pwlib-develop
 usr/share/pwlib/include
 usr/bin

Modified: pwlib/trunk/debian/patches/04_names.dpatch
===================================================================
--- pwlib/trunk/debian/patches/04_names.dpatch	2007-05-20 11:39:07 UTC (rev 3588)
+++ pwlib/trunk/debian/patches/04_names.dpatch	2007-05-20 14:27:17 UTC (rev 3589)
@@ -24,21 +24,44 @@
 exit 0
 
 @DPATCH@
-diff -urNad pwlib-1.10.2~/make/unix.mak pwlib-1.10.2/make/unix.mak
---- pwlib-1.10.2~/make/unix.mak	2007-01-04 17:25:52.000000000 +0100
-+++ pwlib-1.10.2/make/unix.mak	2007-01-04 17:26:19.000000000 +0100
-@@ -939,8 +939,13 @@
+diff -urNad pwlib-1.10.3~dfsg~/make/common.mak pwlib-1.10.3~dfsg/make/common.mak
+--- pwlib-1.10.3~dfsg~/make/common.mak	2007-05-20 10:48:29.000000000 +0000
++++ pwlib-1.10.3~dfsg/make/common.mak	2007-05-20 10:52:38.000000000 +0000
+@@ -368,7 +368,7 @@
+ OBJS += $(OBJDIR)/buildnum.o
+ endif
+ 
+-TARGET_LIBS	= $(PWLIBDIR)/lib/$(PTLIB_FILE)
++TARGET_LIBS	= $(PW_LIBDIR)/$(PTLIB_FILE)
+ 
+ # distinguish betweek building and using pwlib
+ ifeq (,$(wildcard $(PWLIBDIR)/src))
+diff -urNad pwlib-1.10.3~dfsg~/make/plugins.mak pwlib-1.10.3~dfsg/make/plugins.mak
+--- pwlib-1.10.3~dfsg~/make/plugins.mak	2006-01-08 15:16:15.000000000 +0000
++++ pwlib-1.10.3~dfsg/make/plugins.mak	2007-05-20 10:55:06.000000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ PLUGIN_FILENAME = $(PLUGIN_NAME)_pwplugin.$(LIB_SUFFIX)
+ 
+-OBJDIR = ../pwlib/$(PLUGIN_FAMILY)
++OBJDIR = ../pwlib$(OBJDIR_SUFFIX)/$(PLUGIN_FAMILY)
+ 
+ TARGET = $(OBJDIR)/$(PLUGIN_FILENAME)
+ 
+diff -urNad pwlib-1.10.3~dfsg~/make/unix.mak pwlib-1.10.3~dfsg/make/unix.mak
+--- pwlib-1.10.3~dfsg~/make/unix.mak	2007-05-20 10:52:38.000000000 +0000
++++ pwlib-1.10.3~dfsg/make/unix.mak	2007-05-20 10:52:38.000000000 +0000
+@@ -936,10 +936,12 @@
+ UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
+ endif
+ 
++ifndef PW_LIBDIR
  PW_LIBDIR	= $(PWLIBDIR)/lib
++endif
  
  # set name of the PT library
 -PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-+#PTLIB_BASE	= pt_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
-+ifeq ($(findstring $(OBJ_SUFFIX),d),)
-+PTLIB_BASE     = pt
-+else
-+PTLIB_BASE     = pt_$(OBJ_SUFFIX)
-+endif
++PTLIB_BASE	= pt
  PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
  PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
  PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
- 

Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2007-05-20 11:39:07 UTC (rev 3588)
+++ pwlib/trunk/debian/rules	2007-05-20 14:27:17 UTC (rev 3589)
@@ -268,7 +268,7 @@
 	dh_testdir
 	dh_testroot
 	
-ifneq (5,$(DH_COMPAT))
+ifneq (4,$(DH_COMPAT))
 	dh_strip --dbg-package=libpt-dbg
 else
 	# As dh_strip does not work fine for multiple binary package

More information about the Pkg-voip-commits mailing list