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

Marco Nenciarini mnencia at alioth.debian.org
Thu Mar 22 19:00:38 CET 2007 

Author: mnencia
Date: 2007-03-22 18:00:37 +0000 (Thu, 22 Mar 2007)
New Revision: 3294

Added:
   wengophone/trunk/debian/patches/debian/no-copying-file.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/get-orig-source.sh
   wengophone/trunk/debian/patches/debian/disable-ilbc.patch
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/rules
Log:
Switched to 2.1 rc2


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-03-22 07:22:19 UTC (rev 3293)
+++ wengophone/trunk/debian/changelog	2007-03-22 18:00:37 UTC (rev 3294)
@@ -1,3 +1,9 @@
+wengophone (2.1.0~rc2-svn10386-1) UNRELEASED; urgency=low
+
+  * New upstream release candidate (rc2)
+
+ -- Marco Nenciarini <mnencia at mercurio.math.unifi.it>  Thu, 22 Mar 2007 18:13:44 +0100
+
 wengophone (2.1.0~beta1-svn9983-1) UNRELEASED; urgency=low
 
   * New upstream snapshot. Switched to branches/wengophone-2.1

Modified: wengophone/trunk/debian/get-orig-source.sh
===================================================================
--- wengophone/trunk/debian/get-orig-source.sh	2007-03-22 07:22:19 UTC (rev 3293)
+++ wengophone/trunk/debian/get-orig-source.sh	2007-03-22 18:00:37 UTC (rev 3294)
@@ -55,7 +55,7 @@
 rm -vrf $destdir/wengophone/together
 rm -vrf $destdir/wengophone/nsis
 rm -vrf $destdir/wengoscons
-find $destdir -iname scons\* | xargs rm -vrf
+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

Modified: wengophone/trunk/debian/patches/debian/disable-ilbc.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2007-03-22 07:22:19 UTC (rev 3293)
+++ wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2007-03-22 18:00:37 UTC (rev 3294)
@@ -1,7 +1,7 @@
-Index: wengophone-2.1.0~beta1-svn9983/wifo/CMakeLists.txt
+Index: wengophone-2.1.0~rc1-svn10188/wifo/CMakeLists.txt
 ===================================================================
---- wengophone-2.1.0~beta1-svn9983.orig/wifo/CMakeLists.txt	2007-01-15 14:02:10.000000000 +0000
-+++ wengophone-2.1.0~beta1-svn9983/wifo/CMakeLists.txt	2007-02-28 14:17:43.000000000 +0000
+--- 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
@@ -10,10 +10,10 @@
  	phapi/speex
  	phapi/speexec
  	phapi/stun
-Index: wengophone-2.1.0~beta1-svn9983/wifo/phapi/CMakeLists.txt
+Index: wengophone-2.1.0~rc1-svn10188/wifo/phapi/CMakeLists.txt
 ===================================================================
---- wengophone-2.1.0~beta1-svn9983.orig/wifo/phapi/CMakeLists.txt	2007-02-28 09:48:11.000000000 +0000
-+++ wengophone-2.1.0~beta1-svn9983/wifo/phapi/CMakeLists.txt	2007-02-28 14:18:49.000000000 +0000
+--- 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
@@ -22,7 +22,7 @@
  	stun
  	gsm
  	owutil
-@@ -41,7 +40,6 @@
+@@ -44,7 +43,6 @@
  	-DUSE_WAVEIN_CBK=1
  	-DPSEUDO_AEC=0
  	-DNO_ECHO__SUPPRESSOR=1

Added: wengophone/trunk/debian/patches/debian/no-copying-file.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/no-copying-file.patch	2007-03-22 07:22:19 UTC (rev 3293)
+++ wengophone/trunk/debian/patches/debian/no-copying-file.patch	2007-03-22 18:00:37 UTC (rev 3294)
@@ -0,0 +1,27 @@
+Index: wengophone-2.1.0~rc1-svn10188/wengophone/CMakeLists.txt
+===================================================================
+--- wengophone-2.1.0~rc1-svn10188.orig/wengophone/CMakeLists.txt	2007-03-20 17:03:01.000000000 +0000
++++ wengophone-2.1.0~rc1-svn10188/wengophone/CMakeLists.txt	2007-03-20 17:03:08.000000000 +0000
+@@ -8,6 +8,6 @@
+ 	#test
+ )
+ 
+-if (COPY_DATA_FILES_ON_CONFIGURE)
+-	ow_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/COPYING ${BUILD_DIR})
+-endif (COPY_DATA_FILES_ON_CONFIGURE)
++# if (COPY_DATA_FILES_ON_CONFIGURE)
++# 	ow_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/COPYING ${BUILD_DIR})
++# endif (COPY_DATA_FILES_ON_CONFIGURE)
+Index: wengophone-2.1.0~rc1-svn10188/DefineCPackDefaults.cmake
+===================================================================
+--- wengophone-2.1.0~rc1-svn10188.orig/DefineCPackDefaults.cmake	2007-03-20 17:03:26.000000000 +0000
++++ wengophone-2.1.0~rc1-svn10188/DefineCPackDefaults.cmake	2007-03-20 17:03:45.000000000 +0000
+@@ -86,7 +86,7 @@
+ set(CPACK_PACKAGE_VENDOR "Wengo")
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SIP Softphone")
+ 
+-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/wengophone/COPYING")
++#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/wengophone/COPYING")
+ 
+ ### versions
+ set(CPACK_PACKAGE_VERSION "2.0.99")

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-03-22 07:22:19 UTC (rev 3293)
+++ wengophone/trunk/debian/patches/series	2007-03-22 18:00:37 UTC (rev 3294)
@@ -1,2 +1,3 @@
 debian/cmake-svnrelease-from-debian-changelog.patch
 debian/disable-ilbc.patch
+debian/no-copying-file.patch

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2007-03-22 07:22:19 UTC (rev 3293)
+++ wengophone/trunk/debian/rules	2007-03-22 18:00:37 UTC (rev 3294)
@@ -5,15 +5,21 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_INSTALL_MANPAGES_wengophone := $(CURDIR)/debian/qtwengophone.1
-DEB_CMAKE_EXTRA_FLAGS := -DWITH_BUILDID=ON -DWITH_SHARED_PHAPI=OFF \
-	-DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
-	-DWITH_SHARED_OWCURL=OFF -DWITH_SHARED_SFP-PLUGIN=OFF
+DEB_CMAKE_EXTRA_FLAGS := -DQT_UIC_EXECUTABLE=/usr/bin/uic-qt4 \
+	-DCMAKE_BUILD_TYPE=None \
+	-DCMAKE_SKIP_RPATH=1 \
+	-DWITH_BUILDID=ON \
+	-DPORTAUDIO_INTERNAL=OFF \
+	-DFFMPEG_INTERNAL=OFF \
+	-DSPEEX_INTERNAL=OFF \
+	-DSAMPLERATE_INTERNAL=OFF \
+	-DCURL_INTERNAL=OFF
 
 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]*$$//')
 
-SVNREP:=https://dev.openwengo.com/svn/openwengo/wengophone-ng/branches/wengophone-2.1
+SVNREP:=http://dev.openwengo.com/svn/openwengo/wengophone-ng/tags/release/2.1/2007-03-20-wengophone-2.1-rc2
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"

More information about the Pkg-voip-commits mailing list