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

[Marco Nenciarini]

Author: mnencia
Date: 2006-12-28 17:38:33 +0100 (Thu, 28 Dec 2006)
New Revision: 2879

Added:
   wengophone/trunk/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/control
   wengophone/trunk/debian/patches/series
Log:
* This commint may solve FTBFS on buildserver.ner buildd
* Merge from etch branch ]2876:2878]


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2006-12-28 16:21:27 UTC (rev 2878)
+++ wengophone/trunk/debian/changelog	2006-12-28 16:38:33 UTC (rev 2879)
@@ -5,6 +5,7 @@
      + cmake-findxml2 (fixed upstream)
      + cmake-fix-gaim4 (fixed upstream)
      + cmake-fix-qtutil (fixed upstream)
+  * Merged changes from unstable package.
 
  -- Marco Nenciarini <mnencia at debian.org>  Thu,  7 Dec 2006 16:54:54 +0100
 
@@ -26,6 +27,13 @@
 
  -- Marco Nenciarini <mnencia at debian.org>  Mon,  6 Nov 2006 12:03:32 +0100
 
+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/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control	2006-12-28 16:21:27 UTC (rev 2878)
+++ wengophone/trunk/debian/control	2006-12-28 16:38:33 UTC (rev 2879)
@@ -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,

Copied: wengophone/trunk/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch (from rev 2878, wengophone/branches/etch/debian/patches/generic/cmake-fix-find-alsa-FTBFS.patch)

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2006-12-28 16:21:27 UTC (rev 2878)
+++ wengophone/trunk/debian/patches/series	2006-12-28 16:38:33 UTC (rev 2879)
@@ -1,4 +1,5 @@
 generic/cmake-fix-static-sfp-plugin.patch
+generic/cmake-fix-find-alsa-FTBFS.patch
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch
 debian/disable-ilbc.patch