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

[Vincent Cheng]

Author: vincentc-guest
Date: 2012-03-30 00:00:43 +0000 (Fri, 30 Mar 2012)
New Revision: 13440

Added:
   packages/trunk/monster-masher/debian/patches/glib-single-include.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
Log:
monster-masher: Add patch to fix #665581


Modified: packages/trunk/monster-masher/debian/changelog
===================================================================
--- packages/trunk/monster-masher/debian/changelog	2012-03-29 23:50:04 UTC (rev 13439)
+++ packages/trunk/monster-masher/debian/changelog	2012-03-30 00:00:43 UTC (rev 13440)
@@ -1,3 +1,11 @@
+monster-masher (1.8.1-6) unstable; urgency=low
+
+  * Add debian/patches/glib_single_include.patch; fix FTBFS with
+    glib >= 2.32. (Closes: #665581)
+  * Update Standards version from 3.9.2 to 3.9.3, no changes required.
+
+ -- Vincent Cheng <Vincentc1208 at gmail.com>  Thu, 29 Mar 2012 16:39:36 -0700
+
 monster-masher (1.8.1-5) unstable; urgency=low
 
   * Add debian/patches/crash_after_intro.patch; fix segfault when starting

Modified: packages/trunk/monster-masher/debian/control
===================================================================
--- packages/trunk/monster-masher/debian/control	2012-03-29 23:50:04 UTC (rev 13439)
+++ packages/trunk/monster-masher/debian/control	2012-03-30 00:00:43 UTC (rev 13440)
@@ -7,7 +7,7 @@
  imagemagick, libgtkmm-2.4-dev, libgconfmm-2.6-dev,
  libgnomecanvasmm-2.6-dev, libglademm-2.4-dev, libesd0-dev,
  libgnome2-dev, dh-autoreconf
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://people.iola.dk/olau/monster-masher/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/monster-masher/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/monster-masher/

Modified: packages/trunk/monster-masher/debian/copyright
===================================================================
--- packages/trunk/monster-masher/debian/copyright	2012-03-29 23:50:04 UTC (rev 13439)
+++ packages/trunk/monster-masher/debian/copyright	2012-03-30 00:00:43 UTC (rev 13440)
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: monster-masher
 Source: http://people.iola.dk/olau/monster-masher/
 

Added: packages/trunk/monster-masher/debian/patches/glib-single-include.patch
===================================================================
--- packages/trunk/monster-masher/debian/patches/glib-single-include.patch	                        (rev 0)
+++ packages/trunk/monster-masher/debian/patches/glib-single-include.patch	2012-03-30 00:00:43 UTC (rev 13440)
@@ -0,0 +1,19 @@
+Description: Include glib.h instead of individual headers
+ Including invididual glib headers is considered deprecated and will cause a
+ FTBFS with glib >= 2.32; this patch fixes it.
+Author: Vincent Cheng <Vincentc1208 at gmail.com>
+Bug-Debian: http://bugs.debian.org/665581
+
+Index: monster-masher-1.8.1/src/pixbuf-drawing.hpp
+===================================================================
+--- monster-masher-1.8.1.orig/src/pixbuf-drawing.hpp	2007-01-06 08:16:30.000000000 -0800
++++ monster-masher-1.8.1/src/pixbuf-drawing.hpp	2012-03-25 16:16:35.886495565 -0700
+@@ -24,7 +24,7 @@
+ #include <iterator>
+ 
+ #include <gdkmm/pixbuf.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ // scale pixbuf alpha values by scale / 256 (where scale <= 256)
+ void scale_alpha(const Glib::RefPtr<Gdk::Pixbuf> &pixbuf, int scale);

Modified: packages/trunk/monster-masher/debian/patches/series
===================================================================
--- packages/trunk/monster-masher/debian/patches/series	2012-03-29 23:50:04 UTC (rev 13439)
+++ packages/trunk/monster-masher/debian/patches/series	2012-03-30 00:00:43 UTC (rev 13440)
@@ -1,3 +1,4 @@
+glib-single-include.patch
 add-esound-as-dependency.patch
 crash_after_intro.patch
 desktop_lintian.patch