Merge lp:~florian-brandes/ubuntu/oneiric/monster-masher/fix-for-766042 into lp:ubuntu/oneiric/monster-masher

[Florian Brandes]

Adding esound to PKG_CHECK_MODULES in configure.ac to fix FTBFS in ubuntu 11.10. The patch is now in dquilt patch format.

[Chase Douglas (chasedouglas)]

There's an unnecessary addition of trailing whitespace in debian/rules, but other than that this looks good!

review: Approve

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-07-09 16:09:30 +0000
+++ .pc/applied-patches	2011-09-04 18:06:24 +0000
@@ -1,1 +1,2 @@
 desktop_lintian.patch
+add-esound-as-dependency.patch

=== modified file 'configure.ac'
--- configure.ac	2010-04-22 15:18:12 +0000
+++ configure.ac	2011-09-04 18:06:24 +0000
@@ -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 file 'debian/changelog'
--- debian/changelog	2011-07-09 16:09:30 +0000
+++ debian/changelog	2011-09-04 18:06:24 +0000
@@ -1,3 +1,9 @@
+monster-masher (1.8.1-3ubuntu1) oneiric; urgency=low
+
+  * Adding esound to PKG_CHECK_MODULES in configure.ac to fix FTBFS in ubuntu 11.10 (LP: #766042)
+
+ -- Florian Brandes <[e-mail]>  Sun, 04 Sep 2011 19:27:38 +0200
+
 monster-masher (1.8.1-3) unstable; urgency=low
 
   * Adopt package; change maintainer field in debian/control to:

=== modified file 'debian/control'
--- debian/control	2011-07-09 16:09:30 +0000
+++ debian/control	2011-09-04 18:06:24 +0000
@@ -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/

=== added file 'debian/patches/add-esound-as-dependency.patch'
--- debian/patches/add-esound-as-dependency.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add-esound-as-dependency.patch	2011-09-04 18:06:24 +0000
@@ -0,0 +1,18 @@
+Description: Added "esound >= 0.2" as a dependency in configure.ac
+Forwarded: not yet
+Origin: https://bugs.launchpad.net/ubuntu/+source/monster-masher/+bug/766042
+
+Author: [e-mail]
+
+--- 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 file 'debian/patches/series'
--- debian/patches/series	2011-07-09 16:09:30 +0000
+++ debian/patches/series	2011-09-04 18:06:24 +0000
@@ -1,1 +1,2 @@
 desktop_lintian.patch
+add-esound-as-dependency.patch

=== modified file 'debian/rules'
--- debian/rules	2011-07-09 16:09:30 +0000
+++ debian/rules	2011-09-04 18:06:24 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-export LDFLAGS=-Wl,-z,defs,-lesd,--as-needed
+export LDFLAGS=-Wl,-z,defs,-lesd,--as-needed 
 
 %:
-	dh $@ --with autotools_dev
+	dh $@ --with autotools_dev --with autoreconf
 
 override_dh_clean:
 	dh_clean po/.intltool-merge-cache debian/monster-masher.6 \