r12687 - in packages/trunk/monster-masher/debian: . patches

[Vincent Cheng]

Author: vincentc-guest
Date: 2011-09-25 22:46:03 +0000 (Sun, 25 Sep 2011)
New Revision: 12687

Added:
   packages/trunk/monster-masher/debian/patches/add-esound-as-dependency.patch
Modified:
   packages/trunk/monster-masher/debian/changelog
   packages/trunk/monster-masher/debian/control
   packages/trunk/monster-masher/debian/copyright
   packages/trunk/monster-masher/debian/patches/series
   packages/trunk/monster-masher/debian/rules
Log:
monster-masher: add-esound-as-dependency.patch backported from Ubuntu


Modified: packages/trunk/monster-masher/debian/changelog
===================================================================
--- packages/trunk/monster-masher/debian/changelog	2011-09-25 22:19:37 UTC (rev 12686)
+++ packages/trunk/monster-masher/debian/changelog	2011-09-25 22:46:03 UTC (rev 12687)
@@ -1,3 +1,10 @@
+monster-masher (1.8.1-4) unstable; urgency=low
+
+  * Backport debian/patches/add-esound-as-dependency.patch from Ubuntu;
+    add esound to PKG_CHECK_MODULES in configure.ac to fix FTBFS.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Sun, 25 Sep 2011 15:35:15 -0700
+
 monster-masher (1.8.1-3) unstable; urgency=low
 
   * Adopt package; change maintainer field in debian/control to:

Modified: packages/trunk/monster-masher/debian/control
===================================================================
--- packages/trunk/monster-masher/debian/control	2011-09-25 22:19:37 UTC (rev 12686)
+++ packages/trunk/monster-masher/debian/control	2011-09-25 22:46:03 UTC (rev 12687)
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8), pkg-config, intltool, docbook-to-man,
  imagemagick, libgtkmm-2.4-dev, libgconfmm-2.6-dev,
  libgnomecanvasmm-2.6-dev, libglademm-2.4-dev, libesd0-dev,
- libgnome2-dev
+ libgnome2-dev, dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://people.iola.dk/olau/monster-masher/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/monster-masher/

Modified: packages/trunk/monster-masher/debian/copyright
===================================================================
--- packages/trunk/monster-masher/debian/copyright	2011-09-25 22:19:37 UTC (rev 12686)
+++ packages/trunk/monster-masher/debian/copyright	2011-09-25 22:46:03 UTC (rev 12687)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: monster-masher
 Source: http://people.iola.dk/olau/monster-masher/
 
@@ -12,6 +12,8 @@
            2010 Xavier Oswald <xoswald at debian.org>
            2011 Vincent Cheng <Vincentc1208 at gmail.com>
 License: GPL-2+
+
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or

Added: packages/trunk/monster-masher/debian/patches/add-esound-as-dependency.patch
===================================================================
--- packages/trunk/monster-masher/debian/patches/add-esound-as-dependency.patch	                        (rev 0)
+++ packages/trunk/monster-masher/debian/patches/add-esound-as-dependency.patch	2011-09-25 22:46:03 UTC (rev 12687)
@@ -0,0 +1,18 @@
+Description: Added "esound >= 0.2" as a dependency in configure.ac
+ This is required to fix FTBFS in Ubuntu 11.10.
+Forwarded: not yet
+Author: florian.brandes at gmx.de
+Bug-Ubuntu: https://launchpad.net/bugs/766042
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -18,7 +18,8 @@
+                         gconfmm-2.6 >= 2.6.0 \
+                         gtkmm-2.4 >= 2.6.0 \
+                         libgnomecanvasmm-2.6 >= 2.6.0 \
+-			libglademm-2.4 >= 2.4.0)
++			libglademm-2.4 >= 2.4.0 \
++			esound >= 0.2)
+ AC_SUBST(DEPS_CFLAGS)
+ AC_SUBST(DEPS_LIBS)
+

Modified: packages/trunk/monster-masher/debian/patches/series
===================================================================
--- packages/trunk/monster-masher/debian/patches/series	2011-09-25 22:19:37 UTC (rev 12686)
+++ packages/trunk/monster-masher/debian/patches/series	2011-09-25 22:46:03 UTC (rev 12687)
@@ -1 +1,2 @@
+add-esound-as-dependency.patch
 desktop_lintian.patch

Modified: packages/trunk/monster-masher/debian/rules
===================================================================
--- packages/trunk/monster-masher/debian/rules	2011-09-25 22:19:37 UTC (rev 12686)
+++ packages/trunk/monster-masher/debian/rules	2011-09-25 22:46:03 UTC (rev 12687)
@@ -3,7 +3,7 @@
 export LDFLAGS=-Wl,-z,defs,-lesd,--as-needed
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autoreconf
 
 override_dh_clean:
 	dh_clean po/.intltool-merge-cache debian/monster-masher.6 \