[Pkg-voip-commits] r6198 - in /opal/branches/experimental/debian: changelog control patches/libname.dpatch rules

dedu-guest at alioth.debian.org dedu-guest at alioth.debian.org
Sat Sep 13 10:05:09 UTC 2008 

Author: dedu-guest
Date: Sat Sep 13 10:05:08 2008
New Revision: 6198

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6198
Log:
* Build from svn snapshot REV 20940, refresh libname patch and rules
* Rename package to -beta1
* Build-Depends on libgsm1-dev in order to use Debian's library
* Remove h263-ffmpeg video codec, as suggested by upstream
* Remove, if any, plugins for non-free codecs (H263-1998, H264, MPEG4)

Modified:
    opal/branches/experimental/debian/changelog
    opal/branches/experimental/debian/control
    opal/branches/experimental/debian/patches/libname.dpatch
    opal/branches/experimental/debian/rules

Modified: opal/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/changelog?rev=6198&op=diff
==============================================================================
--- opal/branches/experimental/debian/changelog (original)
+++ opal/branches/experimental/debian/changelog Sat Sep 13 10:05:08 2008
@@ -1,5 +1,13 @@
-opal (3.3.0+svn20930.dfsg-1.1) experimental; urgency=low
+opal (3.3.0+svn20940.dfsg-1) voip; urgency=low
 
+  [ Eugen Dedu ]
+  * Build from svn snapshot REV 20940, refresh libname patch and rules
+  * Rename package to -beta1
+  * Build-Depends on libgsm1-dev in order to use Debian's library
+  * Remove h263-ffmpeg video codec, as suggested by upstream
+  * Remove, if any, plugins for non-free codecs (H263-1998, H264, MPEG4)
+
+  [ Mark Purcell ]
   * Switch to svn export
   * svn REV checkout is controlled from debian/changelog version
   * Update Description: to explict state this svn snapshot

Modified: opal/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/control?rev=6198&op=diff
==============================================================================
--- opal/branches/experimental/debian/control (original)
+++ opal/branches/experimental/debian/control Sat Sep 13 10:05:08 2008
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
-Build-Depends: debhelper (>= 4.0.2), libpt2.3-beta1-dev, dpatch, doxygen, autotools-dev, libspeex-dev, libspeexdsp-dev, pkg-config,  libtheora-dev
+Build-Depends: debhelper (>= 4.0.2), libpt2.3-beta1-dev, dpatch, doxygen, autotools-dev, libspeex-dev, libspeexdsp-dev, pkg-config,  libtheora-dev, libgsm1-dev
 Build-Conflicts: libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop
 Standards-Version: 3.8.0.0
 Homepage: http://www.opalvoip.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/opal/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/opal/?op=log
 
-Package: libopal-3.3 
+Package: libopal3.3-beta1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -24,11 +24,11 @@
  everybody.  These protocols are most used for Voice over IP (VoIP)
  conferencing.
 
-Package: libopal-3.3-dev
+Package: libopal3.3-beta1-dev
 Section: libdevel
 Architecture: any
 Conflicts: openmpi-dev, libopal-snapshot-dev
-Depends: libopal-3.3 (= ${binary:Version}), libpt-2.3-dev
+Depends: libopal3.3-beta1 (= ${binary:Version}), libpt2.3-beta1-dev
 Replaces: libopal-snapshot-dev
 Description: OPAL library header files - svn snapshot
  This package contains the headers and a static version of the
@@ -52,10 +52,10 @@
  everybody.  These protocols are most used for Voice over IP (VoIP)
  conferencing.
 
-Package: libopal-3.3-dbg
+Package: libopal3.3-beta1-dbg
 Section: libdevel
 Priority: extra
-Depends: libopal-3.3 (= ${binary:Version})
+Depends: libopal3.3-beta1 (= ${binary:Version})
 Replaces: libopal-snapshot-dbg
 Conflicts: libopal-snapshot-dbg
 Architecture: any
@@ -68,7 +68,7 @@
  everybody.  These protocols are most used for Voice over IP (VoIP)
  conferencing.
 
-Package: libopal-3.3-doc
+Package: libopal3.3-beta1-doc
 Section: doc
 Priority: extra
 Architecture: all

Modified: opal/branches/experimental/debian/patches/libname.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/patches/libname.dpatch?rev=6198&op=diff
==============================================================================
--- opal/branches/experimental/debian/patches/libname.dpatch (original)
+++ opal/branches/experimental/debian/patches/libname.dpatch Sat Sep 13 10:05:08 2008
@@ -12,7 +12,7 @@
  
  H323_H460         = @H323_H460@
  
--OPAL_BASE  = opal_$(PLATFORM_TYPE)_$(OBJ_SUFFIX)
+-OPAL_BASE  = opal_$(PLATFORM_TYPE)$(OBJ_SUFFIX)
 +OPAL_BASE  = opal
  OPAL_FILE  = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
  

Modified: opal/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/rules?rev=6198&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Sat Sep 13 10:05:08 2008
@@ -12,7 +12,7 @@
 export LIBOPALCOMPAT=3.3
 export LIBOPALCOMPAT2=3.3.1
 
-PACKAGE=libopal-$(LIBOPALCOMPAT)
+PACKAGE=libopal$(LIBOPALCOMPAT)-beta1
 
 ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
 VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
@@ -85,24 +85,21 @@
 	# ensure we do a fresh check with hello world.
 	# ...first static
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-	$(RM) -rf samples/simple/obj_*
+	$(RM) -rf samples/simple/obj
 
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple optnoshared
 
-	samples/simple/obj_*_r/simpleopal --help >/dev/null
+	samples/simple/obj/simpleopal --help >/dev/null
 	## then shared...
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-	$(RM) -rf samples/simple/obj_*
+	$(RM) -rf samples/simple/obj
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple optshared
-	if (samples/simple/obj_*_r/simpleopal --help >/dev/null);then \
+	if (samples/simple/obj/simpleopal --help >/dev/null);then \
 		echo shared opt simpleopal incorrectly compiled static; false;\
 	else \
 		echo shared opt simpleopal correctly compiled non-static; \
 	fi
-	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj_*_r/simpleopal --help >/dev/null
-	#$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-	#$(RM) -rf samples/simple/obj_*
-
+	LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj/simpleopal --help >/dev/null
 	cp debian/libopal-doc.docs debian/$(PACKAGE)-doc.docs
 	cp debian/libopal-dev.dirs debian/$(PACKAGE)-dev.dirs
 	touch build-arch-stamp
@@ -122,7 +119,7 @@
 		$(MAKE) $(MAKE_BUILD_PARAM) optclean debugclean clean;\
 		$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
 	fi
-	rm -rf samples/simple/obj*
+	rm -rf samples/simple/obj
 	rm -f opal_inc.mak include/opal/buildopts.h
 	rm -rf lib
 	rm -f src/speex/libspeex/Makefile
@@ -152,19 +149,18 @@
 	install -m 755 lib/libopal.so.*.*[.-]* $(CURDIR)/debian/$(PACKAGE)/usr/lib
 
 	$(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
-	mkdir debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
-	#- because cannot move a directory into itself
-	-mv debian/$(PACKAGE)/usr/lib/ptlib/* debian/$(PACKAGE)/usr/lib/ptlib/opal-$(LIBOPALCOMPAT)
 	#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*
+	-rm debian/$(PACKAGE)/usr/lib/opal-*/codecs/video/h264*
+	-rm debian/$(PACKAGE)/usr/lib/opal-*/codecs/video/h263-1998*
+	-rm debian/$(PACKAGE)/usr/lib/opal-*/codecs/video/mpeg4*
+	#remove codec which uses an unmaintained binary
+	-rm debian/$(PACKAGE)/usr/lib/opal-*/codecs/video/h263-ffmpeg*
 
 	# simpleopal
 	$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
 #	clean simple to install it as a sample in the docs
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
-	$(RM) -rf samples/simple/obj_*
+	$(RM) -rf samples/simple/obj
 
 #	-dev package
 	install -d -m 755 debian/$(PACKAGE)-dev/usr/lib/pkgconfig

More information about the Pkg-voip-commits mailing list