[Pkg-voip-commits] r6114 - in /opal/branches/experimental/debian: control rules

[dedu-guest at alioth.debian.org]

Author: dedu-guest
Date: Sun Aug 31 13:06:51 2008
New Revision: 6114

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6114
Log:
Fixes: conflict with unofficial snapshot packages and ensure that
non-free plugins are removed

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

Modified: opal/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/control?rev=6114&op=diff
==============================================================================
--- opal/branches/experimental/debian/control (original)
+++ opal/branches/experimental/debian/control Sun Aug 31 13:06:51 2008
@@ -14,7 +14,8 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0
+Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal-snapshot
+Replaces: libopal-snapshot
 Description: Open Phone Abstraction Library - successor of OpenH323
  This package contains the shared version of the OPAL library.
  .
@@ -26,8 +27,9 @@
 Package: libopal-3.3-dev
 Section: libdevel
 Architecture: any
-Conflicts: openmpi-dev
+Conflicts: openmpi-dev, libopal-snapshot-dev
 Depends: libopal-3.3 (= ${binary:Version}), libpt-2.3-dev
+Replaces: libopal-snapshot-dev
 Description: OPAL library header files
  This package contains the headers and a static version of the
  OPAL library.
@@ -54,6 +56,8 @@
 Section: libdevel
 Priority: extra
 Depends: libopal-3.3 (= ${binary:Version})
+Replaces: libopal-snapshot-dbg
+Conflicts: libopal-snapshot-dbg
 Architecture: any
 Description: OPAL library debug symbols
  This package contains the shared and static debug symbols of the

Modified: opal/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/rules?rev=6114&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Sun Aug 31 13:06:51 2008
@@ -148,7 +148,11 @@
 	#- because cannot move a directory into itself
 	-mv debian/$(PACKAGE)/usr/lib/ptlib/* debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
 	#iLBC is not DFSG
-	rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/audio/ilbc_audio_pwplugin.so
+	rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/audio/ilbc*
+	#remove non-free video codecs (if any)
+	-rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/video/h264*
+	-rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/video/h263-1998*
+	-rm debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)/plugins/codec/video/mpeg4*
 
 	# simpleopal
 	$(MAKE) $(MAKE_BUILD_PARAM) P_SHAREDLIB=1 INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install