[Pkg-voip-commits] r1371 - kiax/trunk/debian kphone/trunk/debian portaudio/trunk/debian radiusclient-ng/trunk/debian rate-engine/trunk/debian ser/trunk/debian siproxd/trunk/debian speex/trunk/debian twinkle/trunk/debian

Kilian Krause kilian at costa.debian.org
Sun Mar 5 22:41:38 UTC 2006


Author: kilian
Date: 2006-03-05 22:41:36 +0000 (Sun, 05 Mar 2006)
New Revision: 1371

Modified:
   kiax/trunk/debian/changelog
   kiax/trunk/debian/control
   kiax/trunk/debian/rules
   kphone/trunk/debian/rules
   portaudio/trunk/debian/rules
   radiusclient-ng/trunk/debian/rules
   rate-engine/trunk/debian/rules
   ser/trunk/debian/rules
   siproxd/trunk/debian/changelog
   siproxd/trunk/debian/rules
   speex/trunk/debian/rules
   twinkle/trunk/debian/rules
Log:
more get-orig-source targets and minor cleanups


Modified: kiax/trunk/debian/changelog
===================================================================
--- kiax/trunk/debian/changelog	2006-03-05 12:07:46 UTC (rev 1370)
+++ kiax/trunk/debian/changelog	2006-03-05 22:41:36 UTC (rev 1371)
@@ -1,9 +1,11 @@
-kiax (0.8.5-1) UNRELEASED; urgency=low
+kiax (0.8.5-pre-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * debian/rules: Fix clean target.
+  * debian/rules: Fix clean target. Add get-orig-source. Remove force of
+    gcc-3.4
+  * debian/control: Try building with gcc-4.0
 
- -- Kilian Krause <kilian at debian.org>  Sun, 26 Feb 2006 00:29:57 +0100
+ -- Kilian Krause <kilian at debian.org>  Sun,  5 Mar 2006 13:15:53 +0100
 
 kiax (0.8.4-4) unstable; urgency=low
 

Modified: kiax/trunk/debian/control
===================================================================
--- kiax/trunk/debian/control	2006-03-05 12:07:46 UTC (rev 1370)
+++ kiax/trunk/debian/control	2006-03-05 22:41:36 UTC (rev 1371)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Damyan Ivanov <divanov at creditreform.bg>, Mark Purcell <msp at debian.org>, George Danchev <danchev at spnet.net>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxpm-dev,  libqt3-mt-dev (>= 3:3.3.4-4), g++-3.4, libiaxclient-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, libxpm-dev,  libqt3-mt-dev (>= 3:3.3.4-4), libiaxclient-dev
 Standards-Version: 3.6.1
 
 Package: kiax

Modified: kiax/trunk/debian/rules
===================================================================
--- kiax/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ kiax/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -21,10 +21,13 @@
 	CFLAGS += -O2
 endif
 
-export CC=gcc-3.4
-export CPP=cpp-3.4
-export CXX=g++-3.4
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
+FILENAME := kiax_$(UPVERSION).orig.tar.gz
+URL := http://mesh.dl.sourceforge.net/kiax/kiax-$(UPVERSION)-pre-src.tar.gz
+
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
@@ -82,29 +85,27 @@
 	dh_installchangelogs 
 	dh_installdocs
 	dh_installexamples
-#	dh_install
 	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Modified: kphone/trunk/debian/rules
===================================================================
--- kphone/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ kphone/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -6,6 +6,26 @@
 
 export QTDIR=/usr/share/qt3
   
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := kphone_$(UPVERSION).orig.tar.gz
+URL := http://www.wirlab.net/kphone/kphone-$(UPVERSION).tar.gz
+URL2 := http://ovh.dl.sourceforge.net/kphone/kphone-$(UPVERSION).tar.gz
+
+-include /usr/share/cdbs/1/class/autotools.mk
+-include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL) || \
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL2) 
+

Modified: portaudio/trunk/debian/rules
===================================================================
--- portaudio/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ portaudio/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -25,6 +25,15 @@
 	INSTALL_PROGRAM += -s
 endif
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
+
+FILENAME := portaudio_$(UPVERSION).orig.tar.gz
+UPFILENAME := portaudio_$(UPVERSION).zip
+URL := http://www.portaudio.com/archives/portaudio_v$(UPVERSION).zip
+
+
 configure: configure.in
 	aclocal
 	autoconf
@@ -86,6 +95,15 @@
 	dh_md5sums
 	dh_builddeb
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
 
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
 binary: binary-arch
 .PHONY: build clean binary-arch binary install patch unpatch config

