[Pkg-voip-commits] r7419 - in /kiax/trunk/debian: TODO.Debian changelog control patches/00list patches/qmake_libs patches/series patches/stdlib rules

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Wed Jul 15 17:12:49 UTC 2009 

Author: tzafrir-guest
Date: Wed Jul 15 17:12:48 2009
New Revision: 7419

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7419
Log:
* New upstream SVN snapshot.
* Switching to quilt.
* Patch stdlib: Fix a trivial header omition.
* Patch qmake_libs: Don't use static libraries. 

Added:
    kiax/trunk/debian/TODO.Debian
    kiax/trunk/debian/patches/qmake_libs
    kiax/trunk/debian/patches/series   (contents, props changed)
      - copied, changed from r7418, kiax/trunk/debian/patches/00list
    kiax/trunk/debian/patches/stdlib
Removed:
    kiax/trunk/debian/patches/00list
Modified:
    kiax/trunk/debian/changelog
    kiax/trunk/debian/control
    kiax/trunk/debian/rules

Added: kiax/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/TODO.Debian?rev=7419&op=file
==============================================================================
--- kiax/trunk/debian/TODO.Debian (added)
+++ kiax/trunk/debian/TODO.Debian Wed Jul 15 17:12:48 2009
@@ -1,0 +1,6 @@
+The package does not yet build. The qmake handling of libraries is, 
+well, odd.
+
+I did not even get to proper packaging.
+
+Furthermore, there are tons of warnings (e.g.: signed/unsigned).

Modified: kiax/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/changelog?rev=7419&op=diff
==============================================================================
--- kiax/trunk/debian/changelog (original)
+++ kiax/trunk/debian/changelog Wed Jul 15 17:12:48 2009
@@ -1,5 +1,6 @@
-kiax (0.8.51.dfsg-2-2) UNRELEASED; urgency=low
+kiax (2.0.0.svn.146-1) UNRELEASED; urgency=low
 
+  [ Kilian Krause ]
   * NOT RELEASED YET
 
   * debian/watch: Update.
@@ -9,7 +10,13 @@
   * Remove -N from wget args in get-orig-source target as -O is already
     used.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 09 May 2009 23:31:06 +0200
+  [ Tzafrir Cohen ]
+  * New upstream SVN snapshot.
+  * Switching to quilt.
+  * Patch stdlib: Fix a trivial header omition.
+  * Patch qmake_libs: Don't use static libraries. 
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed, 15 Jul 2009 20:07:24 +0300
 
 kiax (0.8.51.dfsg-2-1) unstable; urgency=low
 

Modified: kiax/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/control?rev=7419&op=diff
==============================================================================
--- kiax/trunk/debian/control (original)
+++ kiax/trunk/debian/control Wed Jul 15 17:12:48 2009
@@ -2,8 +2,8 @@
 Section: net
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, George Danchev <danchev at spnet.net>, Santiago Garcia Mantinan <manty at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libxpm-dev,  libqt3-mt-dev (>= 3:3.3.4-3), libiaxclient-dev, libspeex-dev
+Uploaders: Mark Purcell <msp at debian.org>, George Danchev <danchev at spnet.net>, Santiago Garcia Mantinan <manty at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Build-Depends: debhelper (>= 4.0.0), dpatch, libqt4-dev, libiaxclient-dev, libspeexdsp-dev
 Standards-Version: 3.7.2
 Homepage: http://www.kiax.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/kiax/trunk/

