r10573 - in packages/trunk/gnome-breakout/debian: . patches source

Vincent Legout vlegout-guest at alioth.debian.org
Fri Dec 4 09:23:31 UTC 2009 

Author: vlegout-guest
Date: 2009-12-04 09:23:31 +0000 (Fri, 04 Dec 2009)
New Revision: 10573

Added:
   packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.patch
   packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.patch
   packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.patch
   packages/trunk/gnome-breakout/debian/patches/04_po_config.patch
   packages/trunk/gnome-breakout/debian/patches/05_fix_ftbfs_binutils_gold.patch
   packages/trunk/gnome-breakout/debian/patches/06_fix_pixmaps_makefile.patch
   packages/trunk/gnome-breakout/debian/patches/series
   packages/trunk/gnome-breakout/debian/source/
   packages/trunk/gnome-breakout/debian/source/format
Removed:
   packages/trunk/gnome-breakout/debian/patches/00list
   packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.dpatch
   packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.dpatch
   packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.dpatch
   packages/trunk/gnome-breakout/debian/patches/04_po_config.dpatch
Modified:
   packages/trunk/gnome-breakout/debian/changelog
   packages/trunk/gnome-breakout/debian/control
   packages/trunk/gnome-breakout/debian/rules
Log:
Switch to the new source package formats 3.0:
  - Remove patching/unpatching code in debian/rules
  - Switch to quilt
05_fix_ftbfs_binutils_gold.patch: Fix FTBFS with binutils-gold
06_fix_pixmaps_makefile.patch: Remove duplicates files in Makefile.am


Modified: packages/trunk/gnome-breakout/debian/changelog
===================================================================
--- packages/trunk/gnome-breakout/debian/changelog	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/changelog	2009-12-04 09:23:31 UTC (rev 10573)
@@ -10,6 +10,12 @@
   [ Vincent Legout ]
   * Add ${misc:Depends}
   * Fix copyright notice
