Here is the small .diff that was applied to pwlib 1.8.4-1 for the
1.8.4-1.1 NMU upload.
Regards,
--
Sam.
diff -puriN pwlib_Mimas_rc1/debian/changelog pwlib-1.8.4/debian/changelog
--- pwlib_Mimas_rc1/debian/changelog 2005-07-14 15:33:33.000000000 +0200
+++ pwlib-1.8.4/debian/changelog 2005-07-14 14:26:10.000000000 +0200
@@ -1,3 +1,20 @@
+pwlib (1.8.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload (g++ transition).
+ * debian/control:
+ + Build-depend on libdc1394-13-dev instead of libdc1394-11-dev so that
+ the package can build (Closes: #315233) and libpt-plugins-dc is
+ installable again (Closes: #309873, #313032).
+ + Removed the build-dependency on g++.
+ + Renamed package to libpt-1.8.3c2 for the g++ transition (Closes:
#310825).
+ * debian/patches/08_g++4.dpatch:
+ + Patch courtesy of Andreas Jochens to fix g++4.0 build.
+ * debian/rules:
+ + Copy config.sub and config.guess instead of linking them to allow the
+ package to rebuild properly (Closes: #310813).
+
+ -- Sam Hocevar (Debian packages) <[EMAIL PROTECTED]> Thu, 14 Jul 2005
14:39:40 +0300
+
pwlib (1.8.4-1) unstable; urgency=low
* New upstream release, codename Mimas.
diff -puriN pwlib_Mimas_rc1/debian/control pwlib-1.8.4/debian/control
--- pwlib_Mimas_rc1/debian/control 2005-07-14 15:33:33.000000000 +0200
+++ pwlib-1.8.4/debian/control 2005-07-14 14:24:20.000000000 +0200
@@ -3,17 +3,17 @@ Section: libs
Priority: optional
Maintainer: Debian VoIP Team <[EMAIL PROTECTED]>
Uploaders: Kilian Krause <[EMAIL PROTECTED]>, Jose Carlos Garcia Sogo <[EMAIL
PROTECTED]>, Mark Purcell <[EMAIL PROTECTED]>, Santiago Garcia Mantinan <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>=4.0.2), 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-11-dev,
libsasl2-dev, libkrb5-dev, doxygen, linux-kernel-headers
+Build-Depends: debhelper (>=4.0.2), bison, flex, libssl-dev, libldap2-dev,
libsdl1.2-dev, libexpat1-dev, autotools-dev, dpatch (>=1.11), libasound2-dev,
libavc1394-dev, libraw1394-dev, libdv-dev, libdc1394-13-dev, libsasl2-dev,
libkrb5-dev, doxygen, linux-kernel-headers
Build-Depends-Indep: doxygen
-Build-Conflicts: libpt-1.8.3
+Build-Conflicts: libpt-1.8.3, libpt-1.8.3c2
Standards-Version: 3.6.1
-Package: libpt-1.8.3
+Package: libpt-1.8.3c2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: libpt-1.5.2, libpt-1.6.3, libpt-1.7.5
-Conflicts: libpt-1.6.3, libpt-1.5.2, libpt-1.7.5
+Replaces: libpt-1.5.2, libpt-1.6.3, libpt-1.7.5, libpt-1.8.3
+Conflicts: libpt-1.6.3, libpt-1.5.2, libpt-1.7.5, libpt-1.8.3
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 @@ Description: Portable Windows Library
Package: libpt-dev
Section: libdevel
Architecture: any
-Depends: libpt-1.8.3 (= ${Source-Version}), libc6-dev, libssl-dev,
libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
+Depends: libpt-1.8.3c2 (= ${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
@@ -66,7 +66,7 @@ Description: Portable Windows Library do
Package: libpt-plugins-v4l
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.3c2 (= ${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 @@ Description: Portable Windows Library Vi
Package: libpt-plugins-v4l2
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.3c2 (= ${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 @@ Description: Portable Windows Library Vi
Package: libpt-plugins-avc
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.3c2 (= ${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 @@ Description: PWLib Video Plugin for IEEE
Package: libpt-plugins-dc
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.3c2 (= ${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 @@ Description: PWLib Video Plugin for IEEE
Package: libpt-plugins-oss
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.3c2 (= ${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 @@ Description: Portable Windows Library Au
Package: libpt-plugins-alsa
Architecture: any
-Depends: ${shlibs:Depends}, libpt-1.8.3 (= ${Source-Version})
+Depends: ${shlibs:Depends}, libpt-1.8.3c2 (= ${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
diff -puriN pwlib_Mimas_rc1/debian/patches/00list
pwlib-1.8.4/debian/patches/00list
--- pwlib_Mimas_rc1/debian/patches/00list 2005-07-14 15:33:33.000000000
+0200
+++ pwlib-1.8.4/debian/patches/00list 2005-07-14 13:50:46.000000000 +0200
@@ -5,3 +5,4 @@
05_hppa
06_plugins_shared
07_nostrip
+08_g++4
diff -puriN pwlib_Mimas_rc1/debian/patches/08_g++4.dpatch
pwlib-1.8.4/debian/patches/08_g++4.dpatch
--- pwlib_Mimas_rc1/debian/patches/08_g++4.dpatch 1970-01-01
01:00:00.000000000 +0100
+++ pwlib-1.8.4/debian/patches/08_g++4.dpatch 2005-07-14 13:50:25.000000000
+0200
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_g++4.dpatch by Andreas Jochens <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes for g++4.0 compilation
+
[EMAIL PROTECTED]@
+diff -urNad --exclude=CVS --exclude=.svn ./include/ptlib/pprocess.h
/tmp/dpep-work.iJhlKK/pwlib-1.8.4/include/ptlib/pprocess.h
+--- ./include/ptlib/pprocess.h 2004-06-30 14:17:04.000000000 +0200
++++ /tmp/dpep-work.iJhlKK/pwlib-1.8.4/include/ptlib/pprocess.h 2005-07-14
13:50:21.000000000 +0200
+@@ -249,6 +249,7 @@
+ #include <ptlib/syncpoint.h>
+ #include <ptlib/pfactory.h>
+
++class PHouseKeepingThread;
+
+ /**Create a process.
+ This macro is used to create the components necessary for a user PWLib
+@@ -752,10 +753,10 @@
+
+ PArgList arguments;
+ // The list of arguments
+-
++ public:
+ PTimerList timers;
+ // List of active timers in system
+-
++ private:
+ PTime programStartTime;
+ // time at which process was intantiated, i.e. started
+
+diff -urNad --exclude=CVS --exclude=.svn ./include/ptlib/timer.h
/tmp/dpep-work.iJhlKK/pwlib-1.8.4/include/ptlib/timer.h
+--- ./include/ptlib/timer.h 2003-09-17 11:01:00.000000000 +0200
++++ /tmp/dpep-work.iJhlKK/pwlib-1.8.4/include/ptlib/timer.h 2005-07-14
13:50:21.000000000 +0200
+@@ -123,6 +123,7 @@
+ #endif
+
+ class PThread;
++class PTimerList;
+
+ #include <ptlib/notifier.h>
+
+diff -urNad --exclude=CVS --exclude=.svn ./include/ptlib/unix/ptlib/pprocess.h
/tmp/dpep-work.iJhlKK/pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h
+--- ./include/ptlib/unix/ptlib/pprocess.h 2004-05-23 23:11:39.000000000
+0200
++++ /tmp/dpep-work.iJhlKK/pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h
2005-07-14 13:50:21.000000000 +0200
+@@ -171,6 +171,7 @@
+ PDICTIONARY(ThreadDict, POrdinalKey, PThread);
+ ThreadDict activeThreads;
+ PMutex threadMutex;
++ public:
+ int timerChangePipe[2];
+ PHouseKeepingThread * housekeepingThread;
+
diff -puriN pwlib_Mimas_rc1/debian/rules pwlib-1.8.4/debian/rules
--- pwlib_Mimas_rc1/debian/rules 2005-07-14 15:33:33.000000000 +0200
+++ pwlib-1.8.4/debian/rules 2005-07-14 14:24:38.000000000 +0200
@@ -5,7 +5,7 @@ export DH_COMPAT=4
# Change this on API breakage
export LIBPTCOMPAT=1.8.3
-PACKAGE=libpt-$(LIBPTCOMPAT)
+PACKAGE=libpt-$(LIBPTCOMPAT)c2
VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h)
@@ -50,32 +50,12 @@ Makefile: patch-stamp autotools
touch Makefile
autotools:
- -if [ -f config.sub.old ]; then \
- rm -f config.sub; \
- else \
- mv config.sub config.sub.old; \
- fi
- -if [ -f config.guess.old ]; then \
- rm -f config.guess; \
- else \
- mv config.guess config.guess.old; \
- fi
- ln -s /usr/share/misc/config.sub config.sub
- ln -s /usr/share/misc/config.guess config.guess
- - (cd plugins ; \
- if [ -f config.sub.old ]; then \
- rm -f config.sub; \
- else \
- mv config.sub config.sub.old; \
- fi; \
- if [ -f config.guess.old ]; then \
- rm -f config.guess; \
- else \
- mv config.guess config.guess.old; \
- fi; \
- ln -s /usr/share/misc/config.sub config.sub; \
- ln -s /usr/share/misc/config.guess config.guess; \
- cd ..)
+ rm -f config.sub config.guess
+ cp /usr/share/misc/config.sub config.sub
+ cp /usr/share/misc/config.guess config.guess
+ rm -f plugins/config.sub plugins/config.guess
+ cp /usr/share/misc/config.sub plugins/config.sub
+ cp /usr/share/misc/config.guess plugins/config.guess
touch autotools
build-arch-stamp:
@@ -108,6 +88,7 @@ clean-patched:
-$(MAKE) PWLIBDIR=$(PWD) clean
-rm -f include/ptbuildopts.h
-rm -f Makefile config.log config.status autotools
+ -rm -f config.sub config.guess plugins/config.sub plugins/config.guess
-rm -rf lib
-rm -f make/ptbuildopts.mak make/ptlib-config
-rm -rf plugins/pwlib
@@ -120,20 +101,6 @@ clean-patched:
-rm -rf html
-rm -f debian/libpt-*.*.docs
-rm -f core a.out
- -if [ -f config.sub.old ]; then \
- mv config.sub.old config.sub; \
- fi
- -if [ -f config.guess.old ]; then \
- mv config.guess.old config.guess; \
- fi
- -(cd plugins; \
- if [ -f config.sub.old ]; then \
- mv config.sub.old config.sub; \
- fi; \
- if [ -f config.guess.old ]; then \
- mv config.guess.old config.guess; \
- fi; \
- cd ..)
install: install-indep install-arch
install-indep:
