[Pkg-voip-commits] r7071 - in /opal/trunk/debian: changelog control rules
msp at alioth.debian.org
msp at alioth.debian.org
Mon Apr 27 11:07:42 UTC 2009
Author: msp
Date: Mon Apr 27 11:07:42 2009
New Revision: 7071
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7071
Log:
* New upstream release
* Fix "simpleopal example dies with segfault" (Closes: #510988)
* Build-Depends: libpt-dev (>= 2.6.1)
* Update to cdbs - correctly strips -dbg, parallel builds, et al
- cleanup debian/rules cruft
* Add Suggests: pkg-config
* Upload to unstable (libpt transition)
Modified:
opal/trunk/debian/changelog
opal/trunk/debian/control
opal/trunk/debian/rules
Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=7071&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Mon Apr 27 11:07:42 2009
@@ -1,22 +1,22 @@
-opal (3.6.1~dfsg-1) UNRELEASED; urgency=low
+opal (3.6.1~dfsg-1) unstable; urgency=low
+
+ [ Eugen Dedu ]
+ * debian/rules: Honour DEB_BUILD_OPTIONS parameter for parallel builds.
+ * Build-Depends on libcelt-dev.
[ Mark Purcell ]
* New upstream release
* Fix "simpleopal example dies with segfault" (Closes: #510988)
* Build-Depends: libpt-dev (>= 2.6.1)
-
- [ Eugen Dedu ]
- * debian/rules: Honour DEB_BUILD_OPTIONS parameter for parallel builds.
- * Build-Depends on libcelt-dev.
-
- [ Mark Purcell ]
* NEW packages; libopal-dev, libopal2.6.1, libopal-doc, libopal2.6.1-dbg
* debian/compat -> 7
* Use dh_install; Add [libopal-dev,simpleopal,libopal3.6.1].install
-
- * TODO: libopal3.6.1-dbg
-
- -- Mark Purcell <msp at debian.org> Mon, 27 Apr 2009 12:37:07 +1000
+ * Update to cdbs - correctly strips -dbg, parallel builds, et al
+ - cleanup debian/rules cruft
+ * Add Suggests: pkg-config
+ * Upload to unstable (libpt transition)
+
+ -- Mark Purcell <msp at debian.org> Mon, 27 Apr 2009 19:45:35 +1000
opal (3.4.2~dfsg-2) experimental; urgency=low
Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7071&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Mon Apr 27 11:07:42 2009
@@ -3,7 +3,7 @@
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 (>= 7), libpt-dev (>= 2.6.1), dpatch, doxygen, autotools-dev, pkg-config, libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev
+Build-Depends: debhelper (>= 7), cdbs, libpt-dev (>= 2.6.1), dpatch, doxygen, autotools-dev, pkg-config, libtheora-dev, libgsm1-dev, libspeex-dev, libspeexdsp-dev, libcelt-dev
Build-Conflicts: libopal3.6.1, libopal3.4.2, libopal3.4.1, libopal3.3-beta1, libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop
Standards-Version: 3.8.1
Homepage: http://www.opalvoip.org/
@@ -13,7 +13,7 @@
Package: libopal3.6.1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libspeex1, libspeexdsp1
+Depends: ${shlibs:Depends}, ${misc:Depends}, libspeex1, libspeexdsp1
Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal-snapshot, libopal3.3-beta1
Replaces: libopal-snapshot, libopal3.3-beta1
Description: Open Phone Abstraction Library - successor of OpenH323
@@ -31,7 +31,8 @@
Section: libdevel
Architecture: any
Conflicts: openmpi-dev, libopal-snapshot-dev, libopal3.3-beta1-dev
-Depends: libopal3.6.1 (= ${binary:Version}), libpt-dev (>= 2.6.1), libspeexdsp-dev
+Depends: ${misc:Depends}, libopal3.6.1 (= ${binary:Version}), libpt-dev (>= 2.6.1), libspeexdsp-dev
+Suggests: pkg-config
Recommends: libopal-doc
Replaces: libopal-snapshot-dev, libopal3.3-beta1-dev
Description: OPAL library header files
@@ -45,7 +46,7 @@
Package: simpleopal
Section: comm
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Simple example from the OPAL project
This package contains a small H323 and SIP client given as an example. You
can find its code on the doc package.
@@ -58,7 +59,7 @@
Package: libopal3.6.1-dbg
Section: debug
Priority: extra
-Depends: libopal3.6.1 (= ${binary:Version})
+Depends: ${misc:Depends}, libopal3.6.1 (= ${binary:Version})
Replaces: libopal-snapshot-dbg, libopal3.3-beta1-dbg
Conflicts: libopal-snapshot-dbg, libopal3.3-beta1-dbg
Architecture: any
@@ -74,6 +75,7 @@
Package: libopal-doc
Section: doc
Priority: extra
+Depends: ${misc:Depends}
Architecture: all
Description: OPAL library documentation files
This package contains the documentation and samples to program with
Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=7071&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Mon Apr 27 11:07:42 2009
@@ -1,75 +1,25 @@
#!/usr/bin/make -f
-DEBVERSION := $(shell head -n 1 debian/changelog \
- | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//')
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-#URLVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//' -e 's/\./_/g')
+UPVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~dfsg//')
+REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
FILENAME := opal_$(UPVERSION)~dfsg.orig.tar.gz
UPFILENAME := opal_$(UPVERSION).orig.tar.gz
-#URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src-tar.gz
URL := http://ftp.gnome.org/pub/gnome/sources/opal/3.6/opal-$(UPVERSION).tar.gz
-REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
-#REV=20797
+DEB_MAKE_BUILD_TARGET := opt docs
+DEB_INSTALL_CHANGELOGS_ALL := ChangeLog-opal-v3_6_1.txt
-PACKAGE=libopal$(UPVERSION)
-
-#ifneq (,$(shell test -f version.h&&grep MAJOR_VERSION version.h))
-#VER_MAJOR := $(shell awk '/MAJOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
-#VER_MINOR := $(shell awk '/MINOR_VERSION/ { print $$3 }' version.h 2>/dev/null)
-#VER_SUB := $(shell awk '/BUILD_NUMBER/ { print $$3 }' version.h 2>/dev/null)
-#VER_TYPE := $(shell awk '/BUILD_TYPE/ { print $$3 }' version.h 2>/dev/null)
-#endif
-
-#SHLIBSSUFFIX := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-#ifneq (,$(findstring Beta,$(VER_TYPE)))
-# SHLIBSSUFFIX :=$(VER_MAJOR).$(VER_MINOR)-beta$(VER_SUB)
-#endif
-
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-LDFLAGS += -Wl,-z,def
-
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-include /usr/share/dpatch/dpatch.make
-
-build: build-arch build-indep
-
-build-arch: config.status build-arch-stamp
-
-config.status: patch-stamp autotools configure
- ./configure $(confflags) --prefix=/usr
-
-autotools:
- rm -f config.sub config.guess
- cp /usr/share/misc/config.sub config.sub
- cp /usr/share/misc/config.guess config.guess
- touch autotools
-
-check-ilbc:
+makebuilddir/libopal-dev::
if [ -d plugins/audio/iLBC ];then \
echo "ERROR: iLBC code must be removed from upstream sources" ; false ; \
fi
- touch $@
-build-arch-stamp: config.status
- $(MAKE) $(MAKEFLAGS)
-
- # then shared...
+build/simpleopal::
$(MAKE) PTLIBDIR=/usr OPALDIR=$(CURDIR) -C samples/simple
if (samples/simple/obj*/simpleopal --help >/dev/null);then \
echo shared simpleopal incorrectly compiled static; false;\
@@ -79,112 +29,10 @@
ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj*/simpleopal --help >/dev/null
rm lib
- touch build-arch-stamp
-
-build-indep: build-indep-stamp
-build-indep-stamp: config.status
- $(MAKE) docs
- touch build-indep-stamp
-
-clean: check-ilbc clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-arch-stamp build-indep-stamp patch-stamp check-ilbc
- rm -f config.status config.log autotools
- if [ -f Makefile ];then \
- $(MAKE) clean;\
- $(MAKE) PTLIB=/usr OPALDIR=$(CURDIR) -C samples/simple clean;\
- fi
- rm -f opal_inc.mak include/opal/buildopts.h
- rm -rf lib
- rm -f src/speex/libspeex/Makefile
- rm -rf html
- rm -f `find . -name "*~"`
- rm -rf `find debian/* -type d -name libopal-*` debian/files* core
- rm -rf debian/simpleopal/
- rm -f debian/*substvars
- rm -f debian/*.debhelper
- rm -f config.status
- dh_clean
-
-install: install-arch install-indep
-install-indep:
- dh_testdir
- dh_testroot
- dh_prep -i
- dh_installdirs -i
-
-install-arch:
- dh_testdir
- dh_testroot
- dh_prep -a
- dh_installdirs -a
-
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
- #remove non-free video codecs (if any)
- -rm -f debian/tmp/usr/lib/opal-*/codecs/video/h264*
- -rm -f debian/tmp/usr/lib/opal-*/codecs/video/h263-1998*
- -rm -f debian/tmp/usr/lib/opal-*/codecs/video/mpeg4*
-
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-multi
-# in another 'make' thread.
-binary-common:
- dh_testdir
- dh_testroot
- #only $(PACKAGE) has a directory, the others have just links
- dh_installdocs -N$(PACKAGE)-dbg
- dh_installman
- dh_installexamples -p$(PACKAGE)
- dh_installchangelogs -N$(PACKAGE)-dbg
-
- dh_install
-
- dh_link
- dh_compress
- dh_fixperms
- # a new variable will be needed if an epoch is introduced to our versioning
- dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~)'
- dh_installdeb
-
- dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-strip:
- dh_testdir
- dh_testroot
-ifneq (4,$(DH_COMPAT))
- dh_strip -N$(PACKAGE)-dbg --dbg-package=$(PACKAGE)-dbg
- # can't ship those in $(PACKAGE)-dbg due to namespace overlap
-else
- # As dh_strip does not work fine for multiple binary package
- # we need to workaround that manually
- dh_strip --exclude=libopal_d --keep-debug
-
- for pack in $(PACKAGE) simpleopal ; do \
- cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
- rm -rf debian/$$pack/usr/lib/debug; \
- done
-endif
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
- $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@echo "Upstream version: $(UPVERSION)"
@@echo "svn REV: $(REV)"
-
get-orig-source:
@@dh_testdir
@@ -200,6 +48,8 @@
@@cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
@@echo Cleaning up...
@@$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+
+get-orig-source-svn:
@@#and this is for SVN
@@#echo 'Checking out for repacking (might take 15 min) ...'
@@#svn export https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk@$(REV) ../tarballs/opal-$(REV).tmp
@@ -211,6 +61,3 @@
@@#cd ../tarballs/opal-$(REV)tmp; tar zcf ../opal_$(UPVERSION).orig.tar.gz *
@@#rm -rf ../tarballs/opal-$(REV).tmp
@@echo Ready for packaging.
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch clean-patched
More information about the Pkg-voip-commits
mailing list