[Pkg-voip-commits] r9083 - in /ptlib/branches/ptlib1.10-phobos/debian: changelog control libpt-1.10.10-dbg.dirs patches/00list patches/sslv2.dpatch patches/v4l2.dpatch rules
msp at alioth.debian.org
msp at alioth.debian.org
Sat Jul 2 04:59:39 UTC 2011
Author: msp
Date: Sat Jul 2 04:59:38 2011
New Revision: 9083
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9083
Log:
* Ack NMU - Thanks Julien (Closes: #622075).
* Update Vcs-Svn: & Vcs-Browser
* Non-maintainer upload.
* Fix FTBFS with openssl 1.0 (closes: #622075).
* Drop v4l plugin, v4l1 is dead.
Added:
ptlib/branches/ptlib1.10-phobos/debian/libpt-1.10.10-dbg.dirs
ptlib/branches/ptlib1.10-phobos/debian/patches/sslv2.dpatch (with props)
ptlib/branches/ptlib1.10-phobos/debian/patches/v4l2.dpatch (with props)
Modified:
ptlib/branches/ptlib1.10-phobos/debian/changelog
ptlib/branches/ptlib1.10-phobos/debian/control
ptlib/branches/ptlib1.10-phobos/debian/patches/00list
ptlib/branches/ptlib1.10-phobos/debian/rules
Modified: ptlib/branches/ptlib1.10-phobos/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/changelog?rev=9083&op=diff
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/changelog (original)
+++ ptlib/branches/ptlib1.10-phobos/debian/changelog Sat Jul 2 04:59:38 2011
@@ -1,8 +1,17 @@
pwlib (1.10.10-4) UNRELEASED; urgency=low
- * NOT RELEASED YET
-
- -- Mark Purcell <msp at debian.org> Sat, 25 Apr 2009 23:29:31 +1000
+ * Ack NMU - Thanks Julien (Closes: #622075).
+ * Update Vcs-Svn: & Vcs-Browser
+
+ -- Mark Purcell <msp at debian.org> Sat, 02 Jul 2011 14:20:41 +1000
+
+pwlib (1.10.10-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with openssl 1.0 (closes: #622075).
+ * Drop v4l plugin, v4l1 is dead.
+
+ -- Julien Cristau <jcristau at debian.org> Fri, 01 Jul 2011 23:22:15 +0200
pwlib (1.10.10-3) unstable; urgency=low
Modified: ptlib/branches/ptlib1.10-phobos/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/control?rev=9083&op=diff
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/control (original)
+++ ptlib/branches/ptlib1.10-phobos/debian/control Sat Jul 2 04:59:38 2011
@@ -7,17 +7,16 @@
Build-Conflicts: libpt-1.11.2, libpt-1.11.2-ptrace, libpt-1.11.2-develop,
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-1.10.10-dev, libpt-dev
Standards-Version: 3.8.1
Homepage: http://www.voxgratia.org/
-Vcs-Svn: svn://svn.debian.org/pkg-voip/ptlib/branches/ptlib-1.10.10/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-1.10.10/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-voip/ptlib/branches/ptlib1.10-phobos/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/ptlib/branches/ptlib1.10-phobos/
Package: libpt-1.10.10
Section: libs
Architecture: any
-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
+Depends: ${shlibs:Depends}, libpt-1.10.10-plugins-alsa|libpt-1.10.10-plugins-oss, libpt-1.10.10-plugins-v4l2
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
@@ -60,18 +59,6 @@
many years ago as a method to produce applications to run on both
Microsoft Windows and Unix X-Window systems.
-Package: libpt-1.10.10-plugins-v4l
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libpt-plugins-v4l
-Replaces: libpt-plugins-v4l
-Provides: libpt-plugins-v4l
-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
- that is not attached to FireWire.
-
Package: libpt-1.10.10-plugins-v4l2
Section: libs
Architecture: any
Added: ptlib/branches/ptlib1.10-phobos/debian/libpt-1.10.10-dbg.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/libpt-1.10.10-dbg.dirs?rev=9083&op=file
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/libpt-1.10.10-dbg.dirs (added)
+++ ptlib/branches/ptlib1.10-phobos/debian/libpt-1.10.10-dbg.dirs Sat Jul 2 04:59:38 2011
@@ -1,0 +1,1 @@
+usr/lib/debug/usr/lib
Modified: ptlib/branches/ptlib1.10-phobos/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/patches/00list?rev=9083&op=diff
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/patches/00list (original)
+++ ptlib/branches/ptlib1.10-phobos/debian/patches/00list Sat Jul 2 04:59:38 2011
@@ -3,3 +3,5 @@
05_hppa
06_plugins_shared
CVE-2007-4897
+v4l2
+sslv2
Added: ptlib/branches/ptlib1.10-phobos/debian/patches/sslv2.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/patches/sslv2.dpatch?rev=9083&op=file
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/patches/sslv2.dpatch (added)
+++ ptlib/branches/ptlib1.10-phobos/debian/patches/sslv2.dpatch Sat Jul 2 04:59:38 2011
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## sslv2.dpatch by <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pwlib-1.10.10~/src/ptclib/pssl.cxx pwlib-1.10.10/src/ptclib/pssl.cxx
+--- pwlib-1.10.10~/src/ptclib/pssl.cxx 2005-11-30 23:47:41.000000000 +1100
++++ pwlib-1.10.10/src/ptclib/pssl.cxx 2011-07-02 14:56:06.000000000 +1000
+@@ -888,7 +888,7 @@
+ InitialisationMutex.Signal();
+
+ // create the new SSL context
+- SSL_METHOD * meth = SSLv23_method();
++ const SSL_METHOD * meth = SSLv23_method();
+ context = SSL_CTX_new(meth);
+ if (context == NULL)
+ PSSLAssert("Error creating context: ");
Propchange: ptlib/branches/ptlib1.10-phobos/debian/patches/sslv2.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: ptlib/branches/ptlib1.10-phobos/debian/patches/v4l2.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/patches/v4l2.dpatch?rev=9083&op=file
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/patches/v4l2.dpatch (added)
+++ ptlib/branches/ptlib1.10-phobos/debian/patches/v4l2.dpatch Sat Jul 2 04:59:38 2011
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## v4l2.dpatch by <msp at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pwlib-1.10.10~/plugins/vidinput_v4l2/vidinput_v4l2.h pwlib-1.10.10/plugins/vidinput_v4l2/vidinput_v4l2.h
+--- pwlib-1.10.10~/plugins/vidinput_v4l2/vidinput_v4l2.h 2007-02-20 09:28:42.000000000 +1100
++++ pwlib-1.10.10/plugins/vidinput_v4l2/vidinput_v4l2.h 2011-07-02 14:54:20.000000000 +1000
+@@ -80,7 +80,7 @@
+ #ifdef SOLARIS
+ #include <sys/videodev2.h>
+ #else
+-#include <linux/videodev.h>
++#include <linux/videodev2.h>
+ #endif
+
+ #ifndef V4L2_PIX_FMT_SBGGR8
Propchange: ptlib/branches/ptlib1.10-phobos/debian/patches/v4l2.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: ptlib/branches/ptlib1.10-phobos/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib1.10-phobos/debian/rules?rev=9083&op=diff
==============================================================================
--- ptlib/branches/ptlib1.10-phobos/debian/rules (original)
+++ ptlib/branches/ptlib1.10-phobos/debian/rules Sat Jul 2 04:59:38 2011
@@ -50,7 +50,7 @@
build-arch: config.status build-arch-stamp
config.status: patch-stamp autotools configure
- ./configure $(confflags) --enable-plugins --enable-v4l2 --enable-oss --enable-v4l --disable-avc --disable-dc --prefix=/usr
+ ./configure $(confflags) --enable-plugins --enable-v4l2 --enable-oss --disable-v4l --disable-avc --disable-dc --prefix=/usr
autotools:
rm -f config.sub config.guess
@@ -206,11 +206,6 @@
# plugins
- #$(PACKAGE)-plugins-v4l
- install -d -m 755 debian/$(PACKAGE)-plugins-v4l/usr/lib/pwlib/$(SHLIBSVER)/device/videoinput/
- cp plugins/pwlib/device/videoinput/v4l_pwplugin.so \
- debian/$(PACKAGE)-plugins-v4l/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/pwlib/device/videoinput/v4l2_pwplugin.so \
@@ -267,7 +262,7 @@
dh_strip --exclude=libpt_d --keep-debug
for pack in $(PACKAGE) $(PACKAGE)-plugins-alsa $(PACKAGE)-plugins-oss \
- $(PACKAGE)-plugins-v4l $(PACKAGE)-plugins-v4l2 $(PACKAGE)-plugins-avc \
+ $(PACKAGE)-plugins-v4l2 $(PACKAGE)-plugins-avc \
$(PACKAGE)-plugins-dc ; \
do \
cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
More information about the Pkg-voip-commits
mailing list