Merge lp:~jtaylor/ubuntu/oneiric/monkey-bubble/fix-ftbs into lp:ubuntu/oneiric/monkey-bubble

[Julian Taylor]

change to dh-7 and 3.0 (quilt) and fixes an oneiric build failure

[Stefano Rivera (stefanor)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-15 11:31:32 +0000
+++ debian/changelog	2011-07-02 17:31:15 +0000
@@ -1,3 +1,17 @@
+monkey-bubble (0.4.0-0ubuntu8) oneiric; urgency=low
+
+  * wrap-and-sort debian/
+  * change to 3.0 (quilt)
+    - diffs from ubuntu5 and 6 quiltified
+  * change to dh-7 with dh-autoreconf
+    - change to compat 7
+    - drop cdbs build depend
+    - add dh-autoreconf, libtool, intltool build depends
+  * add patch to fix build with ld --as-needed (LP: #771130)
+  * bump standard version to 3.9.2
+
+ -- Julian Taylor <[e-mail]>  Sat, 02 Jul 2011 18:25:45 +0200
+
 monkey-bubble (0.4.0-0ubuntu7) natty; urgency=low
 
   * Build-depend on libesd0-dev to fix FTBFS.
 
=== modified file 'debian/compat'
--- debian/compat	2010-01-15 22:52:41 +0000
+++ debian/compat	2011-07-02 17:31:15 +0000
@@ -1,1 +1,1 @@
-5
+7
 
=== modified file 'debian/control'
--- debian/control	2010-10-15 11:31:32 +0000
+++ debian/control	2011-07-02 17:31:15 +0000
@@ -3,20 +3,32 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Daniel Holbach <[e-mail]>
-Build-Depends: debhelper (>= 5), libgtk2.0-dev (>= 2.10), cdbs, librsvg2-dev,
- libxml2-dev, libgnomeui-dev, libglade2-dev, gconf2, libgstreamer0.10-dev,
- libxml-parser-perl, docbook-to-man, scrollkeeper, gnome-doc-utils, autotools-dev,
- libesd0-dev
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~),
+               dh-autoreconf,
+               docbook-to-man,
+               gconf2,
+               gnome-doc-utils,
+               intltool,
+               libesd0-dev,
+               libglade2-dev,
+               libgnomeui-dev,
+               libgstreamer0.10-dev,
+               libgtk2.0-dev (>= 2.10),
+               librsvg2-dev,
+               libtool,
+               libxml-parser-perl,
+               libxml2-dev,
+               scrollkeeper
+Standards-Version: 3.9.2
 Homepage: http://home.gna.org/monkeybubble/index.html
 
 Package: monkey-bubble
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: game in which you must explode all bubbles
- Monkey Bubble is a game in which you must explode all bubbles in the 
+ Monkey Bubble is a game in which you must explode all bubbles in the
  game area.
  .
- You explode bubbles by putting at least 3 of the same colour in contact. 
- Any bubble that is connected to the top or the sides of the game area by 
+ You explode bubbles by putting at least 3 of the same colour in contact.
+ Any bubble that is connected to the top or the sides of the game area by
  bubbles you just exploded falls too.
 
=== modified file 'debian/copyright'
--- debian/copyright	2005-08-18 17:21:36 +0000
+++ debian/copyright	2011-07-02 17:31:15 +0000
@@ -28,4 +28,3 @@
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
-				  
 
=== added directory 'debian/patches'
=== added file 'debian/patches/debian-changes-0.4.0-0ubuntu5'
--- debian/patches/debian-changes-0.4.0-0ubuntu5	1970-01-01 00:00:00 +0000
+++ debian/patches/debian-changes-0.4.0-0ubuntu5	2011-07-02 17:31:15 +0000
@@ -0,0 +1,59 @@
+Description: Upstream changes introduced in version 0.4.0-0ubuntu5
+ help/*/monkey-bubble.xml - Add role="maintiner" attribute to 
+ <author> node - Fixes FTBFS
+ Add <abstract role="description>" node
+Author: Barry deFreese <[e-mail]>
+--- monkey-bubble-0.4.0.orig/help/fr/monkey-bubble.xml
++++ monkey-bubble-0.4.0/help/fr/monkey-bubble.xml
+@@ -22,7 +22,7 @@
+       <publishername>Projet de documentation GNOME</publishername> 
+     </publisher> 
+     <authorgroup> 
+-      <author> 
++      <author role="maintainer"> 
+ 	<firstname>Thomas</firstname> 
+ 	<surname>Cataldo</surname> 
+ 	<affiliation> 
+@@ -47,6 +47,9 @@
+       <title>Votre avis</title> 
+       <para>Pour signaler un probl&egrave;me ou faire une suggestion concernant l'application Monkey Bubble ou le pr&eacute;sent manuel, proc&eacute;dez comme indiqu&eacute;&agrave; la <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>.</para>
+     </legalnotice> 
++    <abstract role="description">
++      <para>A user manual describing the use of monkey-bubble.</para>
++    </abstract>
+   </articleinfo> 
+ 
+   <indexterm> 
+--- monkey-bubble-0.4.0.orig/help/C/monkey-bubble.xml
++++ monkey-bubble-0.4.0/help/C/monkey-bubble.xml
+@@ -23,7 +23,7 @@
+       <publishername>GNOME Documentation Project</publishername> 
+     </publisher> 
+     <authorgroup> 
+-      <author> 
++      <author role="maintainer"> 
+ 	<firstname>Thomas</firstname> 
+ 	<surname>Cataldo</surname> 
+ 	<affiliation> 
+@@ -40,6 +40,9 @@
+ 	  <para role="author">
+ 	    Thomas Cataldo
+ 	  </para>
++	  <para role="maintainer">
++	    Thomas Cataldo
++	  </para>
+ 	  <para role="publisher">
+ 	    GNOME Documentation Project 
+ 	  </para>
+@@ -54,7 +57,10 @@
+       <para> To report a bug or make a suggestion regarding the &app; application or this
+ 	manual, follow the directions in the 
+ 	<ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
+-    </legalnotice> 
++    </legalnotice>
++		<abstract role="description">
++			<para>A user manual describing the use of monkey-bubble.</para> 
++		</abstract>
+   </articleinfo> 
+ 
+   <indexterm> 
 
=== added file 'debian/patches/debian-changes-0.4.0-0ubuntu6'
--- debian/patches/debian-changes-0.4.0-0ubuntu6	1970-01-01 00:00:00 +0000
+++ debian/patches/debian-changes-0.4.0-0ubuntu6	2011-07-02 17:31:15 +0000
@@ -0,0 +1,15 @@
+Description: Upstream changes introduced in version 0.4.0-0ubuntu6
+ Changed the code to be compilable (LP: #303464)
+Author: Sven Herzberg <[e-mail]>
+--- monkey-bubble-0.4.0.orig/src/ui/ui-main.c
++++ monkey-bubble-0.4.0/src/ui/ui-main.c
+@@ -668,7 +668,7 @@ static void show_error_dialog (GtkWindow
+                                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                                          GTK_MESSAGE_ERROR,
+                                          GTK_BUTTONS_CLOSE,
+-                                         message);
++                                         "%s", message ? message : "");
+     
+         g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);
+     
+
 
=== added file 'debian/patches/fix-no-copy-dt-needed.patch'
--- debian/patches/fix-no-copy-dt-needed.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-no-copy-dt-needed.patch	2011-07-02 17:31:15 +0000
@@ -0,0 +1,39 @@
+Description: fix build with ld --as-needed
+ the libraries where placed before object files on the compile commandline
+ this leads to the references not being registered as needed and dropped.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/monkey-bubble/+bug/771130
+Author: Julian Taylor <[e-mail]>
+Index: monkey-bubble/src/net/Makefile.am
+===================================================================
+--- monkey-bubble.orig/src/net/Makefile.am	2011-07-02 19:06:24.189604281 +0200
++++ monkey-bubble/src/net/Makefile.am	2011-07-02 19:06:46.849604295 +0200
+@@ -28,10 +28,10 @@
+ monkey_srv_LDFLAGS =
+ 
+ monkey_srv_LDADD = \
+-	$(MONKEY_SRV_LIBS) \
+ 	libmonkeynet.a \
+ 	../monkey/libmonkey.a \
+-	../util/libmonkeyutil.a 
++	../util/libmonkeyutil.a \
++	$(MONKEY_SRV_LIBS)
+ 
+ $(libmonkeynet_a_OBJECTS): $(marshal_sources)
+ 
+Index: monkey-bubble/src/ui/Makefile.am
+===================================================================
+--- monkey-bubble.orig/src/ui/Makefile.am	2011-07-02 19:06:27.259604283 +0200
++++ monkey-bubble/src/ui/Makefile.am	2011-07-02 19:06:35.679604287 +0200
+@@ -40,10 +40,10 @@
+ 
+ 
+ monkey_bubble_LDADD =  \
+-	$(UI_LIBS) \
+ 	../monkey/libmonkey.a \
+ 	../view/libmonkeyview.a \
+ 	../util/libmonkeyutil.a \
+ 	../net/libmonkeynet.a \
+ 	../audio/libmonkeyaudio.a \
+-	../input/libmbinput.a
++	../input/libmbinput.a \
++	$(UI_LIBS)
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-07-02 17:31:15 +0000
@@ -0,0 +1,3 @@
+debian-changes-0.4.0-0ubuntu5
+debian-changes-0.4.0-0ubuntu6
+fix-no-copy-dt-needed.patch
 
=== modified file 'debian/rules'
--- debian/rules	2010-10-15 11:31:32 +0000
+++ debian/rules	2011-07-02 17:31:15 +0000
@@ -1,17 +1,20 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/gnome.mk
-
-DEB_INSTALL_MANPAGES_monkey-bubble := debian/monkey-bubble.1 debian/monkey-srv.1
-
-build/monkey-bubble::
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f debian/monkey-bubble.1
+	rm -f debian/monkey-srv.1
+
+override_dh_auto_build:
+	dh_auto_build
 	/usr/bin/docbook-to-man debian/monkey-bubble.sgml > debian/monkey-bubble.1
 	/usr/bin/docbook-to-man debian/monkey-srv.sgml > debian/monkey-srv.1
 
-binary-post-install/monkey-bubble::
+override_dh_install:
+	dh_install
 	cp debian/monkey-bubble.xpm debian/monkey-bubble/usr/share/pixmaps
 	rm -rf debian/monkey-bubble/usr/share/monkey-bubble/gfx/frozen-bubble/
 	rm -rf debian/monkey-bubble/var/lib/scrollkeeper
@@ -19,6 +22,6 @@
 	mv debian/monkey-bubble/usr/bin/monkey-srv debian/monkey-bubble/usr/games
 	rmdir debian/monkey-bubble/usr/bin
 
-clean::
-	rm -f debian/monkey-bubble.1
-	rm -f debian/monkey-srv.1
+override_dh_installman:
+	dh_installman debian/monkey-bubble.1
+	dh_installman debian/monkey-srv.1
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-07-02 17:31:15 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== modified file 'help/C/monkey-bubble.xml'
--- help/C/monkey-bubble.xml	2007-09-11 00:01:07 +0000
+++ help/C/monkey-bubble.xml	2011-07-02 17:31:15 +0000
@@ -23,7 +23,7 @@
       <publishername>GNOME Documentation Project</publishername> 
     </publisher> 
     <authorgroup> 
-      <author role="maintainer"> 
+      <author> 
 	<firstname>Thomas</firstname> 
 	<surname>Cataldo</surname> 
 	<affiliation> 
@@ -40,9 +40,6 @@
 	  <para role="author">
 	    Thomas Cataldo
 	  </para>
-	  <para role="maintainer">
-	    Thomas Cataldo
-	  </para>
 	  <para role="publisher">
 	    GNOME Documentation Project 
 	  </para>
@@ -57,10 +54,7 @@
       <para> To report a bug or make a suggestion regarding the &app; application or this
 	manual, follow the directions in the 
 	<ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
-    </legalnotice>
-		<abstract role="description">
-			<para>A user manual describing the use of monkey-bubble.</para> 
-		</abstract>
+    </legalnotice> 
   </articleinfo> 
 
   <indexterm> 
 
=== modified file 'help/fr/monkey-bubble.xml'
--- help/fr/monkey-bubble.xml	2007-09-11 00:01:07 +0000
+++ help/fr/monkey-bubble.xml	2011-07-02 17:31:15 +0000
@@ -22,7 +22,7 @@
       <publishername>Projet de documentation GNOME</publishername> 
     </publisher> 
     <authorgroup> 
-      <author role="maintainer"> 
+      <author> 
 	<firstname>Thomas</firstname> 
 	<surname>Cataldo</surname> 
 	<affiliation> 
@@ -47,9 +47,6 @@
       <title>Votre avis</title> 
       <para>Pour signaler un probl&egrave;me ou faire une suggestion concernant l'application Monkey Bubble ou le pr&eacute;sent manuel, proc&eacute;dez comme indiqu&eacute;&agrave; la <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>.</para>
     </legalnotice> 
-    <abstract role="description">
-      <para>A user manual describing the use of monkey-bubble.</para>
-    </abstract>
   </articleinfo> 
 
   <indexterm> 
 
=== modified file 'src/ui/ui-main.c'
--- src/ui/ui-main.c	2010-01-15 22:52:41 +0000
+++ src/ui/ui-main.c	2011-07-02 17:31:15 +0000
@@ -668,7 +668,7 @@
                                          GTK_DIALOG_DESTROY_WITH_PARENT,
                                          GTK_MESSAGE_ERROR,
                                          GTK_BUTTONS_CLOSE,
-                                         "%s", message ? message : "");
+                                         message);
     
         g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), NULL);