[Pkg-voip-commits] r6220 - in /opal/branches/experimental/debian: changelog control dirs libopal-dev.dirs patches/00list patches/00list.alpha patches/libname.dpatch patches/simpleopal.dpatch patches/speex-remove-version-cmp.dpatch patches/speexcodec.dpatch rules
dedu-guest at alioth.debian.org
dedu-guest at alioth.debian.org
Fri Sep 26 13:22:13 UTC 2008
Author: dedu-guest
Date: Fri Sep 26 13:22:13 2008
New Revision: 6220
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6220
Log:
* NOT RELEASED YET
* New release version 3.4.1, with update and simplification of debian files
Added:
opal/branches/experimental/debian/patches/simpleopal.dpatch
Removed:
opal/branches/experimental/debian/patches/libname.dpatch
opal/branches/experimental/debian/patches/speex-remove-version-cmp.dpatch
opal/branches/experimental/debian/patches/speexcodec.dpatch
Modified:
opal/branches/experimental/debian/changelog
opal/branches/experimental/debian/control
opal/branches/experimental/debian/dirs
opal/branches/experimental/debian/libopal-dev.dirs
opal/branches/experimental/debian/patches/00list
opal/branches/experimental/debian/patches/00list.alpha
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=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/changelog (original)
+++ opal/branches/experimental/debian/changelog Fri Sep 26 13:22:13 2008
@@ -1,3 +1,11 @@
+opal (3.4.1-1) UNRELEASED; urgency=low
+
+ [ Eugen Dedu ]
+ * NOT RELEASED YET
+ * New release version 3.4.1, with update and simplification of debian files
+
+ -- Mark Purcell <msp at debian.org> Sun, 14 Sep 2008 19:21:11 +1000
+
opal (3.3.0+svn20940.dfsg-1) voip; urgency=low
[ Eugen Dedu ]
Modified: opal/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/control?rev=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/control (original)
+++ opal/branches/experimental/debian/control Fri Sep 26 13:22:13 2008
@@ -3,19 +3,19 @@
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, libgsm1-dev
-Build-Conflicts: libopal-snapshot-dev, libopal-dev, libopal-2.2, libopal-2.2.0, libopal-2.2-ptrace, libopal-2.2-develop
+Build-Depends: debhelper (>= 4.0.2), libpt2.4.1-dev, dpatch, doxygen, autotools-dev, pkg-config, libtheora-dev, libgsm1-dev
+Build-Conflicts: 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: libopal3.3-beta1
+Package: libopal3.4.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
-Conflicts: libopal-2.2-ptrace, libopal-2.2-develop, libopal-2.2.0, libopal-snapshot
-Replaces: libopal-snapshot
+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 - svn snapshot
This package contains the shared version of the OPAL library.
.
@@ -24,12 +24,12 @@
everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
-Package: libopal3.3-beta1-dev
+Package: libopal3.4.1-dev
Section: libdevel
Architecture: any
-Conflicts: openmpi-dev, libopal-snapshot-dev
-Depends: libopal3.3-beta1 (= ${binary:Version}), libpt2.3-beta1-dev
-Replaces: libopal-snapshot-dev
+Conflicts: openmpi-dev, libopal-snapshot-dev, libopal3.3-beta1-dev
+Depends: libopal3.4.1 (= ${binary:Version}), libpt2.4.1-dev
+Replaces: libopal-snapshot-dev, libopal3.3-beta1-dev
Description: OPAL library header files - svn snapshot
This package contains the headers and a static version of the
OPAL library.
@@ -52,12 +52,12 @@
everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
-Package: libopal3.3-beta1-dbg
+Package: libopal3.4.1-dbg
Section: libdevel
Priority: extra
-Depends: libopal3.3-beta1 (= ${binary:Version})
-Replaces: libopal-snapshot-dbg
-Conflicts: libopal-snapshot-dbg
+Depends: libopal3.4.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 - svn snapshot
This package contains the shared and static debug symbols of the
@@ -68,7 +68,7 @@
everybody. These protocols are most used for Voice over IP (VoIP)
conferencing.
-Package: libopal3.3-beta1-doc
+Package: libopal3.4.1-doc
Section: doc
Priority: extra
Architecture: all
Modified: opal/branches/experimental/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/dirs?rev=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/dirs (original)
+++ opal/branches/experimental/debian/dirs Fri Sep 26 13:22:13 2008
@@ -1,1 +1,1 @@
-usr/lib
+usr
Modified: opal/branches/experimental/debian/libopal-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/libopal-dev.dirs?rev=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/libopal-dev.dirs (original)
+++ opal/branches/experimental/debian/libopal-dev.dirs Fri Sep 26 13:22:13 2008
@@ -1,3 +1,2 @@
-usr/include/opal
-usr/lib
-usr/share/opal
+usr/include
+usr/lib
Modified: opal/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/patches/00list?rev=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/patches/00list (original)
+++ opal/branches/experimental/debian/patches/00list Fri Sep 26 13:22:13 2008
@@ -1,3 +1,1 @@
-libname
-speexcodec
-speex-remove-version-cmp
+simpleopal
Modified: opal/branches/experimental/debian/patches/00list.alpha
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/patches/00list.alpha?rev=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/patches/00list.alpha (original)
+++ opal/branches/experimental/debian/patches/00list.alpha Fri Sep 26 13:22:13 2008
@@ -1,1 +1,1 @@
-alpha-no-relax
+#alpha-no-relax
Added: opal/branches/experimental/debian/patches/simpleopal.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/patches/simpleopal.dpatch?rev=6220&op=file
==============================================================================
--- opal/branches/experimental/debian/patches/simpleopal.dpatch (added)
+++ opal/branches/experimental/debian/patches/simpleopal.dpatch Fri Sep 26 13:22:13 2008
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## libname.dpatch by Eugen Dedu
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: allow compilation of simple without having opal installed.
+
+ at DPATCH@
+diff -u opal-svn/samples/simple/Makefile opal/samples/simple/Makefile
+--- opal-svn/samples/simple/Makefile 2008-09-20 23:05:19.000000000 +0200
++++ opal/samples/simple/Makefile 2008-09-21 13:08:56.000000000 +0200
+@@ -53,8 +53,8 @@
+ endif
+ # Get required flags from library
+
+-CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --cflags opal)
+-LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --libs opal)
++CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --cflags opal) -I../../include
++LDFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config $(PKG_FLAGS) --libs opal) -L ../../lib*
+
+
+ # This part is we like to be tidy and put all the build products
Modified: opal/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opal/branches/experimental/debian/rules?rev=6220&op=diff
==============================================================================
--- opal/branches/experimental/debian/rules (original)
+++ opal/branches/experimental/debian/rules Fri Sep 26 13:22:13 2008
@@ -8,33 +8,36 @@
REV := $(shell echo $(UPVERSION) | sed -r -e 's/^.*svn//')
#REV=20797
-# Change this on API breakage
-export LIBOPALCOMPAT=3.3
-export LIBOPALCOMPAT2=3.3.1
-
-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)
-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
-
-SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-SHLIBSSUFFIX := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
-ifneq (,$(findstring Beta,$(VER_TYPE)))
- SHLIBSSUFFIX :=$(VER_MAJOR).$(VER_MINOR)-beta$(VER_SUB)
-endif
-
-CFLAGS := -g -O2
+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.4/opal-$(UPVERSION).tar.gz
+
+PACKAGE=libopal3.4.1
+
+#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
+
+#SHLIBSVER := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+#SHLIBSSUFFIX := $(VER_MAJOR).$(VER_MINOR).$(VER_SUB)
+#ifneq (,$(findstring Beta,$(VER_TYPE)))
+# SHLIBSSUFFIX :=$(VER_MAJOR).$(VER_MINOR)-beta$(VER_SUB)
+#endif
+
+CFLAGS := -Wall -g -O2
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
endif
-
-MAKE_BUILD_PARAM := OPALDIR=$(CURDIR) PTLIBDIR=/usr/share/ptlib
-
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -48,15 +51,6 @@
# 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
-
include /usr/share/dpatch/dpatch.make
build: build-arch build-indep
@@ -64,7 +58,8 @@
build-arch: config.status build-arch-stamp
config.status: patch-stamp autotools configure
- ./configure $(confflags) --prefix=/usr
+ #don't build h263-ffmpeg codec because it uses an unmaintained binary
+ ./configure $(confflags) --prefix=/usr --disable-ffmpeg-h263 --enable-localspeex
autotools:
rm -f config.sub config.guess
@@ -79,34 +74,31 @@
touch $@
build-arch-stamp: config.status
- $(MAKE) $(MAKE_BUILD_PARAM) optshared
- $(MAKE) $(MAKE_BUILD_PARAM) optnoshared
+ $(MAKE)
# ensure we do a fresh check with hello world.
# ...first static
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- $(RM) -rf samples/simple/obj
-
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple optnoshared
-
- samples/simple/obj/simpleopal --help >/dev/null
- ## then shared...
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean
- $(RM) -rf samples/simple/obj
- $(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple optshared
- if (samples/simple/obj/simpleopal --help >/dev/null);then \
- echo shared opt 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 opt simpleopal correctly compiled non-static; \
+ echo shared simpleopal correctly compiled non-static; \
fi
- LD_LIBRARY_PATH=$(CURDIR)/lib samples/simple/obj/simpleopal --help >/dev/null
+ 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
@@ -116,10 +108,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
@@ -145,46 +136,41 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
- install -d -m 755 $(CURDIR)/debian/$(PACKAGE)/usr/lib
- install -m 755 lib/libopal.so.*.*[.-]* $(CURDIR)/debian/$(PACKAGE)/usr/lib
-
- $(MAKE) $(MAKE_BUILD_PARAM) DESTDIR=$(CURDIR)/debian/$(PACKAGE) -C plugins install
+
+ $(MAKE) DESTDIR=$(CURDIR)/debian/install install
+
#remove non-free video codecs (if any)
- -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*
+ -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) 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
-
-# -dev package
- install -d -m 755 debian/$(PACKAGE)-dev/usr/lib/pkgconfig
- cp -v opal.pc debian/$(PACKAGE)-dev/usr/lib/pkgconfig
- cp -v lib/libopal_s.a debian/$(PACKAGE)-dev/usr/lib/
- ln -s libopal.so.$(SHLIBSSUFFIX) debian/$(PACKAGE)-dev/usr/lib/libopal.so
-#ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT))
- ln -s libopal.so.$(SHLIBSSUFFIX) debian/$(PACKAGE)-dev/usr/lib/libopal.so.$(LIBOPALCOMPAT)
-#endif
-#ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT2))
-# ln -s libopal.so.$(SHLIBSVER) debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT2)
-#endif
-
- sed -e 's#^OPALDIR.*#OPALDIR = \/usr\/lib\/opal#g' \
- opal_inc.mak > debian/$(PACKAGE)-dev/usr/share/opal/opal_inc.mak
- cp -vr include/* debian/$(PACKAGE)-dev/usr/include/opal
- find debian/$(PACKAGE)-dev/usr/include -type f -exec chmod 644 {} \;
+ 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/$(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/
+ #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
@@ -196,7 +182,7 @@
dh_installdocs -N$(PACKAGE)-dev -N$(PACKAGE)-dbg
dh_installman
dh_installexamples -p$(PACKAGE)
- dh_installchangelogs -N$(PACKAGE)-dev -N$(PACKAGE)-dbg changelog
+ 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
@@ -247,26 +233,26 @@
@@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
- @@#echo Writing archive ../tarballs/$(FILENAME) ...
- @@#cd ../tarballs/opal-$(UPVERSION).tmp ; tar cfz ../$(FILENAME) *
- @@#echo Cleaning up...
- @@#$(RM) -rf ../tarballs/opal-$(UPVERSION).tmp/ ../tarballs/$(UPFILENAME)
+ @@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*/plugins/audio/iLBC
+ @@echo Writing archive ../tarballs/$(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 '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
More information about the Pkg-voip-commits
mailing list