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

Tue Apr 3 16:18:38 UTC 2007

Author: mnencia
Date: 2007-04-03 16:18:38 +0000 (Tue, 03 Apr 2007)
New Revision: 3357

Added:
   wengophone/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/control
   wengophone/trunk/debian/patches/debian/no-copying-file.patch
   wengophone/trunk/debian/patches/series
   wengophone/trunk/debian/rules
Log:
Prepared for release
Now the package is lintian and linda clean
In the nexr commit I'll rename no-copying-file.patch to remove-extra-copying-file.patch


Modified: wengophone/trunk/debian/changelog
===================================================================

--- wengophone/trunk/debian/changelog	2007-04-02 08:51:37 UTC (rev 3356)
+++ wengophone/trunk/debian/changelog	2007-04-03 16:18:38 UTC (rev 3357)
@@ -1,8 +1,18 @@
-wengophone (2.1.0~rc2-svn10386-1) UNRELEASED; urgency=low
+wengophone (2.1.0~rc2-svn10386-1) unstable; urgency=low
 
-  * New upstream release candidate (rc2)
+  * New upstream release candidate.
+    Closes: #405439, #384973, #397298, #397387, #402656, #404968,
+    #404970, #412595
+  * Forced to compile with g++-3.4 to avoid random crashes.
+    http://dev.openwengo.com/pipermail/wengophone-devel/2006-December/004731.html
+  * Added patches
+    + cmake-no-rpath_to_link_path
+    + remove-extra-copying-file
+  * debian/control: Build-depends on g++-3.4
+  * Modified get-orig-source.sh to better handle the new source 
+    structure.
 
- -- Marco Nenciarini <mnencia at mercurio.math.unifi.it>  Thu, 22 Mar 2007 18:13:44 +0100
+ -- Marco Nenciarini <mnencia at mercurio.math.unifi.it>  Tue,  3 Apr 2007 17:23:11 +0200
 
 wengophone (2.1.0~beta1-svn9983-1) UNRELEASED; urgency=low
 

Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control	2007-04-02 08:51:37 UTC (rev 3356)
+++ wengophone/trunk/debian/control	2007-04-03 16:18:38 UTC (rev 3357)
@@ -3,11 +3,13 @@
 Priority: optional
 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, 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),
+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), 
+ 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,
  libspeex-dev, libssl-dev, libxml2-dev, libcurl3-openssl-dev,
  libsamplerate0-dev, libsndfile1-dev 

Added: 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-04-02 08:51:37 UTC (rev 3356)
+++ wengophone/trunk/debian/patches/debian/cmake-no-rpath_to_link_path.patch	2007-04-03 16:18:38 UTC (rev 3357)
@@ -0,0 +1,13 @@
+Index: wengophone-2.1.0~rc2-svn10386/wengophone/src/presentation/qt/CMakeLists.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
+ 	)
+ 
+ 	INSTALL(TARGETS

Modified: wengophone/trunk/debian/patches/debian/no-copying-file.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/no-copying-file.patch	2007-04-02 08:51:37 UTC (rev 3356)
+++ wengophone/trunk/debian/patches/debian/no-copying-file.patch	2007-04-03 16:18:38 UTC (rev 3357)
@@ -1,27 +1,14 @@
-Index: wengophone-2.1.0~rc1-svn10188/wengophone/CMakeLists.txt
+Index: wengophone-2.1.0~rc2-svn10386/wengophone/src/presentation/qt/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
- )
+--- 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)
  
--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")
+-	INSTALL(FILES
+-		${CMAKE_SOURCE_DIR}/wengophone/COPYING
+-		DESTINATION ${DATA_INSTALL_DIR})
+ endif (LINUX)
  
--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")
+ if (WIN32)

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-04-02 08:51:37 UTC (rev 3356)
+++ wengophone/trunk/debian/patches/series	2007-04-03 16:18:38 UTC (rev 3357)
@@ -1,3 +1,4 @@
 debian/cmake-svnrelease-from-debian-changelog.patch
 debian/disable-ilbc.patch
 debian/no-copying-file.patch
+debian/cmake-no-rpath_to_link_path.patch

Modified: wengophone/trunk/debian/rules
===================================================================
--- wengophone/trunk/debian/rules	2007-04-02 08:51:37 UTC (rev 3356)
+++ wengophone/trunk/debian/rules	2007-04-03 16:18:38 UTC (rev 3357)
@@ -4,16 +4,23 @@
 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=None \
-	-DCMAKE_SKIP_RPATH=1 \
+	-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
+# 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$$//')