Added: kiax/trunk/debian/patches/qmake_libs
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/patches/qmake_libs?rev=7419&op=file
==============================================================================
--- kiax/trunk/debian/patches/qmake_libs (added)
+++ kiax/trunk/debian/patches/qmake_libs Wed Jul 15 17:12:48 2009
@@ -1,0 +1,36 @@
+--- a/gui/gui.pro
++++ b/gui/gui.pro
+@@ -14,14 +14,15 @@ DEFINES += WIN32DEP
+ 
+ linux-g++ {
+ # Uncomment if you want dynamic linking
+-# LIBSDIR += $$CORELIBDIR/libs-linux
+-# LIBS += -L/usr/lib -L/usr/local/lib -L$$CORELIBDIR -liaxclient -lkiax2core -ljson -lspeexdsp -lspeex -lportaudio -lgsm -lsqlite3 -lasound 
++LIBSDIR += $$CORELIBDIR/libs-linux
++LIBS += -L/usr/lib -L/usr/local/lib -L$$CORELIBDIR -liaxclient -lkiax2core -ljson -lspeexdsp -lspeex -lportaudio -lgsm -lsqlite3 -lasound 
+ 
+-LIBSDIR += $$CORELIBDIR/static-libs-linux
+-LIBS += $$LIBSDIR/libiaxclient.a $$CORELIBDIR/libkiax2core.a $$LIBSDIR/libjson.a $$LIBSDIR/libspeexdsp.a $$LIBSDIR/libspeex.a $$LIBSDIR/libportaudio.a $$LIBSDIR/libgsm.a $$LIBSDIR/libsqlite3.a -lcurl /usr/lib/libasound.so.2 
++#LIBSDIR += $$CORELIBDIR/static-libs-linux
++#LIBS += $$LIBSDIR/libiaxclient.a $$CORELIBDIR/libkiax2core.a $$LIBSDIR/libjson.a $$LIBSDIR/libspeexdsp.a $$LIBSDIR/libspeex.a $$LIBSDIR/libportaudio.a $$LIBSDIR/libgsm.a $$LIBSDIR/libsqlite3.a -lcurl /usr/lib/libasound.so.2 
+ 
+ # Uncomment if you want dynamic linking
+ # LIBS += $$LIBSDIR/libiaxclient.so.1.0.2 $$LIBSDIR/libsqlite3.so.0.8.6 $$CORELIBDIR/libkiax2core.so.1.0.0 $$LIBSDIR/libjson.a $$LIBSDIR/libspeexdsp.so.1.4.0 $$LIBSDIR/libspeex.so.1.4.0
++LIBS += -liaxclient -lsqlite3 -lkiax2core.so.1.0.0 $$LIBSDIR/libjson.a -lspeexdsp -lspeex -lgsm -lasound -lportaudio
+ DEFINES += LINUXDEP
+ }
+ 
+--- a/kiax2core/kiax2core.pro
++++ b/kiax2core/kiax2core.pro
+@@ -13,8 +13,9 @@ linux-g++ {
+ # Uncomment if you want dynamic linking
+ # LIBSDIR +=./libs-linux
+ # LIBS += $$LIBSDIR/libiaxclient.so.1.0.2 $$LIBSDIR/libsqlite3.so.0.8.6
+-LIBSDIR += $$CORELIBDIR/static-libs-linux
+-LIBS += $$LIBSDIR/libiaxclient.a $$CORELIBDIR/libkiax2core.a $$LIBSDIR/libjson.a $$LIBSDIR/libspeexdsp.a $$LIBSDIR/libspeex.a $$LIBSDIR/libportaudio.a $$LIBSDIR/libgsm.a $$LIBSDIR/libsqlite3.a /usr/lib/libasound.so.2
++#LIBSDIR += $$CORELIBDIR/static-libs-linux
++#LIBS += $$LIBSDIR/libiaxclient.a $$CORELIBDIR/libkiax2core.a $$LIBSDIR/libjson.a $$LIBSDIR/libspeexdsp.a $$LIBSDIR/libspeex.a $$LIBSDIR/libportaudio.a $$LIBSDIR/libgsm.a $$LIBSDIR/libsqlite3.a /usr/lib/libasound.so.2
++LIBS += -liaxclient -lspeexdsp -lspeex -lgsm -lsqlite3 -lasound -lportaudio
+ 
+ DEFINES += LINUXDEP
+ }