+  * Switch to the new source package formats 3.0:
+    - Remove patching/unpatching code in debian/rules
+    - Switch to quilt
+  * 05_fix_ftbfs_binutils_gold.patch: Fix FTBFS with binutils-gold
+    (Closes: #554647)
+  * 06_fix_pixmaps_makefile.patch: Remove duplicates files in Makefile.am
 
  -- Vincent Legout <vincent at legout.info>  Wed, 02 Dec 2009 23:54:43 +0800
 

Modified: packages/trunk/gnome-breakout/debian/control
===================================================================
--- packages/trunk/gnome-breakout/debian/control	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/control	2009-12-04 09:23:31 UTC (rev 10573)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bddebian at comcast.net>
-Build-Depends: debhelper (>= 5), libgnomeui-dev, autotools-dev, dpatch, libglib2.0-dev, autoconf, automake1.9
+Build-Depends: debhelper (>= 5), libgnomeui-dev, autotools-dev, quilt, libglib2.0-dev, autoconf, automake1.9
 Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/gnome-breakout/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/gnome-breakout/?op=log

Deleted: packages/trunk/gnome-breakout/debian/patches/00list
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/00list	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/patches/00list	2009-12-04 09:23:31 UTC (rev 10573)
@@ -1,5 +0,0 @@
-01_makefile_fixes.dpatch
-02_fixup_desktop.dpatch
-03_configure_fixes.dpatch
-04_po_config.dpatch
-

Deleted: packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.dpatch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.dpatch	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.dpatch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_makefile_fixes.dpatch by  <bdefreese at bdubuntu3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-breakout-0.5.3~/src/Makefile.am gnome-breakout-0.5.3/src/Makefile.am
---- gnome-breakout-0.5.3~/src/Makefile.am	2004-05-16 17:54:35.000000000 -0400
-+++ gnome-breakout-0.5.3/src/Makefile.am	2007-10-17 22:50:06.000000000 -0400
-@@ -3,12 +3,7 @@
- 	 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- 	 -DG_LOG_DOMAIN=\"gnome-breakout\" \
- 	 -DPIXMAPDIR=\"$(datadir)/gnome-breakout/pixmaps\" \
--	 -DLEVELDIR=\"$(datadir)/gnome-breakout/levels\" \
--	 -DGNOME_DISABLE_DEPRECATED \
--	 -DGTK_DISABLE_DEPRECATED \
--	 -DGDK_PIXBUF_DISABLE_DEPRECATED \
--	 -DG_DISABLE_DEPRECATED \
--         -Werror
-+	 -DLEVELDIR=\"$(datadir)/gnome-breakout/levels\"
- 
- bin_PROGRAMS = gnome-breakout
- 

Added: packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/01_makefile_fixes.patch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,21 @@
+# Description: Remove -Werror and G*_DISABLE_DEPRECATED
+# Author: Barry deFreese <bddebian at comcast.net>
+
+Index: gnome-breakout-0.5.3/src/Makefile.am
+===================================================================
+--- gnome-breakout-0.5.3.orig/src/Makefile.am	2009-12-04 10:05:03.000000000 +0800
++++ gnome-breakout-0.5.3/src/Makefile.am	2009-12-04 10:05:19.000000000 +0800
+@@ -3,12 +3,7 @@
+ 	 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ 	 -DG_LOG_DOMAIN=\"gnome-breakout\" \
+ 	 -DPIXMAPDIR=\"$(datadir)/gnome-breakout/pixmaps\" \
+-	 -DLEVELDIR=\"$(datadir)/gnome-breakout/levels\" \
+-	 -DGNOME_DISABLE_DEPRECATED \
+-	 -DGTK_DISABLE_DEPRECATED \
+-	 -DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	 -DG_DISABLE_DEPRECATED \
+-         -Werror
++	 -DLEVELDIR=\"$(datadir)/gnome-breakout/levels\"
+ 
+ bin_PROGRAMS = gnome-breakout
+ 

Deleted: packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.dpatch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.dpatch	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.dpatch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fixup_desktop.dpatch by  <bdefreese at bdubuntu3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-breakout-0.5.3~/gnome-breakout.desktop gnome-breakout-0.5.3/gnome-breakout.desktop
---- gnome-breakout-0.5.3~/gnome-breakout.desktop	2003-06-23 06:15:30.000000000 -0400
-+++ gnome-breakout-0.5.3/gnome-breakout.desktop	2007-10-17 15:49:25.000000000 -0400
-@@ -2,10 +2,11 @@
- Name=GNOME Breakout
- Name[tr]=Gnome Breakout
- Name[de]=GNOME Breakout
--Comment=The classic arcade game Breakout for GNOME
-+Comment=Play a clone of the classic arcade game Breakout for GNOME
- Comment[tr]=Breakout klasiðinin Gnome teþkili
- Comment[de]=Das klassische Arcade Spiel Breakout für GNOME
- Exec=gnome-breakout
- Icon=gnome-breakout.png
--Terminal=0
--Type=Game
-+Terminal=false
-+Type=Application
-+Categories=Game;ArcadeGame;

Added: packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/02_fixup_desktop.patch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,22 @@
+# Description: Fix gnome-breakout.desktop file
+# Author: Barry deFreese <bddebian at comcast.net>
+
+Index: gnome-breakout-0.5.3/gnome-breakout.desktop
+===================================================================
+--- gnome-breakout-0.5.3.orig/gnome-breakout.desktop	2009-12-04 10:05:40.000000000 +0800
++++ gnome-breakout-0.5.3/gnome-breakout.desktop	2009-12-04 10:06:17.000000000 +0800
+@@ -2,10 +2,11 @@
+ Name=GNOME Breakout
+ Name[tr]=Gnome Breakout
+ Name[de]=GNOME Breakout
+-Comment=The classic arcade game Breakout for GNOME
++Comment=Play a clone of the classic arcade game Breakout for GNOME
+ Comment[tr]=Breakout klasiðinin Gnome teþkili
+ Comment[de]=Das klassische Arcade Spiel Breakout für GNOME
+ Exec=gnome-breakout
+ Icon=gnome-breakout.png
+-Terminal=0
+-Type=Game
++Terminal=false
++Type=Application
++Categories=Game;ArcadeGame;

Deleted: packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.dpatch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.dpatch	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.dpatch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_configure_fixes.dpatch by  <bdefreese at bdubuntu3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-breakout-0.5.3~/configure.in gnome-breakout-0.5.3/configure.in
---- gnome-breakout-0.5.3~/configure.in	2004-05-15 23:57:13.000000000 -0400
-+++ gnome-breakout-0.5.3/configure.in	2007-10-17 23:08:42.000000000 -0400
-@@ -17,8 +17,6 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- 
--GNOME_COMPILE_WARNINGS(maximum)
--
- ALL_LINGUAS="ru tr de sv"
- AM_GLIB_GNU_GETTEXT
- AC_SUBST(GETTEXT_PACKAGE)

Added: packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/03_configure_fixes.patch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,16 @@
+# Description: Remove deprecated GNOME_COMPILER_WARNINGS(maximum)
+# Author: Barry deFreese <bddebian at comcast.net>
+
+Index: gnome-breakout-0.5.3/configure.in
+===================================================================
+--- gnome-breakout-0.5.3.orig/configure.in	2009-12-04 10:06:37.000000000 +0800
++++ gnome-breakout-0.5.3/configure.in	2009-12-04 10:06:42.000000000 +0800
+@@ -17,8 +17,6 @@
+ AC_ISC_POSIX
+ AC_HEADER_STDC
+ 
+-GNOME_COMPILE_WARNINGS(maximum)
+-
+ ALL_LINGUAS="ru tr de sv"
+ AM_GLIB_GNU_GETTEXT
+ AC_SUBST(GETTEXT_PACKAGE)

Deleted: packages/trunk/gnome-breakout/debian/patches/04_po_config.dpatch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/04_po_config.dpatch	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/patches/04_po_config.dpatch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_po_config.dpatch by  <bdefreese at bdubuntu3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gnome-breakout-0.5.3~/configure.in gnome-breakout-0.5.3/configure.in
---- gnome-breakout-0.5.3~/configure.in	2007-10-18 00:21:24.000000000 -0400
-+++ gnome-breakout-0.5.3/configure.in	2007-10-18 00:22:01.000000000 -0400
-@@ -17,6 +17,7 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- 
-+GETTEXT_PACKAGE=gnome-breakout
- ALL_LINGUAS="ru tr de sv"
- AM_GLIB_GNU_GETTEXT
- AC_SUBST(GETTEXT_PACKAGE)
-diff -urNad gnome-breakout-0.5.3~/po/Makefile.in.in gnome-breakout-0.5.3/po/Makefile.in.in
---- gnome-breakout-0.5.3~/po/Makefile.in.in	2004-05-16 17:54:47.000000000 -0400
-+++ gnome-breakout-0.5.3/po/Makefile.in.in	2007-10-18 00:25:33.000000000 -0400
-@@ -27,9 +27,9 @@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
- libdir = @libdir@
--localedir = $(libdir)/locale
--gnulocaledir = $(datadir)/locale
--gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-+localedir = @localedir@
-+gnulocaledir = $(localedir)
-+gettextsrcdir = $(localedir)/glib-2.0/gettext/po
- subdir = po
- 
- INSTALL = @INSTALL@

Added: packages/trunk/gnome-breakout/debian/patches/04_po_config.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/04_po_config.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/04_po_config.patch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,32 @@
+# Description: Makefile.am use localedir instead of datadir
+# Author: Barry deFreese <bddebian at comcast.net>
+
+Index: gnome-breakout-0.5.3/configure.in
+===================================================================
+--- gnome-breakout-0.5.3.orig/configure.in	2009-12-04 10:07:09.000000000 +0800
++++ gnome-breakout-0.5.3/configure.in	2009-12-04 10:07:22.000000000 +0800
+@@ -17,6 +17,7 @@
+ AC_ISC_POSIX
+ AC_HEADER_STDC
+ 
++GETTEXT_PACKAGE=gnome-breakout
+ ALL_LINGUAS="ru tr de sv"
+ AM_GLIB_GNU_GETTEXT
+ AC_SUBST(GETTEXT_PACKAGE)
+Index: gnome-breakout-0.5.3/po/Makefile.in.in
+===================================================================
+--- gnome-breakout-0.5.3.orig/po/Makefile.in.in	2009-12-04 10:07:30.000000000 +0800
++++ gnome-breakout-0.5.3/po/Makefile.in.in	2009-12-04 10:08:15.000000000 +0800
+@@ -27,9 +27,9 @@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
+-gnulocaledir = $(datadir)/locale
+-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
++localedir = @localedir@
++gnulocaledir = $(localedir)
++gettextsrcdir = $(localedir)/glib-2.0/gettext/po
+ subdir = po
+ 
+ INSTALL = @INSTALL@

Added: packages/trunk/gnome-breakout/debian/patches/05_fix_ftbfs_binutils_gold.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/05_fix_ftbfs_binutils_gold.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/05_fix_ftbfs_binutils_gold.patch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,15 @@
+# Desctiption: Fix FTBFS with binutils-gold
+# Author: Vincent Legout <vincent at legout.info>
+# Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554647
+# Last-Update: 2009-12-04
+
+Index: gnome-breakout-0.5.3/src/Makefile.am
+===================================================================
+--- gnome-breakout-0.5.3.orig/src/Makefile.am	2009-12-04 10:12:10.000000000 +0800
++++ gnome-breakout-0.5.3/src/Makefile.am	2009-12-04 10:12:18.000000000 +0800
+@@ -23,4 +23,4 @@
+ 	powerup.c powerup.h \
+ 	util.c util.h
+ 
+-gnome_breakout_LDADD = $(GNOMEUI_LIBS) $(INTLLIBS)
++gnome_breakout_LDADD = $(GNOMEUI_LIBS) $(INTLLIBS) -lX11

Added: packages/trunk/gnome-breakout/debian/patches/06_fix_pixmaps_makefile.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/06_fix_pixmaps_makefile.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/06_fix_pixmaps_makefile.patch	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,29 @@
+# Desctiption: Remove duplicates files in pixmaps/Makefile.am
+# Author: Vincent Legout <vincent at legout.info>
+# Last-Update: 2009-12-04
+
+Index: gnome-breakout-0.5.3/pixmaps/Makefile.am
+===================================================================
+--- gnome-breakout-0.5.3.orig/pixmaps/Makefile.am	2009-12-04 10:19:33.000000000 +0800
++++ gnome-breakout-0.5.3/pixmaps/Makefile.am	2009-12-04 10:21:36.000000000 +0800
+@@ -48,11 +48,9 @@
+ 	block.strong.1.die.3.png block.strong.1.die.4.png \
+ 	block.strong.1.die.5.png block.strong.1.die.6.png \
+ 	block.strong.3.die.0.png block.strong.2.die.0.png \
+-	block.strong.2.die.0.png \
+ 	block.strong.2.die.1.png block.strong.2.die.2.png \
+ 	block.strong.2.die.3.png block.strong.2.die.4.png \
+ 	block.strong.2.die.5.png block.strong.2.die.6.png \
+-	block.strong.3.die.0.png \
+ 	block.strong.3.die.1.png block.strong.3.die.2.png \
+ 	block.strong.3.die.3.png block.strong.3.die.4.png \
+ 	block.strong.3.die.5.png block.strong.3.die.6.png \
+@@ -62,8 +60,6 @@
+ 	block.explode.die.5.png block.explode.die.6.png \
+ 	block.explode.die.7.png \
+ 	bat.laser.0.png laser.0.png powerup.laser.0.png \
+-	bat.laser.0.png laser.0.png powerup.laser.0.png \
+-	bat.laser.0.png laser.0.png powerup.laser.0.png \
+ 	powerup.newlife.0.png powerup.newball.0.png \
+ 	powerup.nextlevel.0.png powerup.slow.0.png \
+ 	powerup.widebat.0.png bat.wide.0.png

Added: packages/trunk/gnome-breakout/debian/patches/series
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/series	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/series	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1,6 @@
+01_makefile_fixes.patch
+02_fixup_desktop.patch
+03_configure_fixes.patch
+04_po_config.patch
+05_fix_ftbfs_binutils_gold.patch
+06_fix_pixmaps_makefile.patch

Modified: packages/trunk/gnome-breakout/debian/rules
===================================================================
--- packages/trunk/gnome-breakout/debian/rules	2009-12-04 01:19:50 UTC (rev 10572)
+++ packages/trunk/gnome-breakout/debian/rules	2009-12-04 09:23:31 UTC (rev 10573)
@@ -35,7 +35,7 @@
 
 	touch configure-stamp
 
-build: patch configure-stamp build-stamp
+build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
@@ -43,14 +43,7 @@
 
 	touch build-stamp
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-
-	touch patch-stamp
-
-clean: clean1 unpatch
-clean1:
+clean:
 	dh_testdir
 	dh_testroot
 
@@ -60,11 +53,6 @@
 
 	dh_clean
 
-unpatch:
-	dpatch deapply-all -v
-	rm -rf patch-stamp
-	rm -rf debian/patched
-
 install: build
 	dh_testdir
 	dh_testroot
@@ -110,5 +98,5 @@
 	dh_md5sums -
 	dh_builddeb -a
 
-binary: patch-stamp binary-indep binary-arch
-.PHONY: patch build clean binary-indep binary-arch binary install configure
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

Added: packages/trunk/gnome-breakout/debian/source/format
===================================================================
--- packages/trunk/gnome-breakout/debian/source/format	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/source/format	2009-12-04 09:23:31 UTC (rev 10573)
@@ -0,0 +1 @@
+3.0 (quilt)

More information about the Pkg-games-commits mailing list