[Pkg-voip-commits] r6113 - in /pwlib/branches/experimental/debian: control rules

Sun Aug 31 13:05:38 UTC 2008

Author: dedu-guest
Date: Sun Aug 31 13:05:38 2008
New Revision: 6113

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6113
Log:
Fixes: conflicts with unofficial snapshot packages and typo changelogs
instead of docs

Modified:
    pwlib/branches/experimental/debian/control
    pwlib/branches/experimental/debian/rules

Modified: pwlib/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/control?rev=6113&op=diff
==============================================================================

--- pwlib/branches/experimental/debian/control (original)
+++ pwlib/branches/experimental/debian/control Sun Aug 31 13:05:38 2008
@@ -21,6 +21,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3-plugins-alsa|libpt-2.3-plugins-oss, libpt-2.3-plugins-v4l2|libpt-2.3-plugins-v4l|libpt-2.3-plugins-avc|libpt-2.3-plugins-dc
+Replaces: libpt-snapshot
+Conflicts: libpt-snapshot
 Description: Portable Tools Library
  This package contains the shared version of the library PTLib, which is
  a moderately large class library that has its genesis many years ago as
@@ -31,7 +33,8 @@
 Section: libdevel
 Architecture: any
 Depends: libpt-2.3 (= ${binary:Version}), libc6-dev, libssl-dev, libldap2-dev, libsdl1.2-dev, libexpat1-dev, libsasl2-dev
-Conflicts: libpt-dev
+Conflicts: libpt-dev, libpt-snapshot-dev
+Replaces: libpt-snapshot-dev
 Description: Portable Tools Library development files
  This package contains the headers and a static version of the library
  PTLib, which is a moderately large class library that has its genesis
@@ -43,6 +46,8 @@
 Priority: extra
 Architecture: any
 Depends: libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-dbg
+Conflicts: libpt-snapshot-dbg
 Description: Portable Tools Library development debug files
  This package contains the shared and static debug symbols of the library
  PTLib, which is a moderately large class library that has its genesis
@@ -65,6 +70,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-v4l
+Conflicts: libpt-snapshot-plugins-v4l
 Description: Portable Tools Library video plugin for Video4Linux
  This package contains the PTLib plugin for usage with Video4Linux
  devices.  Install this package, if you want to use a video device
@@ -74,6 +81,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-v4l2
+Conflicts: libpt-snapshot-plugins-v4l2
 Description: Portable Windows Library video plugin for Video4Linux v2
  This package contains the PTLib plugin for usage with Video4Linux v2
  devices.  Install this package, if you want to use a video device
@@ -82,6 +91,8 @@
 Package: libpt-2.3-plugins-avc
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-avc
+Conflicts: libpt-snapshot-plugins-avc
 Description: PTLib video plugin for IEEE1394 (FireWire) AVC devices
  This package contains the PTLib plugin for usage with AVC devices
  on FireWire.  Install this package, if you want to use such a video
@@ -90,6 +101,8 @@
 Package: libpt-2.3-plugins-dc
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-dc
+Conflicts: libpt-snapshot-plugins-dc
 Description: PTLib video plugin for IEEE1394 (Firewire) DC Devices
  This package contains the PTLib plugin for usage with DC Devices
  on Firewire.  Install this package, if you want to use such a video
@@ -98,6 +111,8 @@
 Package: libpt-2.3-plugins-oss
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-oss
+Conflicts: libpt-snapshot-plugins-oss
 Description: PTLib audio plugin for the OSS Interface
  This package contains the PTLib plugin for usage with the Open Sound
  System interface.  Install this package, if you are utilising this
@@ -106,6 +121,8 @@
 Package: libpt-2.3-plugins-alsa
 Architecture: any
 Depends: ${shlibs:Depends}, libpt-2.3 (= ${binary:Version})
+Replaces: libpt-snapshot-plugins-alsa
+Conflicts: libpt-snapshot-plugins-alsa
 Recommends: alsa-base
 Description: PTLib Audio Plugin for the ALSA Interface
  This package contains the PTLib plugin for usage with the Advanced

Modified: pwlib/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/pwlib/branches/experimental/debian/rules?rev=6113&op=diff
==============================================================================
--- pwlib/branches/experimental/debian/rules (original)
+++ pwlib/branches/experimental/debian/rules Sun Aug 31 13:05:38 2008
@@ -252,9 +252,9 @@
 	#-test "x$(DH_OPTIONS)" = "x-a" && find debian/$(PACKAGE)-doc/usr/share/doc/$(PACKAGE)-doc -name .svn -exec rm -rf {} \;
 	dh_installman
 	if [ ! -f ChangeLog ];then \
-		dh_installdocs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg ;\
+		dh_installchangelogs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg ;\
 	else \
-		dh_installdocs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg ChangeLog ;\
+		dh_installchangelogs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-avc -N$(PACKAGE)-plugins-dc -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg ChangeLog ;\
 	fi
 	-test "x$(DH_OPTIONS)" = "x-a" && for pkg in plugins-alsa plugins-avc plugins-dc plugins-oss plugins-v4l plugins-v4l2 dev dbg; do mkdir -p debian/$(PACKAGE)-$$pkg/usr/share/doc; ln -s $(PACKAGE) debian/$(PACKAGE)-$$pkg/usr/share/doc/$(PACKAGE)-$$pkg; done
 


