[Pkg-voip-commits] r3579 - in wengophone/trunk/debian: . patches patches/debian

mnencia at alioth.debian.org mnencia at alioth.debian.org
Fri May 18 14:35:57 UTC 2007 

Author: mnencia
Date: 2007-05-18 14:35:57 +0000 (Fri, 18 May 2007)
New Revision: 3579

Added:
   wengophone/trunk/debian/patches/debian/cmake-find-boost-1.34.0.patch
Removed:
   wengophone/trunk/debian/patches/debian/disable-ilbc.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/control
   wengophone/trunk/debian/get-orig-source.sh
   wengophone/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch
   wengophone/trunk/debian/patches/debian/remove-extra-copying-file.patch
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/rules
Log:
New stable release


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/changelog	2007-05-18 14:35:57 UTC (rev 3579)
@@ -1,10 +1,28 @@
+wengophone (2.1.0.dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream stable release.
+    Closes: #396943, #396967, #397390
+  * Disabled cmake-svnrelease-from-debian-changelog patch.
+    Closes: #423517
+  * debian/get-orig-source.sh: strip uneeded library sources shipped
+    upstream
+  * debian/control: libboost1.34.0 is in unstable so we don't need to
+    build-depends on g++-3.4 anymore. Closes: #417662
+  * debian/control: Build-depends on libiaxclient-dev
+  * Removed disable-ilbc patch (merged upstream).
+  * Refreshed patches
+    + cmake-no-rpath_to_link_path
+    + remove-extra-copying-file
+  * Added cmake-find-boost-1.34.0 patch
+
+ -- Marco Nenciarini <mnencia at debian.org>  Fri, 18 May 2007 16:03:00 +0200
+
 wengophone (2.1.0~rc2-svn10386-2) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
   * Modified cmake-svnrelease-from-debian-changelog patch to use
     perl instead of sed. Closes: #423517
 
- -- Marco Nenciarini <mnencia at debian.org>  Sun, 13 May 2007 12:24:04 +0200
+ -- Marco Nenciarini <mnencia at debian.org>  Fri, 18 May 2007 11:03:45 +0200
 
 wengophone (2.1.0~rc2-svn10386-1) unstable; urgency=low
 

Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/control	2007-05-18 14:35:57 UTC (rev 3579)
@@ -4,15 +4,15 @@
 Maintainer: Marco Nenciarini <mnencia at debian.org>
 Build-Conflicts: qt3-dev-tools
 Build-Depends: cdbs (>= 0.4.27-1), bzip2, debhelper (>= 4.1.0), quilt,
- patchutils (>= 0.2.25), cmake, g++-3.4, libqt4-dev, libgtk2.0-dev,
- libavcodec-dev (>= 0.cvs20060823-3.1), 
+ patchutils (>= 0.2.25), cmake, libqt4-dev, libgtk2.0-dev,
+ libavcodec-dev (>= 0.cvs20060823-3.1),
  libavformat-dev (>= 0.cvs20060823-3.1), portaudio19-dev,
- libgnutls-dev, libboost-serialization-dev (>= 1.33.1-5),
- libboost-thread-dev (>= 1.33.1-5), libboost-regex-dev (>= 1.33.1-5),
- libboost-signals-dev (>= 1.33.1-5), 
- libboost-program-options-dev (>= 1.33.1-5), uuid-dev, libasound2-dev,
+ libgnutls-dev, libboost-serialization-dev (>= 1.34.0-1),
+ libboost-thread-dev (>= 1.34.0-1), libboost-regex-dev (>= 1.34.0-1),
+ libboost-signals-dev (>= 1.34.0-1),
+ libboost-program-options-dev (>= 1.34.0-1), uuid-dev, libasound2-dev,
  libspeex-dev, libssl-dev, libxml2-dev, libcurl3-openssl-dev,
- libsamplerate0-dev, libsndfile1-dev 
+ libsamplerate0-dev, libsndfile1-dev, libiaxclient-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/wengophone/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/

Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/get-orig-source.sh	2007-05-18 14:35:57 UTC (rev 3579)
@@ -22,8 +22,8 @@
 fi
 
 curdir="$PWD"
-destdir=wengophone-$version-svn$svn_rev
-desttar=wengophone_$version-svn$svn_rev.orig.tar
+destdir=wengophone-$version
+desttar=wengophone_$version.orig.tar
 
 if [ -d "$curdir/../tarballs" ]; then
     finaldir=$curdir/../tarballs
@@ -51,19 +51,54 @@
 fi
 
 # Cleaning tree
+purge_3rdparty() {
+    purgedir="$1"
+    if [ -z "$purgedir" ] || [ ! -d "$purgedir" ]; then
+        return 1
+    fi
+    find $purgedir -depth -type f -not -iname cmake\* -print0 | xargs -0 rm -vf
+    find $purgedir -depth -type d -not -iname cmake\* -print0 | xargs -0 rmdir --ignore-fail-on-non-empty
+}
+
 echo "Cleaning tree to remove anything not needed for non-Windows builds..."
+
+# Remove windows binary stuff
 rm -vrf $destdir/wengophone/together
 rm -vrf $destdir/wengophone/nsis
+rm -vrf $destdir/libs/3rdparty/*/binary-lib
+find $destdir -iname \*.dll -print0 | xargs -0 rm -vf
+find $destdir -iname \*.lib -print0 | xargs -0 rm -vf
+
+# Remove deprecated scons code
 rm -vrf $destdir/wengoscons
-find $destdir -iname scons\* -o -iname soptions | xargs rm -vrf
-find $destdir -iname config.guess -o -iname config.sub | xargs rm -vf
-find $destdir -iname \*.dll | xargs rm -vf
-find $destdir -iname \*.lib | xargs rm -vf
-echo "Cleaning done"
+find $destdir -depth \( -iname scons\* -o -iname soptions \) -print0 | xargs -0 rm -vrf
 
+# Remove outdated autotools files
+find $destdir \( -iname config.guess -o -iname config.sub \) -print0 | xargs -0 rm -vf
+
 # Remove iLBC codec
-rm -rf $destdir/wifo/phapi/ilbc
+rm -rfv $destdir/wifo/phapi/ilbc
 
+# Remove portaudio code
+purge_3rdparty $destdir/libs/3rdparty/portaudio 
+
+# Remove ffmpeg code
+purge_3rdparty $destdir/libs/3rdparty/ffmpeg 
+
+# Remove speex code
+purge_3rdparty $destdir/wifo/phapi/speex
+
+# Remove samplerate code
+purge_3rdparty $destdir/libs/3rdparty/samplerate
+
+# Remove curl code
+purge_3rdparty $destdir/libs/3rdparty/curl
+
+# Remove iaxclient code
+purge_3rdparty $destdir/libs/3rdparty/iaxclient
+
+echo "Cleaning done"
+
 # Make the sources archive
 echo -n "Writing archive... "
 tar cf $desttar $destdir

Added: wengophone/trunk/debian/patches/debian/cmake-find-boost-1.34.0.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-find-boost-1.34.0.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/debian/cmake-find-boost-1.34.0.patch	2007-05-18 14:35:57 UTC (rev 3579)
@@ -0,0 +1,13 @@
+Index: wengophone-2.1.0.dfsg/owbuild/FindBoost.cmake
+===================================================================
+--- wengophone-2.1.0.dfsg.orig/owbuild/FindBoost.cmake	2007-05-10 11:48:10.000000000 +0000
++++ wengophone-2.1.0.dfsg/owbuild/FindBoost.cmake	2007-05-18 13:41:46.000000000 +0000
+@@ -91,7 +91,7 @@
+     endif (CYGWIN)
+ 
+   else (WIN32)
+-    set(BOOST_LIB_SUFFIXES -gcc-mt)
++    set(BOOST_LIB_SUFFIXES -gcc41-mt-1_34 -gcc-mt)
+   endif (WIN32)
+ 
+   find_path(BOOST_INCLUDE_DIR

Modified: wengophone/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch	2007-05-18 14:35:57 UTC (rev 3579)
@@ -1,13 +1,13 @@
-Index: wengophone-2.1.0~rc2-svn10386/wengophone/src/presentation/qt/CMakeLists.txt
+Index: wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
 ===================================================================
---- wengophone-2.1.0~rc2-svn10386.orig/wengophone/src/presentation/qt/CMakeLists.txt	2007-03-23 15:58:11.000000000 +0000
-+++ wengophone-2.1.0~rc2-svn10386/wengophone/src/presentation/qt/CMakeLists.txt	2007-03-23 16:00:35.000000000 +0000
-@@ -530,8 +530,6 @@
- 		PROPERTIES
- 			INSTALL_RPATH
- 				${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wengophone
--			INSTALL_RPATH_USE_LINK_PATH
--				ON
- 	)
+--- wengophone-2.1.0.dfsg.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-05-18 12:43:07.000000000 +0200
++++ wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-05-18 12:43:15.000000000 +0200
+@@ -4,8 +4,6 @@
+ 	PROPERTIES
+ 		INSTALL_RPATH
+ 			${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/wengophone
+-		INSTALL_RPATH_USE_LINK_PATH
+-			ON
+ )
  
- 	INSTALL(TARGETS
+ install(TARGETS

Deleted: wengophone/trunk/debian/patches/debian/disable-ilbc.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2007-05-18 14:35:57 UTC (rev 3579)
@@ -1,32 +0,0 @@
-Index: wengophone-2.1.0~rc1-svn10188/wifo/CMakeLists.txt
-===================================================================
---- wengophone-2.1.0~rc1-svn10188.orig/wifo/CMakeLists.txt	2007-03-20 17:06:09.000000000 +0000
-+++ wengophone-2.1.0~rc1-svn10188/wifo/CMakeLists.txt	2007-03-20 17:06:16.000000000 +0000
-@@ -41,7 +41,6 @@
- 	phapi/gsm
- 	phapi/amrnb
- 	phapi/amrwb
--	phapi/ilbc
- 	phapi/speex
- 	phapi/speexec
- 	phapi/stun
-Index: wengophone-2.1.0~rc1-svn10188/wifo/phapi/CMakeLists.txt
-===================================================================
---- wengophone-2.1.0~rc1-svn10188.orig/wifo/phapi/CMakeLists.txt	2007-03-20 17:06:10.000000000 +0000
-+++ wengophone-2.1.0~rc1-svn10188/wifo/phapi/CMakeLists.txt	2007-03-20 17:06:16.000000000 +0000
-@@ -7,7 +7,6 @@
- ow_use_private_libraries(
- 	osip2
- 	ortp
--	ilbc
- 	stun
- 	gsm
- 	owutil
-@@ -44,7 +43,6 @@
- 	-DUSE_WAVEIN_CBK=1
- 	-DPSEUDO_AEC=0
- 	-DNO_ECHO__SUPPRESSOR=1
--	-DENABLE_ILBC=1
- #	-DOSIP_MT=1
- #	-DENABLE_TRACE=0
- 	-DPH_VIDEO_USELOCK=1

Modified: wengophone/trunk/debian/patches/debian/remove-extra-copying-file.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/remove-extra-copying-file.patch	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/patches/debian/remove-extra-copying-file.patch	2007-05-18 14:35:57 UTC (rev 3579)
@@ -1,14 +1,12 @@
-Index: wengophone-2.1.0~rc2-svn10386/wengophone/src/presentation/qt/CMakeLists.txt
+Index: wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
 ===================================================================
---- wengophone-2.1.0~rc2-svn10386.orig/wengophone/src/presentation/qt/CMakeLists.txt	2007-03-23 16:19:12.000000000 +0000
-+++ wengophone-2.1.0~rc2-svn10386/wengophone/src/presentation/qt/CMakeLists.txt	2007-03-23 16:19:35.000000000 +0000
-@@ -582,9 +582,6 @@
- 			RENAME wengophone.png)
- 	endforeach(size)
- 
--	INSTALL(FILES
--		${CMAKE_SOURCE_DIR}/wengophone/COPYING
--		DESTINATION ${DATA_INSTALL_DIR})
- endif (LINUX)
- 
- if (WIN32)
+--- wengophone-2.1.0.dfsg.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-05-18 12:39:05.000000000 +0200
++++ wengophone-2.1.0.dfsg/wengophone/src/presentation/qt/CMakeLists-install-linux.txt	2007-05-18 12:39:15.000000000 +0200
+@@ -63,7 +63,3 @@
+ 		DESTINATION share/icons/hicolor/${size}x${size}/apps/
+ 		RENAME wengophone.png)
+ endforeach(size)
+-
+-install(FILES
+-	${CMAKE_SOURCE_DIR}/wengophone/COPYING
+-	DESTINATION ${DATA_INSTALL_DIR})

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/patches/series	2007-05-18 14:35:57 UTC (rev 3579)
@@ -1,5 +1,4 @@
-debian/cmake-svnrelease-from-debian-changelog.patch
-debian/disable-ilbc.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-no-rpath_to_link_path.patch
 debian/cmake-force-fpic.patch
+debian/cmake-find-boost-1.34.0.patch

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2007-05-17 20:40:33 UTC (rev 3578)
+++ wengophone/trunk/debian/rules	2007-05-18 14:35:57 UTC (rev 3579)
@@ -4,38 +4,37 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-export CXX=g++-3.4
-export CC=gcc-3.4
-
 DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
 DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_INSTALL_RPATH=/usr/lib/wengophone \
 	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
 	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
-	-DWITH_BUILDID=ON \
 	-DPORTAUDIO_INTERNAL=OFF \
 	-DFFMPEG_INTERNAL=OFF \
 	-DSPEEX_INTERNAL=OFF \
 	-DSAMPLERATE_INTERNAL=OFF \
-	-DCURL_INTERNAL=OFF
+	-DCURL_INTERNAL=OFF \
+	-DIAXCLIENT_INTERNAL=OFF
 # Avoid postinst-has-useless-call-to-ldconfig
 DEB_DH_MAKESHLIBS_ARGS_wengophone := -n
 
 DEBVERSION:=$(shell head -n 1 debian/changelog | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//' -e 's/-svn.*$$//' -e 's/.dfsg$$//')
-SVNVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
+SRCVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9]*$$//')
+UPVERSION:=$(shell echo $(SRCVERSION) | sed -e 's/-svn.*$$//' -e 's/.dfsg.*$$//')
+SVNVERSION:=$(shell echo $(DEBVERSION) | grep svn | sed -e 's/^.*svn//' -e 's/-[0-9]*$$//')
 
-SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-03-20-wengophone-2.1-rc2
+SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-05-15-wengophone-2.1.0
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Source version:          $(SRCVERSION)"
 	@@echo "Upstream version:        $(UPVERSION)"
 	@@echo "Svn version:             $(SVNVERSION)"
 
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@echo Downloading version $(SVNVERSION) from $(SVNREP) ...
+	@@echo Downloading version $(UPVERSION) from $(SVNREP) ...
 	@@chmod +x debian/get-orig-source.sh
-	debian/get-orig-source.sh $(UPVERSION) $(SVNREP) $(SVNVERSION)
+	debian/get-orig-source.sh $(SRCVERSION) $(SVNREP) $(SVNVERSION)

More information about the Pkg-voip-commits mailing list