Copied: kiax/trunk/debian/patches/series (from r7418, kiax/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/patches/series?rev=7419&op=diff
==============================================================================
--- kiax/trunk/debian/patches/00list (original)
+++ kiax/trunk/debian/patches/series Wed Jul 15 17:12:48 2009
@@ -1,2 +1,4 @@
-01_debian-patch
-02_disable_echo_cancellation
+#01_debian-patch
+#02_disable_echo_cancellation
+stdlib
+qmake_libs

Propchange: kiax/trunk/debian/patches/series
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: kiax/trunk/debian/patches/stdlib
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/patches/stdlib?rev=7419&op=file
==============================================================================
--- kiax/trunk/debian/patches/stdlib (added)
+++ kiax/trunk/debian/patches/stdlib Wed Jul 15 17:12:48 2009
@@ -1,0 +1,10 @@
+--- a/kiax2core/StorageService.cpp
++++ b/kiax2core/StorageService.cpp
+@@ -1,6 +1,7 @@
+ #include "StorageService.h"
+ #include <dirent.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #ifdef WIN32DEP
+ #include <windows.h>
+ #include "setupapi.h"

Modified: kiax/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/kiax/trunk/debian/rules?rev=7419&op=diff
==============================================================================
--- kiax/trunk/debian/rules (original)
+++ kiax/trunk/debian/rules Wed Jul 15 17:12:48 2009
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
@@ -19,42 +19,39 @@
 	CFLAGS += -O2
 endif
 
+PACKAGE:=$(shell sed -nre 's/^Source: (.*)$$/\1/p' debian/control)
 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-[0-9]*$$//')
 
 DFSG:=$(shell echo $(DEBVERSION) | sed -e 's/-[0-9]*$$//')
+SVN_REV:=$(shell echo $(UPVERSION) | sed -e 's/^.*svn\.//')
+SVN_BRANCH:=trunk
+SVN_URL:=https://kiax.svn.sourceforge.net/svnroot/kiax/$(SVN_BRANCH)
 
 FILENAME := kiax_$(UPVERSION).orig.tar.gz
 SRCDIR := kiax-$(UPVERSION)-src
 DFSGNAME := kiax_$(DFSG).orig.tar.gz
-URL := http://heanet.dl.sourceforge.net/kiax/kiax-0.8.51-src.tar.gz
+URL := http://heanet.dl.sourceforge.net/kiax/kiax2-beta1-linux.tar.gz
+DIR_NAME:=$(PACKAGE)-$(UPVERSION)
+TARBALL:=$(PACKAGE)_$(UPVERSION).orig.tar.gz
 
 check-ilbc:
 	( [ ! -f lib/iLBC/iLBC_define.h ] ) || \
 	  (echo "WARNING: iLBC must be removed from sources before packaging." ; false )
 	touch $@
 
-configure: check-ilbc patch configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --prefix=/usr
+build: check-ilbc patch build-stamp
 
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure
+build-stamp: 
 	dh_testdir
 
 	# Add here commands to compile the package.
-	./configure --prefix=/usr 
+	qmake
 	$(MAKE)
 	#docbook-to-man debian/kiax.sgml > kiax.1
 
-	touch build-stamp
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
@@ -63,8 +60,7 @@
 	rm -f build-stamp configure-stamp
 	
 	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ]||$(MAKE) clean
-	rm -fR Makefile src/Makefile
+	[ ! -f Makefile ]||$(MAKE) distclean
 	
 	dh_clean 
 
@@ -112,21 +108,25 @@
 	@@echo "DFSG     version:        $(DFSG)"
 	@@echo "Upstream version:        $(UPVERSION)"
 
+TARBALL_DIR=../tarballs/$(PACKAGE)-$(UPVERSION).tmp
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading $(FILENAME) from $(URL) ...
-	@@wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-	@@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)/lib
-	@@echo Fixing the tar warning
-	@@touch ../tarballs/dfsg/$(SRCDIR)/templates
-	@@ echo Building the dfsg tarball
-	@@GZIP=-9 tar -b1 -czf ../tarballs/$(DFSGNAME) -C ../tarballs/dfsg $(SRCDIR)
+	@@echo "Exporting rev. $(SVN_REV) to $(TARBALL_DIR)/$(DIR_NAME)"
+	@@svn export -q -r $(SVN_REV) $(SVN_URL) $(TARBALL_DIR)/$(DIR_NAME)
+	@@tar czf ../tarballs/$(TARBALL) -C $(TARBALL_DIR) $(DIR_NAME)
+	@@#echo Downloading $(FILENAME) from $(URL) ...
+	@@#wget -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
+	@@#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)/lib
+	@@#echo Fixing the tar warning
+	@@#touch ../tarballs/dfsg/$(SRCDIR)/templates
+	@@# echo Building the dfsg tarball
+	@@#GZIP=-9 tar -b1 -czf ../tarballs/$(DFSGNAME) -C ../tarballs/dfsg $(SRCDIR)
 	@@echo Cleaning up
-	@@rm -rf ../tarballs/dfsg
+	@@#rm -rf ../tarballs/dfsg
 	@@rm -f ../tarballs/$(FILENAME)
 
 binary: binary-indep binary-arch

More information about the Pkg-voip-commits mailing list