[Pkg-voip-commits] r7040 - in /ptlib/branches/ptlib-1.10.10/debian: changelog control rules

[msp at alioth.debian.org]

Author: msp
Date: Sat Apr 25 04:57:41 2009
New Revision: 7040

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7040
Log:
* Disable AVC & DC plugins (obsolete & replaced by V4L plugins)
  - (Closes: #519047): "pwlib FTBFS"

Modified:
    ptlib/branches/ptlib-1.10.10/debian/changelog
    ptlib/branches/ptlib-1.10.10/debian/control
    ptlib/branches/ptlib-1.10.10/debian/rules

Modified: ptlib/branches/ptlib-1.10.10/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-1.10.10/debian/changelog?rev=7040&op=diff
==============================================================================
--- ptlib/branches/ptlib-1.10.10/debian/changelog (original)
+++ ptlib/branches/ptlib-1.10.10/debian/changelog Sat Apr 25 04:57:41 2009
@@ -17,7 +17,11 @@
   [ Tzafrir Cohen ]
   * Fix Build-Conflict syntax (Closes: #508266). 
 
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 09 Dec 2008 15:42:50 +0200
+  [ Mark Purcell ]
+  * Disable AVC & DC plugins (obsolete & replaced by V4L plugins)
+    - (Closes: #519047): "pwlib FTBFS"
+
+ -- Mark Purcell <msp at debian.org>  Sat, 25 Apr 2009 14:39:59 +1000
 
 pwlib (1.10.10-2) unstable; urgency=low
 

Modified: ptlib/branches/ptlib-1.10.10/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-1.10.10/debian/control?rev=7040&op=diff
==============================================================================
--- ptlib/branches/ptlib-1.10.10/debian/control (original)
+++ ptlib/branches/ptlib-1.10.10/debian/control Sat Apr 25 04:57:41 2009
@@ -3,16 +3,16 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-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: debhelper (>= 5), bison, flex, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, g++ (>=2.95), autotools-dev, dpatch (>=1.11), libasound2-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-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-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 Homepage: http://www.voxgratia.org/
-Vcs-Svn: svn://svn.debian.org/pkg-voip/pwlib/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/pwlib/?op=log
+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
 
 Package: libpt-1.10.10
 Section: libs
@@ -82,28 +82,6 @@
  devices.  Install this package, if you want to use a video device
  that is not attached to FireWire.
 
-Package: libpt-1.10.10-plugins-avc
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libpt-plugins-avc
-Replaces: libpt-plugins-avc
-Provides: libpt-plugins-avc
-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
- device.
-
-Package: libpt-1.10.10-plugins-dc
-Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libpt-plugins-dc
-Replaces: libpt-plugins-dc
-Provides: libpt-plugins-dc
-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 
- device.
-
 Package: libpt-1.10.10-plugins-oss
 Architecture: any
 Depends: ${shlibs:Depends}

Modified: ptlib/branches/ptlib-1.10.10/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/branches/ptlib-1.10.10/debian/rules?rev=7040&op=diff
==============================================================================
--- ptlib/branches/ptlib-1.10.10/debian/rules (original)
+++ ptlib/branches/ptlib-1.10.10/debian/rules Sat Apr 25 04:57:41 2009
@@ -50,7 +50,7 @@
 build-arch: config.status build-arch-stamp
 
 config.status: patch-stamp autotools configure
-	./configure $(confflags) --enable-plugins --enable-v4l2 --prefix=/usr
+	./configure $(confflags) --enable-plugins --enable-v4l2 --enable-oss --enable-v4l --disable-avc --disable-dc --prefix=/usr
 
 autotools:
 	rm -f config.sub config.guess
@@ -217,16 +217,6 @@
 	cp plugins/pwlib/device/videoinput/v4l2_pwplugin.so \
 		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/pwlib/device/videoinput/avc_pwplugin.so \
-		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/pwlib/device/videoinput/dc_pwplugin.so \
-		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/pwlib/device/sound/oss_pwplugin.so \