[Pkg-voip-commits] r6236 - in /mumble/trunk/debian: README.source changelog control patches/ patches/00list patches/01-ftbfs_arm_qreal.dpatch rules

[the-me-guest at alioth.debian.org]

Author: the-me-guest
Date: Fri Oct  3 16:48:41 2008
New Revision: 6236

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6236
Log:
* Added 01-ftbfs_arm_qreal.dpatch. This patch fixes a FTBFS on arm{el} where
  qreal is not double.
  - Include dpatch.
  - Added README.source.

Added:
    mumble/trunk/debian/README.source
    mumble/trunk/debian/patches/
    mumble/trunk/debian/patches/00list
    mumble/trunk/debian/patches/01-ftbfs_arm_qreal.dpatch
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/rules

Added: mumble/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/README.source?rev=6236&op=file
==============================================================================
--- mumble/trunk/debian/README.source (added)
+++ mumble/trunk/debian/README.source Fri Oct  3 16:48:41 2008
@@ -1,0 +1,7 @@
+If you plan to apply all patches which are included in the Debian package just
+type "debian/rules patch".
+This will apply all patches listed in "debian/patches/00list".
+
+To revert all patches again just type "debian/rules unpatch".
+
+Note that you need to install dpatch for both commands.

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=6236&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Fri Oct  3 16:48:41 2008
@@ -1,3 +1,12 @@
+mumble (1.1.6-3) UNRELEASED; urgency=low
+
+  * Added 01-ftbfs_arm_qreal.dpatch. This patch fixes a FTBFS on arm{el} where
+    qreal is not double.
+    - Include dpatch.
+    - Added README.source.
+
+ -- Patrick Matthäi <patrick.matthaei at web.de>  Fri,  3 Oct 2008 18:45:33 +0200
+
 mumble (1.1.6-2) unstable; urgency=low
 
   * Added DEFINES+=HAVE_LIMITS_H DEFINES+=HAVE_ENDIAN_H to debian/rules. Now

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=6236&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Fri Oct  3 16:48:41 2008
@@ -4,7 +4,7 @@
 Homepage: http://mumble.sourceforge.net/
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Patrick Matthäi <patrick.matthaei at web.de>, Thorvald Natvig <slicer at users.sourceforge.net>
-Build-Depends: debhelper (>= 5.0.51~), po-debconf, libspeechd-dev, libasound2-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev , ice33-translators | ice32-translators | ice-translators
+Build-Depends: debhelper (>= 5.0.51~), dpatch, po-debconf, libspeechd-dev, libasound2-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev , ice33-translators | ice32-translators | ice-translators
 Standards-Version: 3.8.0
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble/trunk/

Added: mumble/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/00list?rev=6236&op=file
==============================================================================
--- mumble/trunk/debian/patches/00list (added)
+++ mumble/trunk/debian/patches/00list Fri Oct  3 16:48:41 2008
@@ -1,0 +1,1 @@
+01-ftbfs_arm_qreal.dpatch

Added: mumble/trunk/debian/patches/01-ftbfs_arm_qreal.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/01-ftbfs_arm_qreal.dpatch?rev=6236&op=file
==============================================================================
--- mumble/trunk/debian/patches/01-ftbfs_arm_qreal.dpatch (added)
+++ mumble/trunk/debian/patches/01-ftbfs_arm_qreal.dpatch Fri Oct  3 16:48:41 2008
@@ -1,0 +1,19 @@
+## 01-ftbfs_arm_qreal.dpatch by Thorvald Natvig <slicer at users.sourceforge.net>
+##
+## DP: Fixes FTBFS on arm{el}, where qreal is not double.
+##     Cherry pick up from upstream subversion r1323.
+
+ at DPATCH@
+
+diff -Naur mumble-1.1.6.orig/src/mumble/AudioStats.cpp mumble-1.1.6/src/mumble/AudioStats.cpp
+--- mumble-1.1.6.orig/src/mumble/AudioStats.cpp	2008-10-03 18:34:16.000000000 +0200
++++ mumble-1.1.6/src/mumble/AudioStats.cpp	2008-10-03 18:35:02.000000000 +0200
+@@ -250,7 +250,7 @@
+ 		xp = i * sx;
+ 		yp = sqrtf(sqrtf(static_cast<float>(noise[i]))) - 1.0f;
+ 		yp = yp * fftmul;
+-		yp = qMin(yp * 3000.0f, 1.0);
++		yp = qMin<qreal>(yp * 3000.0f, 1.0f);
+ 		yp = (1 - yp) * sy;
+ 		poly << QPointF(xp, yp);
+ 	}

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=6236&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Fri Oct  3 16:48:41 2008
@@ -5,8 +5,10 @@
 
 export DH_OPTIONS
 
+include /usr/share/dpatch/dpatch.make
+
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
 	dh_testdir
 	qmake-qt4 main.pro DEFINES+=NO_UPDATE_CHECK CONFIG+=release CONFIG+=no-bundled-speex \
 	DEFINES+=PLUGIN_PATH=/usr/lib/mumble DEFINES+=HAVE_LIMITS_H DEFINES+=HAVE_ENDIAN_H
@@ -20,7 +22,7 @@
 	$(MAKE) release
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp configure-stamp