Modified: radiusclient-ng/trunk/debian/rules
===================================================================
--- radiusclient-ng/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ radiusclient-ng/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -33,6 +33,14 @@
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := radiusclient-ng_$(UPVERSION).orig.tar.gz
+URL := http://ftp.iptel.org/pub/radiusclient-ng/radiusclient-ng-$(UPVERSION).tar.gz
+
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
@@ -113,5 +121,15 @@
 	dh_md5sums
 	dh_builddeb
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install 

Modified: rate-engine/trunk/debian/rules
===================================================================
--- rate-engine/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ rate-engine/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -20,6 +20,13 @@
 	INSTALL_PROGRAM += -s
 endif
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := rate-engine_$(UPVERSION).orig.tar.gz
+URL := http://www.trollphone.org/files/rate-engine-$(UPVERSION).tar.gz
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -81,5 +88,15 @@
 	dh_md5sums
 	dh_builddeb
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Modified: ser/trunk/debian/rules
===================================================================
--- ser/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ ser/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -28,6 +28,13 @@
 #  force no striping (always include debug symbols for now)
 export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip"
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := ser_$(UPVERSION).orig.tar.gz
+URL := http://ftp.iptel.org/pub/ser/latest/src/ser-$(UPVERSION)_src.tar.gz
+
 # modules not in the "main" package or unstable 
 EXCLUDED_MODULES=	mysql jabber auth_radius group_radius uri_radius \
 					avp_radius pa postgres snmp cpl cpl-c ext extcmd 
@@ -234,5 +241,15 @@
 binary-%: build install
 	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

Modified: siproxd/trunk/debian/changelog
===================================================================
--- siproxd/trunk/debian/changelog	2006-03-05 12:07:46 UTC (rev 1370)
+++ siproxd/trunk/debian/changelog	2006-03-05 22:41:36 UTC (rev 1371)
@@ -2,6 +2,7 @@
 
   * debian/rules: Ignore includes to fix clean target without all
     build-depends installed.
+    Remove linking against gcc_s to fix FTBFS.
 
  -- Kilian Krause <kilian at debian.org>  Sun, 26 Feb 2006 01:05:40 +0100
 

Modified: siproxd/trunk/debian/rules
===================================================================
--- siproxd/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ siproxd/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -3,13 +3,20 @@
 #Copyright Dan Weber <dan at mirrorlynx.com> 2004
 
 -include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+-include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/class/autotools.mk
 
 export DH_VERBOSE=1
 DEB_CONFIGURE_EXTRA_FLAGS :=--with-libosip-prefix=/usr
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lgcc_s -lnss_dns"
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-lnss_dns"
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := siproxd_$(UPVERSION).orig.tar.gz
+URL := http://ovh.dl.sourceforge.net/siproxd/siproxd-$(UPVERSION).tar.gz
+
 clean::
 	dh_clean debian/man/siproxd.8
 
@@ -20,3 +27,13 @@
 	mv debian/siproxd/etc/siproxd.conf.example debian/siproxd/etc/siproxd.conf
 	chmod 644 -v debian/siproxd/etc/siproxd.conf
 	rm -f debian/siproxd/etc/siproxd_passwd.cfg
+
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)

Modified: speex/trunk/debian/rules
===================================================================
--- speex/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ speex/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -25,6 +25,13 @@
 	INSTALL_PROGRAM += -s
 endif
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+
+FILENAME := speex_$(UPVERSION).orig.tar.gz
+URL := http://downloads.us.xiph.org/releases/speex/speex-$(UPVERSION).tar.gz
+
 maintainer-automake:
 	# Add here commands to configure the package.
 	libtoolize --force --copy
@@ -151,5 +158,15 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

Modified: twinkle/trunk/debian/rules
===================================================================
--- twinkle/trunk/debian/rules	2006-03-05 12:07:46 UTC (rev 1370)
+++ twinkle/trunk/debian/rules	2006-03-05 22:41:36 UTC (rev 1371)
@@ -6,7 +6,24 @@
 
 export QTDIR=/usr/share/qt3
   
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
+FILENAME := twinkle_$(UPVERSION).orig.tar.gz
+URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$(UPVERSION).tar.gz
+
+-include /usr/share/cdbs/1/class/autotools.mk
+-include /usr/share/cdbs/1/rules/debhelper.mk
+-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(FILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+




More information about the Pkg-voip-commits mailing list