[Pkg-voip-commits] r7056 - in /opal/trunk/debian: ./ patches/
msp at alioth.debian.org
msp at alioth.debian.org
Sun Apr 26 02:07:28 UTC 2009
Author: msp
Date: Sun Apr 26 02:07:28 2009
New Revision: 7056
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7056
Log:
MERGE branches/experimental 6046:7055 into trunk
Added:
opal/trunk/debian/patches/simpleopal.dpatch
- copied unchanged from r7055, opal/branches/experimental/debian/patches/simpleopal.dpatch
opal/trunk/debian/simpleopal.1
- copied unchanged from r7055, opal/branches/experimental/debian/simpleopal.1
opal/trunk/debian/simpleopal.manpages
- copied unchanged from r7055, opal/branches/experimental/debian/simpleopal.manpages
Removed:
opal/trunk/debian/patches/libname.dpatch
opal/trunk/debian/patches/remove_ilbc.dpatch
opal/trunk/debian/patches/speex-remove-version-cmp.dpatch
opal/trunk/debian/patches/speexcodec.dpatch
Modified:
opal/trunk/debian/changelog
opal/trunk/debian/control
opal/trunk/debian/copyright
opal/trunk/debian/dirs
opal/trunk/debian/libopal-dev.dirs
opal/trunk/debian/patches/00list
opal/trunk/debian/patches/00list.alpha
opal/trunk/debian/rules
opal/trunk/debian/watch
Modified: opal/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/changelog?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/changelog (original)
+++ opal/trunk/debian/changelog Sun Apr 26 02:07:28 2009
@@ -1,3 +1,35 @@
+opal (3.6.1~dfsg-1) UNRELEASED; urgency=low
+
+ [ Mark Purcell ]
+ * New upstream release
+ * 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 <msp at debian.org> Fri, 03 Apr 2009 00:17:44 +1100
+
+opal (3.4.2~dfsg-2) experimental; urgency=low
+
+ [ Eugen Dedu ]
+ * Use Debian's speex library.
+
+ [ Mark Purcell ]
+ * Integrate historic debian/changelog from trunk
+ * Update debian/watch to check sf.net
+ * Fix hyphen-used-as-minus-sign debian/simpleopal.1
+
+ -- Mark Purcell <msp at debian.org> Sat, 15 Nov 2008 11:36:28 +1100
+
+opal (3.4.2~dfsg-1) experimental; urgency=low
+
+ [ Eugen Dedu ]
+ * New release version 3.4.2, with update and simplification of debian files
+ * Add a minimal man page for simpleopal.
+
+ -- Mark Purcell <msp at debian.org> Thu, 06 Nov 2008 21:44:30 +1100
+
opal (2.2.11~dfsg1-5) UNRELEASED; urgency=low
* Add description for remove_ilbc.dpatch.
@@ -5,6 +37,39 @@
* Remove duplicated word (the the) in the description of libopal-dev.
-- Patrick Matthäi <patrick.matthaei at web.de> Wed, 8 Oct 2008 21:21:56 +0200
+
+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
+
+ -- Mark Purcell <msp at debian.org> Thu, 11 Sep 2008 22:33:41 +1000
+
+opal (3.3.0+svn20930.dfsg-1) experimental; urgency=low
+
+ * First upload to debian.
+ [ Mark Purcell ]
+
+ * Ver 3.3.0 was tagged at REV=20681 thus this is 3.3.0+svnXXXX
+
+ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Sun, 16 Aug 2008 00:00:00 +0200
+
+opal-snapshot (0-20080418-1) voip; urgency=low
+
+ * Built from SVN snapshots. No package support, please refer to
+ irc.gimp.net channel #ekiga for support. Do not complain about
+ these debs at Debian BTS!
+
+ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr> Sun, 18 Apr 2008 00:00:00 +0200
opal (2.2.11~dfsg1-4) unstable; urgency=low
Modified: opal/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/control?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/control (original)
+++ opal/trunk/debian/control Sun Apr 26 02:07:28 2009
@@ -2,80 +2,64 @@
Section: libs
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 4.0.2), libpt-dev (>= 1.10.10~), dpatch (>= 1.11), doxygen, autotools-dev, libspeex-dev, libspeexdsp-dev
-Build-Conflicts: libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop
-Standards-Version: 3.7.3
-Homepage: http://www.voxgratia.org/
+Uploaders: Mark Purcell <msp at debian.org>, Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>
+Build-Depends: debhelper, 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.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-2.2
+Package: libopal3.6.1
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0
+Depends: ${shlibs: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
This package contains the shared version of the OPAL library.
.
The OPAL project aims to create a full featured, interoperable, Open Source
implementation of the H.323 and SIP protocols that can be used freely by
- everybody. These protocols are most used for Voice over IP (VoIP)
+ everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
+ .
+ This package contains the shared version of the OPAL library, together
+ with several free audio codecs and theora, H263 and H261 video codecs.
-Package: libopal-2.2-develop
-Section: libs
+Package: libopal3.6.1-dev
+Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2-ptrace, libopal-2.2, libopal-2.2.0
-Description: Open Phone Abstraction Library - full debug runtime with ptrace
- This package contains the shared version of the OPAL library.
+Conflicts: openmpi-dev, libopal-snapshot-dev, libopal3.3-beta1-dev
+Depends: libopal3.6.1 (= ${binary:Version}), libpt2.4.2-dev, libspeexdsp-dev
+Replaces: libopal-snapshot-dev, libopal3.3-beta1-dev
+Description: OPAL library header files
+ This package contains the headers and a static version of the OPAL library.
.
The OPAL project aims to create a full featured, interoperable, Open Source
implementation of the H.323 and SIP protocols that can be used freely by
- everybody. These protocols are most used for Voice over IP (VoIP)
+ everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
- .
- This build was compiled with extra ptracing and debug information included. Do
- not use in production environment. Also contains the debug symbols for this
- build.
-
-Package: libopal-dev
-Section: libdevel
-Architecture: any
-Conflicts: openmpi-dev
-Depends: libopal-2.2 (= ${binary:Version}) | libopal-2.2-develop (= ${binary:Version}), libpt-dev (>= 1.10.10~dfsg~)
-Description: OPAL library header files
- This package contains the headers and a static version of the
- OPAL library.
- .
- The OPAL project aims to create a full featured, interoperable, Open Source
- implementation of the H.323 and SIP protocols that can be used freely by
- everybody. These protocols are most used for Voice over IP (VoIP)
- conferencing.
- .
- The static library comes in all three flavours:
- libopal_s.a - notrace opt version
- libopal_r_s.a - ptrace-enabled opt version
- libopal_d_s.a - ptrace-enabled debug version
Package: simpleopal
Section: comm
Architecture: any
Depends: ${shlibs: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.
+ This package contains a small H323 and SIP client given as an example. You
+ can find its code on the doc package.
.
The OPAL project aims to create a full featured, interoperable, Open Source
implementation of the H.323 and SIP protocols that can be used freely by
- everybody. These protocols are most used for Voice over IP (VoIP)
+ everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
-Package: libopal-dbg
-Section: libdevel
+Package: libopal3.6.1-dbg
+Section: debug
Priority: extra
-Depends: libopal-2.2
+Depends: libopal3.6.1 (= ${binary:Version})
+Replaces: libopal-snapshot-dbg, libopal3.3-beta1-dbg
+Conflicts: libopal-snapshot-dbg, libopal3.3-beta1-dbg
Architecture: any
Description: OPAL library debug symbols
This package contains the shared and static debug symbols of the
@@ -83,10 +67,10 @@
.
The OPAL project aims to create a full featured, interoperable, Open Source
implementation of the H.323 and SIP protocols that can be used freely by
- everybody. These protocols are most used for Voice over IP (VoIP)
+ everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
-Package: libopal-doc
+Package: libopal3.6.1-doc
Section: doc
Priority: extra
Architecture: all
@@ -96,5 +80,5 @@
.
The OPAL project aims to create a full featured, interoperable, Open Source
implementation of the H.323 and SIP protocols that can be used freely by
- everybody. These protocols are most used for Voice over IP (VoIP)
+ everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
Modified: opal/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/copyright?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/copyright (original)
+++ opal/trunk/debian/copyright Sun Apr 26 02:07:28 2009
@@ -470,6 +470,33 @@
Mountain View, California 94043
+ + src/codec/celt
+ ----------------
+
+ This codec uses BSD license, as shown in the celtcodec.c:
+
+static struct PluginCodec_information licenseInfo = {
+ // Fri Dec 13 2008, 23:37:31 CET =
+ 1229729851,
+
+ "Stefan Knoblich, axsentis GmbH", // source code author
+ "0.1", // source code version
+ "s.knoblich at axsentis.de", // source code email
+ "http://oss.axsentis.de/", // source code URL
+ "Copyright (C) 2008 axsentis GmbH", // source code copyright
+ "BSD license", // source code license
+ PluginCodec_License_BSD, // source code license
+ "CELT (ultra-low delay audio codec)", // codec description
+ "Jean-Marc Valin, Xiph Foundation.", // codec author
+ "", // codec version
+ "jean-marc.valin at hermes.usherb.ca", // codec email
+ "http://www.celt-codec.org", // codec URL
+ "(C) 2008 Xiph.Org Foundation, All Rights Reserved", // codec copyright information
+ "Xiph BSD license", // codec license
+ PluginCodec_License_BSD // codec license code
+};
+
+
+ src/codec/iLBC
----------------
Removed from sources, as it is not distributable due to its license.
Modified: opal/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/dirs?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/dirs (original)
+++ opal/trunk/debian/dirs Sun Apr 26 02:07:28 2009
@@ -1,1 +1,1 @@
-usr/lib
+usr
Modified: opal/trunk/debian/libopal-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/libopal-dev.dirs?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/libopal-dev.dirs (original)
+++ opal/trunk/debian/libopal-dev.dirs Sun Apr 26 02:07:28 2009
@@ -1,3 +1,2 @@
-usr/include/opal
-usr/lib
-usr/share/opal
+usr/include
+usr/lib
Modified: opal/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/00list?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/patches/00list (original)
+++ opal/trunk/debian/patches/00list Sun Apr 26 02:07:28 2009
@@ -1,5 +1,1 @@
-libname
-notrace
-remove_ilbc
-speexcodec
-speex-remove-version-cmp
+simpleopal
Modified: opal/trunk/debian/patches/00list.alpha
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/patches/00list.alpha?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/patches/00list.alpha (original)
+++ opal/trunk/debian/patches/00list.alpha Sun Apr 26 02:07:28 2009
@@ -1,1 +1,1 @@
-alpha-no-relax
+#alpha-no-relax
Modified: opal/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/rules?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/rules (original)
+++ opal/trunk/debian/rules Sun Apr 26 02:07:28 2009
@@ -1,30 +1,35 @@
#!/usr/bin/make -f
-# Change this on API breakage
-export LIBOPALCOMPAT=2.2
-export LIBOPALCOMPAT2=2.1.3
-
-PACKAGE=libopal-$(LIBOPALCOMPAT)
-
-# excludes for the -develop version
-STRIP_EXCLUDES = -N$(PACKAGE) -Nlibopal-dbg -Nlibopal-dev -Nsimpleopal
-
-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)
-endif
-
-SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-
-CFLAGS := -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-endif
-
-MAKE_BUILD_PARAM := OPALDIR=$(CURDIR) PWLIBDIR=/usr/share/pwlib
-
+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]*$$//')
+
+#URLVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//' -e 's/\./_/g')
+
+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
+
+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)
@@ -34,18 +39,11 @@
else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-# Ensure the build aborts when there are still references to undefined
-# symbols.
-LDFLAGS += -Wl,-z,def
-
-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]*$$//')
-URLVERSION := $(shell echo $(DEBVERSION) | sed -r -e 's/^.*://' -e 's/-[0-9.]*(\+b[0-9])?$$//' -e 's/.dfsg[0-9]*$$//' -e 's/\./_/g')
-
-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
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
include /usr/share/dpatch/dpatch.make
@@ -54,7 +52,7 @@
build-arch: config.status build-arch-stamp
config.status: patch-stamp autotools configure
- ./configure $(confflags) --prefix=/usr
+ ./configure $(confflags) --prefix=/usr
autotools:
rm -f config.sub config.guess
@@ -63,54 +61,37 @@
touch autotools
check-ilbc:
- if [ -d src/codec/iLBC ];then \
+ if [ -d plugins/audio/iLBC ];then \
echo "ERROR: iLBC code must be removed from upstream sources" ; false ; \
fi
touch $@
build-arch-stamp: config.status
- # put NOTRACE to empty to build with PTRACING code
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt optnoshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug debugshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug debugnoshared
-
+ $(MAKE) $(MAKEFLAGS)
+
# ensure we do a fresh check with hello world.
# ...first static
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- $(RM) -rf samples/simple/obj_*
-
- # put NOTRACE to empty to build with PTRACING code
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optnoshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=0 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugnoshared
-
- samples/simple/obj_*_r/simpleopal --help >/dev/null
- samples/simple/obj_*_d/simpleopal --help >/dev/null
- ## then shared...
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- $(RM) -rf samples/simple/obj_*
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt -C samples/simple optshared
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug -C samples/simple debugshared
- if (samples/simple/obj_*_d/simpleopal --help >/dev/null);then \
- echo shared debug simpleopal incorrectly compiled static; false;\
+ #I see no reason to use static, so I comment them out
+ #$(MAKE)-C samples/simple optnoshared
+ #samples/simple/obj*/simpleopal --help >/dev/null
+
+ # then shared...
+ $(MAKE) PTLIBDIR=/usr OPALDIR=$(CURDIR) -C samples/simple
+ if (samples/simple/obj*/simpleopal --help >/dev/null);then \
+ echo shared simpleopal incorrectly compiled static; false;\
else \
- echo shared debug simpleopal correctly compiled non-static; \
+ echo shared simpleopal correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib/debug samples/simple/obj_*_d/simpleopal --help >/dev/null
- if (samples/simple/obj_*_r/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/opt samples/simple/obj_*_r/simpleopal --help >/dev/null
- #$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- #$(RM) -rf samples/simple/obj_*
-
+ ln -s lib* lib ; LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj*/simpleopal --help >/dev/null
+ rm lib
+
+ cp debian/libopal-doc.docs debian/$(PACKAGE)-doc.docs
+ cp debian/libopal-dev.dirs debian/$(PACKAGE)-dev.dirs
touch build-arch-stamp
build-indep: build-indep-stamp
build-indep-stamp: config.status
- $(MAKE) $(MAKE_BUILD_PARAM) docs
+ $(MAKE) docs
touch build-indep-stamp
clean: check-ilbc clean-patched unpatch
@@ -120,10 +101,9 @@
rm -f build-arch-stamp build-indep-stamp patch-stamp check-ilbc
rm -f config.status config.log autotools
if [ -f Makefile ];then \
- $(MAKE) $(MAKE_BUILD_PARAM) optclean debugclean clean;\
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean;\
+ $(MAKE) clean;\
+ $(MAKE) PTLIB=/usr OPALDIR=$(CURDIR) -C samples/simple clean;\
fi
- rm -rf samples/simple/obj*
rm -f opal_inc.mak include/opal/buildopts.h
rm -rf lib
rm -f src/speex/libspeex/Makefile
@@ -133,8 +113,8 @@
rm -rf debian/simpleopal/
rm -f debian/*substvars
rm -f debian/*.debhelper
- rm -f debian/libopal-*.*.docs
- rm -f config.status config.log
+ rm -f debian/$(PACKAGE)-doc.docs debian/$(PACKAGE)-dev.dirs
+ rm -f config.status
dh_clean
install: install-arch install-indep
@@ -149,52 +129,41 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
- install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib \
- $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
- install -m 755 lib/opt/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)/usr/lib
- install -m 755 lib/debug/libopal.so.*.*.* $(CURDIR)/debian/$(PACKAGE)-develop/usr/lib
-
- #$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
- #$(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG=1 NOTRACE= P_SHAREDLIB=1 OBJDIR_SUFFIX=d OPAL_LIBDIR=$(CURDIR)/lib/debug DESTDIR=$(CURDIR)/debian/$(PACKAGE)-develop -C plugins install
- #for suffix in "" "-develop";do \
- # mv $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/pwlib $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/opal-$(SHLIBSVER) ;\
- # mv $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/opal-$(SHLIBSVER) $(CURDIR)/debian/$(PACKAGE)$$suffix/usr/lib/pwlib/opal-$(SHLIBSVER) ;\
- #done
-
-ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
- for suffix in "" "-develop";do \
- ln -s libopal.so.$(SHLIBSVER) \
- debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT); \
- done
-endif
-ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT2))
- for suffix in "" "-develop";do \
- ln -s libopal.so.$(SHLIBSVER) \
- debian/$(PACKAGE)$$suffix/usr/lib/libopal.so.$(LIBOPALCOMPAT2); \
- done
-endif
+
+ $(MAKE) DESTDIR=$(CURDIR)/debian/install install
+
+ #remove non-free video codecs (if any)
+ -rm debian/install/usr/lib/opal-*/codecs/video/h264*
+ -rm debian/install/usr/lib/opal-*/codecs/video/h263-1998*
+ -rm debian/install/usr/lib/opal-*/codecs/video/mpeg4*
+
+ mv debian/install/usr/include debian/$(PACKAGE)-dev/usr
+ mv debian/install/usr/lib/pkgconfig debian/$(PACKAGE)-dev/usr/lib
+ mv debian/install/usr/lib/libopal_s.a debian/$(PACKAGE)-dev/usr/lib
+ mkdir debian/$(PACKAGE)/usr/lib
+ mv debian/install/usr/lib/libopal.so.*.*[.-]* debian/$(PACKAGE)/usr/lib
+ mv debian/install/usr/lib/libopal.so* debian/$(PACKAGE)-dev/usr/lib
+ mv debian/install/usr/lib/opal* debian/$(PACKAGE)/usr/lib
+
+ # to check that it is empty, i.e. all the files have been moved
+ rmdir debian/install/usr/lib
+ rmdir debian/install/usr
+ rmdir debian/install
+
# simpleopal
- $(MAKE) $(MAKE_BUILD_PARAM) CFLAGS="$(CFLAGS)" DEBUG= P_SHAREDLIB=1 OBJDIR_SUFFIX=r OPAL_LIBDIR=$(CURDIR)/lib/opt 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_*
-
-# libopal-dev package
- cp -v lib/opt/libopal_s.a debian/libopal-dev/usr/lib/
- cp -v lib/debug/libopal_s.a debian/libopal-dev/usr/lib/libopal_d_s.a
- ln -s libopal.so.$(SHLIBSVER) debian/libopal-dev/usr/lib/libopal.so
-
- sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
- opal_inc.mak > debian/libopal-dev/usr/share/opal/opal_inc.mak
- cp -vr include/* debian/libopal-dev/usr/include/opal
- find debian/libopal-dev/usr/include -type f -exec chmod 644 {} \;
-
- cp version.h debian/libopal-dev/usr/include/opal/
+ cp -a samples/simple/obj*/simpleopal debian/simpleopal/usr/bin
+
+ #not sure 100%, but not needed anymore, as now pkg-config is used
+ #sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
+ # opal_inc.mak > debian/$(PACKAGE)-dev/usr/share/opal/opal_inc.mak
+ #find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
+
+ cp version.h debian/$(PACKAGE)-dev/usr/include/opal/
# linking stuff under usr/share/opal
- ln -s ../../include/opal/version.h debian/libopal-dev/usr/share/opal/
- ln -s ../../include/opal debian/libopal-dev/usr/share/opal/include
- ln -s ../../lib debian/libopal-dev/usr/share/opal/
+ #ln -s ../../include/opal/version.h debian/$(PACKAGE)-dev/usr/share/opal/
+ #ln -s ../../include/opal debian/$(PACKAGE)-dev/usr/share/opal/include
+ #ln -s ../../lib debian/$(PACKAGE)-dev/usr/share/opal/
# Must not depend on anything. This is to be called by
# binary-arch/binary-multi
@@ -202,22 +171,20 @@
binary-common:
dh_testdir
dh_testroot
- dh_installdocs
+ #only $(PACKAGE) has a directory, the others have just links
+ dh_installdocs -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
dh_installman
- dh_installexamples
- dh_installchangelogs ChangeLog
-
- # Remove all CVS sub-directories
- find debian -name "CVS" -type d|xargs rm -rf
- find debian -name .cvsignore -exec rm -f {} \;
-
+ dh_installexamples -p$(PACKAGE)
+ dh_installchangelogs -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
+ -test "x$(DH_OPTIONS)" = "x-a" && for pkg in 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
+ dh_compress
dh_fixperms
# a new variable will be needed if an epoch is introduced to our versioning
- dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~) | $(PACKAGE)-develop (>= $(UPVERSION)~)'
+ dh_makeshlibs -V '$(PACKAGE) (>= $(UPVERSION)~)'
dh_installdeb
-
+
dh_shlibdeps -L $(PACKAGE) -l debian/$(PACKAGE)/usr/lib
dh_gencontrol
dh_md5sums
@@ -227,16 +194,15 @@
dh_testdir
dh_testroot
ifneq (4,$(DH_COMPAT))
- dh_strip -Nlibopal-dbg -N$(PACKAGE)-develop --dbg-package=libopal-dbg
- # can't ship those in libopal-dbg due to namespace overlap
- dh_strip -p$(PACKAGE)-develop $(STRIP_EXCLUDES) --dbg-package=$(PACKAGE)-develop
+ 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/libopal-dbg/usr/lib && \
+ cp -af debian/$$pack/usr/lib/debug debian/$(PACKAGE)-dbg/usr/lib && \
rm -rf debian/$$pack/usr/lib/debug; \
done
endif
@@ -253,23 +219,34 @@
print-version:
@@echo "Debian version: $(DEBVERSION)"
@@echo "Upstream version: $(UPVERSION)"
+ @@echo "svn REV: $(REV)"
+
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+ @@#this is for stable versions
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
@@echo 'Repacking as DFSG-free (removing iLBC)...'
@@mkdir -p ../tarballs/opal-$(UPVERSION).tmp/
- @@cd ../tarballs/opal-$(UPVERSION).tmp ; \
- tar xfz ../$(UPFILENAME)
- @@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/src/codec/iLBC \
- ../tarballs/opal-$(UPVERSION).tmp/opal*/include/codec/ilbccodec.h
+ @@cd ../tarballs/opal-$(UPVERSION).tmp ; tar xfz ../$(UPFILENAME)
+ @@rm -rf ../tarballs/opal-$(UPVERSION).tmp/opal*/plugins/audio/iLBC
@@echo Writing archive ../tarballs/$(FILENAME) ...
- @@cd ../tarballs/opal-$(UPVERSION).tmp ; \
- tar cfz ../$(FILENAME) *
+ @@cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
@@echo Cleaning up...
@@$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+ @@#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
+ @@#echo 'Getting the changelog (might take 15 min) ...'
+ @@#cd ../tarballs/opal-$(REV).tmp; svn2cl -o changelog
+ @@#echo Removing iLBC non-free code...
+ @@#cd ../tarballs/opal-$(REV).tmp; rm -rf plugins/audio/iLBC
+ @@#echo Creating the tarball ...
+ @@#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
Modified: opal/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/trunk/debian/watch?rev=7056&op=diff
==============================================================================
--- opal/trunk/debian/watch (original)
+++ opal/trunk/debian/watch Sun Apr 26 02:07:28 2009
@@ -1,4 +1,6 @@
version=3
+# http://www.voxgratia.org/releases/opal-v(\d+)_(\d?[02468]+)([\d_]+)-src[\.-]tar\.gz debian svn-upgrade
opts=dversionmangle=s/[\.~]dfsg(\d+)?//,uversionmangle=s/[_\.]+/\./g \
- http://www.voxgratia.org/releases/opal-v(\d+)_(\d?[02468]+)([\d_]+)-src[\.-]tar\.gz debian svn-upgrade
+ http://sf.net/opalvoip/opal-(\d.\d.\d).tar.gz debian svn-upgrade
+
More information about the Pkg-voip-commits
mailing list