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

Kilian Krause kilian at costa.debian.org
Sat Dec 3 18:12:48 UTC 2005


Author: kilian
Date: 2005-12-03 18:12:47 +0000 (Sat, 03 Dec 2005)
New Revision: 1049

Added:
   pwlib/trunk/debian/patches/11_minor_fixes.dpatch
Modified:
   pwlib/trunk/debian/changelog
   pwlib/trunk/debian/control
   pwlib/trunk/debian/patches/00list
   pwlib/trunk/debian/rules
Log:
prepare new upload as libpt-1.8.7


Modified: pwlib/trunk/debian/changelog
===================================================================
--- pwlib/trunk/debian/changelog	2005-12-01 18:04:02 UTC (rev 1048)
+++ pwlib/trunk/debian/changelog	2005-12-03 18:12:47 UTC (rev 1049)
@@ -1,7 +1,24 @@
-pwlib (1.8.7-2) unstable; urgency=low
+pwlib (1.8.7-2) unstable; urgency=high
 
   [ Kilian Krause ]
-  * Conflict old pwlib version to allow clean upgrade. (Closes: #331634)
+  * High-urgency upload for multiple RC bugfixes.
+  * Fix casts to match current OpenSSL prototypes (closes: #335490).
+  * Use -O2 instead of -Os when building, as recommended by policy; this
+    fixes a build-time failure on alpha when running any code linked against
+    libpt.
+  * Drop the libpt.so.1.8.3 and libpt.so.1.8.4 symlinks; the native soname
+    is now libpt.so.1.8.7, so since we're no longer compatible with older
+    reverse-dependencies anyway due to the ABI change, these serve no
+    purpose.  Here's hoping someone clues upstream in on handling of SONAMEs
+    before the next release.
+  * Rename libpt-1.8.3c2 to libpt-1.8.7 for the C++ mt allocator ABI
+    transition, and conflict/replace libpt-1.8.3c2 accordingly
+    (closes: #339253).  Thanks to the change above, this only requires
+    conflict/replacing libpt-1.8.3c2 (>= 1.8.7-1).
+  * Get rid of the useless /usr/lib/libpt.so.1 link: this serves no purpose
+    when the package soname is libpt.so.1.8.7, because *nothing* will ever
+    use it, so the easiest way to avoid conflicts is to not ship it
+    anywhere! (closes: #331634)
   * Fix most of the warnings.
 
   [ Jose Carlos Garcia Sogo ]
@@ -9,7 +26,7 @@
   * Removed spurious dash in clean (Closes: #338464)
   * Recompiled with newer libssl0.9.8
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 20 Nov 2005 14:48:59 +0100
+ -- Kilian Krause <kilian at debian.org>  Sat,  3 Dec 2005 18:58:39 +0100
 
 pwlib (1.8.7-1) unstable; urgency=low
 

Modified: pwlib/trunk/debian/control
===================================================================
--- pwlib/trunk/debian/control	2005-12-01 18:04:02 UTC (rev 1048)
+++ pwlib/trunk/debian/control	2005-12-03 18:12:47 UTC (rev 1049)
@@ -5,15 +5,15 @@
 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), 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, libdc1394-13-dev, libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers, binutils (>= 2.14.90.0.7)
 Build-Depends-Indep: doxygen
-Build-Conflicts: libpt-1.8.3, libpt-1.8.3c2, libpt-dev
+Build-Conflicts: libpt-1.8.7, libpt-1.8.3, libpt-1.8.3c2, libpt-1.8.3c2a, libpt-dev
 Standards-Version: 3.6.2
 
-Package: libpt-1.8.3c2a
+Package: libpt-1.8.7
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Replaces: libpt-1.8.3, libpt-1.8.3c2
-Conflicts: libpt-1.8.3, libpt-1.8.3c2
+Replaces: libpt-1.8.3c2 (>= 1.8.7-1), libpt-1.8.3c2a
+Conflicts: libpt-1.8.3c2 (>= 1.8.7-1), libpt-1.8.3c2a
 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
@@ -26,7 +26,7 @@
 Package: libpt-dev
 Section: libdevel
 Architecture: any
-Depends: libpt-1.8.3c2a (= ${Source-Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Depends: libpt-1.8.7 (= ${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
@@ -40,7 +40,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libpt-1.8.3c2a (= ${Source-Version})
+Depends: libpt-1.8.7 (= ${Source-Version})
 Description: Portable Windows Library development debug files
  This package contains the shared and static debug version of the library
  PWLib, which is a moderately large class library that has its genesis
@@ -66,7 +66,7 @@
 Package: libpt-plugins-v4l
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.7 (= ${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
@@ -75,7 +75,7 @@
 Package: libpt-plugins-v4l2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.7 (= ${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
@@ -84,7 +84,7 @@
 
 Package: libpt-plugins-avc
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.7 (= ${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
@@ -92,7 +92,7 @@
 
 Package: libpt-plugins-dc
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.7 (= ${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 
@@ -100,7 +100,7 @@
 
 Package: libpt-plugins-oss
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.7 (= ${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
@@ -108,7 +108,7 @@
 
 Package: libpt-plugins-alsa
 Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3c2a (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.7 (= ${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

Modified: pwlib/trunk/debian/patches/00list
===================================================================
--- pwlib/trunk/debian/patches/00list	2005-12-01 18:04:02 UTC (rev 1048)
+++ pwlib/trunk/debian/patches/00list	2005-12-03 18:12:47 UTC (rev 1049)
@@ -7,3 +7,4 @@
 08_fix_casts
 09_virtual_destructors
 10_doxygen
+11_minor_fixes

Added: pwlib/trunk/debian/patches/11_minor_fixes.dpatch
===================================================================
--- pwlib/trunk/debian/patches/11_minor_fixes.dpatch	2005-12-01 18:04:02 UTC (rev 1048)
+++ pwlib/trunk/debian/patches/11_minor_fixes.dpatch	2005-12-03 18:12:47 UTC (rev 1049)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_minor_fixes.dpatch by Steve Langasek <vorlon at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix minor things
+
+ at DPATCH@
+--- pwlib-1.8.7.orig/src/ptclib/pdns.cxx
++++ pwlib-1.8.7/src/ptclib/pdns.cxx
+@@ -265,7 +265,7 @@
+   BYTE * cp         = reply.buf + sizeof(HEADER);
+ 
+   // ignore questions in response
+-  unsigned i;
++  uint16_t i;
+   for (i = 0; i < ntohs(reply.hdr.qdcount); i++) {
+     char qName[MAXDNAME];
+     if (!GetDN(replyStart, replyEnd, cp, qName))
+--- pwlib-1.8.7.orig/src/ptlib/common/osutils.cxx
++++ pwlib-1.8.7/src/ptlib/common/osutils.cxx
+@@ -1010,9 +1010,9 @@
+      stderr is used the unitbuf flag causes the out_waiting() not to work so we 
+      must suffer with blank lines in that case.
+    */
+-  ::streambuf & rb = *s.rdbuf();
+ #if 0
+ #ifndef P_LINUX
++  ::streambuf & rb = *s.rdbuf();
+   if (((s.flags()&ios::unitbuf) != 0) ||
+ #ifdef __USE_STL__
+           rb.pubseekoff(0, ios::cur, ios::out) > 0

Modified: pwlib/trunk/debian/rules
===================================================================
--- pwlib/trunk/debian/rules	2005-12-01 18:04:02 UTC (rev 1048)
+++ pwlib/trunk/debian/rules	2005-12-03 18:12:47 UTC (rev 1049)
@@ -3,10 +3,9 @@
 export DH_COMPAT=5
 
 # Change this on API breakage
-export LIBPTCOMPAT=1.8.3
-export LIBPTCOMPAT2=1.8.4
+export LIBPTCOMPAT=1.8.7
 
-PACKAGE=libpt-$(LIBPTCOMPAT)c2a
+PACKAGE=libpt-$(LIBPTCOMPAT)
 
 
 VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h)
@@ -15,10 +14,12 @@
 
 SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
 
-CFLAGS = -g
+CFLAGS = -g -Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
+else
+       CFLAGS += -O2
 endif
 
 export CFLAGS
@@ -86,8 +87,8 @@
 clean-patched:
 	$(checkdir)
 	-rm -f build-arch-stamp build-indep-stamp patch-stamp
-	if [ -f Makefile ];then \
-	$(MAKE) PWLIBDIR=$(PWD) clean || true;\
+	-if [ -f Makefile ];then \
+		$(MAKE) PWLIBDIR=$(PWD) clean || true;\
 	fi
 	-rm -f include/ptbuildopts.h
 	-rm -f Makefile config.log config.status autotools
@@ -124,10 +125,6 @@
 	ln -s libpt.so.$(SHLIBSVER) \
 	    debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT)
 endif
-ifneq ($(SHLIBSVER),$(LIBPTCOMPAT2))
-	ln -s libpt.so.$(SHLIBSVER) \
-	    debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT2)
-endif
 
 #	libpt-dev
 	dh_movefiles -plibpt-dev --sourcedir=debian/$(PACKAGE) `cd debian/$(PACKAGE); ls -1 usr/lib/*.so*|grep -v -E lib.*\.[0-9]\+\.[0-9]\+\.[0-9]\+`




More information about the Pkg-voip-commits mailing list