[Pkg-voip-commits] r2878 - in wengophone/branches/etch/debian: . patches patches/generic

[Marco Nenciarini]

Author: mnencia
Date: 2006-12-28 17:21:27 +0100 (Thu, 28 Dec 2006)
New Revision: 2878

Added:
   wengophone/branches/etch/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch
Modified:
   wengophone/branches/etch/debian/changelog
   wengophone/branches/etch/debian/control
   wengophone/branches/etch/debian/patches/series
Log:
* This commint may fix buildserver.net build (when i'll merge it on trunk)
* Prepared for etch upload


Modified: wengophone/branches/etch/debian/changelog
===================================================================
--- wengophone/branches/etch/debian/changelog	2006-12-28 13:57:43 UTC (rev 2877)
+++ wengophone/branches/etch/debian/changelog	2006-12-28 16:21:27 UTC (rev 2878)
@@ -1,3 +1,10 @@
+wengophone (2.0.0~rc5-svn8108-3) unstable; urgency=low
+
+  * Added cmake-fix-find-alsa-FTBFS.patch (Closes: #403056)
+  * Added Build-Conflicts against qt3-dev-tools (Closes: #398184)
+
+ -- Marco Nenciarini <mnencia at debian.org>  Thu, 28 Dec 2006 17:19:04 +0100
+
 wengophone (2.0.0~rc5-svn8108-2) unstable; urgency=low
 
   * Added cmake-external-speex.patch to fix compilation on alpha,

Modified: wengophone/branches/etch/debian/control
===================================================================
--- wengophone/branches/etch/debian/control	2006-12-28 13:57:43 UTC (rev 2877)
+++ wengophone/branches/etch/debian/control	2006-12-28 16:21:27 UTC (rev 2878)
@@ -2,6 +2,7 @@
 Section: net
 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,

Added: wengophone/branches/etch/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch
===================================================================
--- wengophone/branches/etch/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch	2006-12-28 13:57:43 UTC (rev 2877)
+++ wengophone/branches/etch/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch	2006-12-28 16:21:27 UTC (rev 2878)
@@ -0,0 +1,11 @@
+diff -urNp wengophone-2.0.0~rc5-svn8108-orig/cmake/Modules/FindAlsa.cmake wengophone-2.0.0~rc5-svn8108/cmake/Modules/FindAlsa.cmake
+--- wengophone-2.0.0~rc5-svn8108-orig/cmake/Modules/FindAlsa.cmake	2006-09-16 03:35:56.000000000 +0200
++++ wengophone-2.0.0~rc5-svn8108/cmake/Modules/FindAlsa.cmake	2006-12-14 20:35:30.000000000 +0100
+@@ -8,6 +8,7 @@
+ 
+ include(CheckIncludeFiles)
+ include(CheckIncludeFileCXX)
++include(CheckLibraryExists)
+ 
+ # Already done by toplevel
+ #check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)

Modified: wengophone/branches/etch/debian/patches/series
===================================================================
--- wengophone/branches/etch/debian/patches/series	2006-12-28 13:57:43 UTC (rev 2877)
+++ wengophone/branches/etch/debian/patches/series	2006-12-28 16:21:27 UTC (rev 2878)
@@ -1,5 +1,6 @@
 generic/cmake-fix-static-sfp-plugin.patch
 generic/fix-varargs-alpha.patch
+generic/cmake-fix-find-alsa-FTBFS.patch
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch
 debian/disable-ilbc.patch