[Pkg-voip-commits] r7819 - in /yate/trunk/debian: changelog control libyate1.3.0.install patches/00list rules yate-alsa.install yate-dev.install yate-gtk2.install yate-mysql.install yate-openh323.install yate-pgsql.install yate.install

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Wed Nov 18 19:01:39 UTC 2009 

Author: tzafrir-guest
Date: Wed Nov 18 19:01:38 2009
New Revision: 7819

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7819
Log:
* New upstream release: 2.1.0
* Update ilbc stripping in get-orig-source.
* No more - in the version.
* The GUI is now qt4 and not gtk2.
* Location of modules files changed.
* There are some extra libraries for the library package.
* s/zaptel/dahdi/'

Modified:
    yate/trunk/debian/changelog
    yate/trunk/debian/control
    yate/trunk/debian/libyate1.3.0.install
    yate/trunk/debian/patches/00list
    yate/trunk/debian/rules
    yate/trunk/debian/yate-alsa.install
    yate/trunk/debian/yate-dev.install
    yate/trunk/debian/yate-gtk2.install
    yate/trunk/debian/yate-mysql.install
    yate/trunk/debian/yate-openh323.install
    yate/trunk/debian/yate-pgsql.install
    yate/trunk/debian/yate.install

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/changelog (original)
+++ yate/trunk/debian/changelog Wed Nov 18 19:01:38 2009
@@ -1,4 +1,4 @@
-yate (2.0.0-1~dfsg-1) UNRELEASED; urgency=low
+yate (2.1.0~dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
   * New upstream release. (Closes: #499586)
@@ -8,13 +8,19 @@
 
   [ Tzafrir Cohen ]
   * Remove -N from wget command in get-orig-source (conflicts with -O).
+  * Update ilbc stripping in get-orig-source.
+  * No more - in the version.
+  * The GUI is now qt4 and not gtk2.
+  * Location of modules files changed.
+  * There are some extra libraries for the library package.
+  * s/zaptel/dahdi/
 
   [ Patrick Matthäi ]
   * Add missing copyright notice.
   * Fix spelling error in control file (s/postgresql/PostgreSQL/).
     Thanks lintian.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 09 May 2009 23:15:30 +0200
+ -- Kilian Krause <kilian at debian.org>  Wed, 18 Nov 2009 20:55:59 +0200
 
 yate (1.3.0-1.dfsg-1) unstable; urgency=low
 

Modified: yate/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/control?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/control (original)
+++ yate/trunk/debian/control Wed Nov 18 19:01:38 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Mikael Magnusson <mikma at users.sourceforge.net>, Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, libpri-dev (>= 1.2.1-3), libopenh323-dev (>= 1.15.6-1), libgsm1-dev, zaptel-source (>= 1:1.4.0~dfsg-1), libmysqlclient15-dev, libpq-dev, libgtk2.0-dev, libasound2-dev, libspeex-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, libpri-dev (>= 1.2.1-3), libopenh323-dev (>= 1.15.6-1), libgsm1-dev, dahdi-source, libmysqlclient15-dev, libpq-dev, libqt4-dev, libasound2-dev, libspeex-dev, dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 Homepage: http://yate.null.ro/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/yate/trunk/

Modified: yate/trunk/debian/libyate1.3.0.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/libyate1.3.0.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/libyate1.3.0.install (original)
+++ yate/trunk/debian/libyate1.3.0.install Wed Nov 18 19:01:38 2009
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libyate.so.*
+debian/tmp/usr/lib/libyate*.so.*

Modified: yate/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/00list?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/patches/00list (original)
+++ yate/trunk/debian/patches/00list Wed Nov 18 19:01:38 2009
@@ -1,2 +1,2 @@
-configure_ilbc
+#configure_ilbc
 #zaptel-header

Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/rules (original)
+++ yate/trunk/debian/rules Wed Nov 18 19:01:38 2009
@@ -33,35 +33,48 @@
 
 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$$//')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')-1
 
 DFSG:=$(shell echo $(DEBVERSION) | sed -e 's/-[0-9]*$$//')
 
 FILENAME := yate_$(UPVERSION).orig.tar.gz
 SRCDIR := yate
 DFSGNAME := yate_$(DFSG).orig.tar.gz
-URL := http://yate.null.ro/tarballs/yate1/yate-$(UPVERSION).tar.gz
+URL := http://yate.null.ro/tarballs/yate2/yate-$(UPVERSION).tar.gz
 
 check-ilbc:
-	( [ ! -f contrib/ilbc/iLBC_define.h ] ) || \
-	  (echo "WARNING: iLBC must be removed from sources before packaging." ; false )
+ifneq (,$(wildcard libs/ilbc/iLBC_define.h))
+	echo "WARNING: iLBC must be removed from sources before packaging."
+	exit 1
+endif
 	touch $@
 
 config.status: check-ilbc patch-stamp configure
 	dh_testdir
 	touch configure
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info --sysconfdir=/etc --disable-ilbc
+	CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr \
+	       --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+	       --sysconfdir=/etc --disable-ilbc
+		#--prefix=/ --exec-prefix=/usr \
+		#--datarootdir=/usr/share --docdir=/usr/share/doc/yate-doc \
+		#--mandir=/usr/share/man --includedir=/usr/include \
+		#--with-openssl --with-libgsm --with-libqt4
 
-build: build-stamp
+build: build-arch build-indep
 
-build-stamp: config.status
+build-arch: build-arch-stamp
+build-arch-stamp: config.status
 	dh_testdir
 	# Add here commands to compile the package.
 	$(MAKE)
 	#docbook-to-man debian/yate.sgml > yate.1
-	touch build-stamp
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: config.status
+	cd share/scripts/yaypm ; python2.5 ./setup.py build
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
@@ -107,6 +120,9 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
+subpacks_names = alsa gtk2 mysql openh323 pgsql
+subpacks = $(subpacks_names:%=$(CURDIR)/debian/yate-%)
+
 # Build architecture-dependent files here.
 binary-arch: install
 	dh_testdir -a
@@ -115,15 +131,21 @@
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_install -a
+	find $(subpacks) -name '*.yate' -type f  -printf '-name %f -o\n' \
+	  | xargs | sed -e 's/ -o$$//' | xargs find $(CURDIR)/debian/yate \
+	  | xargs $(RM) -fv
+	find $(subpacks) -name '*.conf' -type f  -printf '-name %f -o\n' \
+	  | xargs | sed -e 's/ -o$$//' | xargs find $(CURDIR)/debian/yate \
+	  | xargs $(RM) -fv
 	dh_installinit -a
-	dh_installman -a yate.8 yate-config.8
+	dh_installman -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs  -a
 	dh_installdeb -a
-	dh_shlibdeps -a -Llibyate1.3.0 -l debian/libyate1.3.0/usr/lib
+	dh_shlibdeps -a -Llibyate2.1.0 -l debian/libyate1.3.0/usr/lib
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
@@ -141,8 +163,8 @@
 	@@echo Removing non dfsg compliant parts out of it
 	@@[ -d ../tarballs/dfsg/. ]||mkdir -p ../tarballs/dfsg
 	@@tar -xzf ../tarballs/$(FILENAME) -C ../tarballs/dfsg
-	@@rm -rf ../tarballs/dfsg/$(SRCDIR)/contrib/ilbc
-	@@rm -rf ../tarballs/dfsg/$(SRCDIR)/debian
+	@@rm -rf ../tarballs/dfsg/$(SRCDIR)/libs/ilbc/*
+	@@echo -e '#Debian Dummy\n%:\n\t:' >../tarballs/dfsg/$(SRCDIR)/libs/ilbc/Makefile.in
 	@@echo Building the dfsg tarball
 	@@GZIP=-9 tar -b1 -czf ../tarballs/$(DFSGNAME) -C ../tarballs/dfsg $(SRCDIR)
 	@@echo Cleaning up
@@ -150,4 +172,4 @@
 	@@rm -f ../tarballs/$(FILENAME)
 
 binary: binary-indep binary-arch
-.PHONY: build clean clean-patched patch unpatch binary-indep binary-arch binary install 
+.PHONY: build build-arch build-indep clean clean-patched patch unpatch binary-indep binary-arch binary install 

Modified: yate/trunk/debian/yate-alsa.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-alsa.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate-alsa.install (original)
+++ yate/trunk/debian/yate-alsa.install Wed Nov 18 19:01:38 2009
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/yate/modules/alsachan.yate
+debian/tmp/usr/lib/yate/client/alsachan.yate

Modified: yate/trunk/debian/yate-dev.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-dev.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate-dev.install (original)
+++ yate/trunk/debian/yate-dev.install Wed Nov 18 19:01:38 2009
@@ -1,2 +1,3 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/libyate.so
+debian/tmp/usr/lib/libyate*.so
+debian/tmp/usr/lib/pkgconfig/yate.pc

Modified: yate/trunk/debian/yate-gtk2.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-gtk2.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate-gtk2.install (original)
+++ yate/trunk/debian/yate-gtk2.install Wed Nov 18 19:01:38 2009
@@ -1,5 +1,7 @@
-debian/tmp/usr/bin/yate-gtk2
-debian/tmp/usr/lib/yate/modules/skin
-debian/tmp/usr/share/applications/yate-gtk2.desktop
-debian/tmp/etc/yate/yate-gtk2.conf
-debian/tmp/usr/lib/yate/modules/help/*.yhlp
+debian/tmp/usr/bin/yate-qt4
+debian/tmp/usr/lib/yate/qt4/*.yate
+debian/tmp/usr/share/applications/yate-qt4.desktop
+debian/tmp/etc/yate/yate-qt4.conf
+debian/tmp/usr/share/pixmaps/*.png
+debian/tmp/usr/share/yate/help/*.yhlp
+debian/tmp/usr/share/yate/skins/*

Modified: yate/trunk/debian/yate-mysql.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-mysql.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate-mysql.install (original)
+++ yate/trunk/debian/yate-mysql.install Wed Nov 18 19:01:38 2009
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/yate/modules/mysqldb.yate
+debian/tmp/usr/lib/yate/server/mysqldb.yate
 debian/tmp/etc/yate/mysqldb.conf

Modified: yate/trunk/debian/yate-openh323.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-openh323.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate-openh323.install (original)
+++ yate/trunk/debian/yate-openh323.install Wed Nov 18 19:01:38 2009
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/yate/modules/h323chan.yate
+debian/tmp/usr/lib/yate/h323chan.yate
 debian/tmp/etc/yate/h323chan.conf

Modified: yate/trunk/debian/yate-pgsql.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-pgsql.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate-pgsql.install (original)
+++ yate/trunk/debian/yate-pgsql.install Wed Nov 18 19:01:38 2009
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/yate/modules/pgsqldb.yate
+debian/tmp/usr/lib/yate/server/pgsqldb.yate
 debian/tmp/etc/yate/pgsqldb.conf

Modified: yate/trunk/debian/yate.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate.install?rev=7819&op=diff
==============================================================================
--- yate/trunk/debian/yate.install (original)
+++ yate/trunk/debian/yate.install Wed Nov 18 19:01:38 2009
@@ -1,70 +1,9 @@
 debian/tmp/usr/bin/yate usr/bin/
 debian/tmp/usr/bin/yate-config usr/bin/
-debian/tmp/usr/lib/yate/modules/accfile.yate
-debian/tmp/usr/lib/yate/modules/analyzer.yate
-debian/tmp/usr/lib/yate/modules/callfork.yate
-debian/tmp/usr/lib/yate/modules/callgen.yate
-debian/tmp/usr/lib/yate/modules/cdrbuild.yate
-debian/tmp/usr/lib/yate/modules/cdrfile.yate
-debian/tmp/usr/lib/yate/modules/conference.yate
-debian/tmp/usr/lib/yate/modules/dbpbx.yate
-debian/tmp/usr/lib/yate/modules/dumbchan.yate
-debian/tmp/usr/lib/yate/modules/enumroute.yate
-debian/tmp/usr/lib/yate/modules/extmodule.yate
-debian/tmp/usr/lib/yate/modules/gsmcodec.yate
-debian/tmp/usr/lib/yate/modules/osschan.yate
-debian/tmp/usr/lib/yate/modules/moh.yate
-debian/tmp/usr/lib/yate/modules/msgsniff.yate
-debian/tmp/usr/lib/yate/modules/park.yate
-debian/tmp/usr/lib/yate/modules/pbx.yate
-debian/tmp/usr/lib/yate/modules/pbxassist.yate
-debian/tmp/usr/lib/yate/modules/queues.yate
-debian/tmp/usr/lib/yate/modules/regexroute.yate
-debian/tmp/usr/lib/yate/modules/regfile.yate
-debian/tmp/usr/lib/yate/modules/register.yate
-debian/tmp/usr/lib/yate/modules/rmanager.yate
-debian/tmp/usr/lib/yate/modules/tonegen.yate
-debian/tmp/usr/lib/yate/modules/sipfeatures.yate
-debian/tmp/usr/lib/yate/modules/speexcodec.yate
-debian/tmp/usr/lib/yate/modules/tonedetect.yate
-debian/tmp/usr/lib/yate/modules/wavefile.yate
-debian/tmp/usr/lib/yate/modules/yjinglechan.yate
-debian/tmp/usr/lib/yate/modules/yradius.yate
-debian/tmp/usr/lib/yate/modules/yrtpchan.yate
-debian/tmp/usr/lib/yate/modules/yiaxchan.yate
-debian/tmp/usr/lib/yate/modules/ysipchan.yate
-debian/tmp/usr/lib/yate/modules/ystunchan.yate
-debian/tmp/usr/lib/yate/modules/zapchan.yate
-debian/tmp/usr/lib/yate/scripts/Yate.pm
-debian/tmp/usr/lib/yate/scripts/leavemail.php
-debian/tmp/usr/lib/yate/scripts/libyate.php
-debian/tmp/usr/lib/yate/scripts/libyatechan.php
-debian/tmp/usr/lib/yate/scripts/libyate.py
-debian/tmp/usr/lib/yate/scripts/libvoicemail.php
-debian/tmp/usr/lib/yate/scripts/route.php
-debian/tmp/usr/lib/yate/scripts/voicemail.php
-debian/tmp/usr/lib/pkgconfig/yate.pc
+debian/tmp/usr/lib/yate/*.yate
+debian/tmp/usr/lib/yate/client/*.yate
+debian/tmp/usr/lib/yate/jingle/*.yate
+debian/tmp/usr/lib/yate/server/*.yate
+debian/tmp/usr/share/yate/scripts/*
+debian/tmp/etc/yate/*.conf
 
-debian/tmp/etc/yate/accfile.conf
-debian/tmp/etc/yate/cdrbuild.conf
-debian/tmp/etc/yate/cdrfile.conf
-debian/tmp/etc/yate/dbpbx.conf
-debian/tmp/etc/yate/enumroute.conf
-debian/tmp/etc/yate/extmodule.conf
-debian/tmp/etc/yate/moh.conf
-debian/tmp/etc/yate/pbxassist.conf
-debian/tmp/etc/yate/providers.conf
-debian/tmp/etc/yate/regexroute.conf
-debian/tmp/etc/yate/regfile.conf
-debian/tmp/etc/yate/register.conf
-debian/tmp/etc/yate/rmanager.conf
-debian/tmp/etc/yate/sipfeatures.conf
-debian/tmp/etc/yate/yate.conf
-debian/tmp/etc/yate/yiaxchan.conf
-debian/tmp/etc/yate/yjinglechan.conf
-debian/tmp/etc/yate/yradius.conf
-debian/tmp/etc/yate/yrtpchan.conf
-debian/tmp/etc/yate/ysipchan.conf
-debian/tmp/etc/yate/ystunchan.conf
-debian/tmp/etc/yate/zapchan.conf
-

More information about the Pkg-voip-commits mailing list