[Pkg-voip-commits] r7401 - in /ptlib/trunk/debian: changelog control rules

dedu-guest at alioth.debian.org dedu-guest at alioth.debian.org
Tue Jul 7 20:05:19 UTC 2009


Author: dedu-guest
Date: Tue Jul  7 20:05:17 2009
New Revision: 7401

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7401
Log:
* New upstream release (Closes: #533519)
* Gather all the current plugins into one package, since they were
  really small.

Modified:
    ptlib/trunk/debian/changelog
    ptlib/trunk/debian/control
    ptlib/trunk/debian/rules

Modified: ptlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/changelog?rev=7401&op=diff
==============================================================================
--- ptlib/trunk/debian/changelog (original)
+++ ptlib/trunk/debian/changelog Tue Jul  7 20:05:17 2009
@@ -1,7 +1,9 @@
 ptlib (2.6.4-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * New upstream release (Closes #533519)
+  * New upstream release (Closes: #533519)
+  * Gather all the current plugins into one package, since they were
+    really small.
 
  -- Mark Purcell <msp at debian.org>  Sat, 06 Jun 2009 12:21:35 +1000
 

Modified: ptlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/control?rev=7401&op=diff
==============================================================================
--- ptlib/trunk/debian/control (original)
+++ ptlib/trunk/debian/control Tue Jul  7 20:05:17 2009
@@ -22,7 +22,7 @@
 Package: libpt2.6.4
 Architecture: any
 Depends: ${shlibs:Depends}
-Suggests: libpt2.6.4-plugins-alsa|libpt2.6.4-plugins-oss, libpt2.6.4-plugins-v4l2|libpt2.6.4-plugins-v4l
+Suggests: libpt2.6.4-plugins
 Replaces: libpt-snapshot, libpt2.3-beta1
 Conflicts: libpt-snapshot, libpt2.3-beta1
 Description: Portable Tools Library
@@ -67,43 +67,12 @@
  many years ago as a method to produce applications to run on both
  Microsoft Windows and Unix X-Window systems.
 
-Package: libpt2.6.4-plugins-v4l2
+Package: libpt2.6.4-plugins
 Architecture: any
 Depends: ${shlibs:Depends}, libpt2.6.4 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
-Conflicts: libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
-Description: Portable Tools 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
- that is not attached to FireWire.
-
-Package: libpt2.6.4-plugins-v4l
-Architecture: any
-Depends: ${shlibs:Depends}, libpt2.6.4 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-v4l, libpt2.3-beta1-plugins-v4l
-Conflicts: libpt-snapshot-plugins-v4l, libpt2.3-beta1-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
- that is not attached to FireWire.
-
-Package: libpt2.6.4-plugins-alsa
-Architecture: any
-Depends: ${shlibs:Depends}, libpt2.6.4 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-alsa, libpt2.3-beta1-plugins-alsa
-Conflicts: libpt-snapshot-plugins-alsa, libpt2.3-beta1-plugins-alsa
-Recommends: alsa-base
-Description: PTLib audio plugin for the ALSA Interface
- This package contains the PTLib plugin for usage with the Advanced
- Linux Sound Architecture interface.  Install this package, if you
- are utilising this interface.
-
-Package: libpt2.6.4-plugins-oss
-Architecture: any
-Depends: ${shlibs:Depends}, libpt2.6.4 (= ${binary:Version})
-Replaces: libpt-snapshot-plugins-oss, libpt2.3-beta1-plugins-oss
-Conflicts: libpt-snapshot-plugins-oss, libpt2.3-beta1-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
- interface.
+Replaces: libpt2.6.3-plugins-alsa, libpt2.6.3-plugins-oss, libpt2.6.3-plugins-v4l2, libpt2.6.3-plugins-v4l, libpt2.6.1-plugins-alsa, libpt2.6.1-plugins-oss, libpt2.6.1-plugins-v4l2, libpt2.6.1-plugins-v4l, libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
+Conflicts: libpt2.6.3-plugins-alsa, libpt2.6.3-plugins-oss, libpt2.6.3-plugins-v4l2, libpt2.6.3-plugins-v4l, libpt2.6.1-plugins-alsa, libpt2.6.1-plugins-oss, libpt2.6.1-plugins-v4l2, libpt2.6.1-plugins-v4l, libpt-snapshot-plugins-v4l2, libpt2.3-beta1-plugins-v4l2
+Description: Portable Tools Library plugins
+ This package contains all the current PTLib plugins (alsa, oss, v4l2,
+ and v4l).  Install this package if you want to use a video or audio
+ device.

Modified: ptlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ptlib/trunk/debian/rules?rev=7401&op=diff
==============================================================================
--- ptlib/trunk/debian/rules (original)
+++ ptlib/trunk/debian/rules Tue Jul  7 20:05:17 2009
@@ -124,19 +124,9 @@
 	dh_install -a
 	# see libpt-dev.install for list of files
 
-	# TODO replace by libpt2.6.1-plugins-{v4l2,v4l}.install
-	for i in v4l2 v4l; do \
-		mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/videoinput ; \
-		mv debian/tmp/usr/lib/ptlib*/devices/videoinput/$${i}_pwplugin.so \
-			debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/videoinput/ ; \
-	done
-
-	# TODO replace by libpt2.6.1-plugins-{alsa,oss}.install
-	for i in alsa oss; do \
-		mkdir -p debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/sound ; \
-		mv debian/tmp/usr/lib/ptlib*/devices/sound/$${i}_pwplugin.so \
-			debian/$(PACKAGE)-plugins-$$i/usr/lib/ptlib-$(DIRNAME)/devices/sound/ ; \
-	done
+	# TODO replace by libpt2.6.4-plugins.install
+	mkdir -p debian/$(PACKAGE)-plugins/usr/lib/ptlib-$(DIRNAME)
+	mv debian/tmp/usr/lib/ptlib*/devices/ debian/$(PACKAGE)-plugins/usr/lib/ptlib-$(DIRNAME)
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-multi
@@ -145,10 +135,10 @@
 	dh_testdir
 	dh_testroot
 	#$(PACKAGE) has docs in /usr/share/doc, all the others use links
-	dh_installdocs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
+	dh_installdocs -N$(PACKAGE)-plugins -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
 	dh_installman
-	dh_installchangelogs -N$(PACKAGE)-plugins-alsa -N$(PACKAGE)-plugins-oss -N$(PACKAGE)-plugins-v4l -N$(PACKAGE)-plugins-v4l2 -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
-	-test "x$(DH_OPTIONS)" = "x-a" && for pkg in plugins-alsa 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
+	dh_installchangelogs -N$(PACKAGE)-plugins -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
+	-test "x$(DH_OPTIONS)" = "x-a" && for pkg in plugins dev dbg; do mkdir -p debian/$(PACKAGE)-$$pkg/usr/share/doc; ln -s $(PACKAGE) debian/$(PACKAGE)-$$pkg/usr/share/doc/$(PACKAGE)-$$pkg; done
 
 	dh_link
 	dh_compress
@@ -172,8 +162,7 @@
 	# we need to workaround that manually
 	dh_strip --exclude=libpt_d --keep-debug
 
-	for pack in $(PACKAGE) $(PACKAGE)-plugins-alsa $(PACKAGE)-plugins-oss \
-		$(PACKAGE)-plugins-v4l $(PACKAGE)-plugins-v4l2 ; \
+	for pack in $(PACKAGE) $(PACKAGE)-plugins ; \
 	do \
 		cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
 			rm -rf debian/$$pack/usr/lib/debug; \




More information about the Pkg-voip-commits mailing list