[SCM] Packaging GTK Balls branch, master, updated. 93bdfba700c0d7cb0b817954be202a7f76284f40

Thu Apr 9 20:09:12 UTC 2009

The following commit has been merged in the master branch:
commit 93bdfba700c0d7cb0b817954be202a7f76284f40
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Thu Apr 9 22:09:03 2009 +0200

    The great cleanup!

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..37ff50b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,6 @@
+Task: apply debian patches
+Tools: quilt
+Command: quilt push -a
+Description: Please read /usr/share/doc/quilt/README.source how to use
+  quilt for managing Debian patches
+
diff --git a/debian/changelog b/debian/changelog
index b5753c3..54b0229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,17 @@ gtkballs (3.1.5-9) unstable; urgency=low
   * Add VCS-* Fields
   * Add proper Homepage: field instead of pseudo-one
   * Wrap Build-Depends
-
- -- Christoph Egger <debian at christoph-egger.org>  Tue, 20 Jan 2009 18:17:59 +0100
+  * Add ${misc:Depends}
+  * Bump standards Version
+    * Add README.source 
+  * Bump debhelper compat to 5
+  * Switch to quilt patch system
+  * Override lintian warning about big /usr/share as .deb is only 1.1MiB 
+  * Fix spelling error found by lintian -> correct-spelling.diff 
+  * Comment patches 
+  * All source changes are now in debian/patches again
+
+ -- Christoph Egger <debian at christoph-egger.org>  Thu, 09 Apr 2009 22:07:57 +0200
 
 gtkballs (3.1.5-8) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 5b3fd9d..d3abc96 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,15 @@ Uploaders: Christoph Egger <debian at christoph-egger.org>
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Build-Depends: debhelper (>> 5), libfreetype6-dev, libglib2.0-dev,
  libgtk2.0-dev (>= 2.0.6), libncurses5-dev, libpango1.0-dev, perl,
- perl-modules, automake1.7, cdbs
+ perl-modules, automake1.7, cdbs, quilt
 Vcs-Git: git://git.debian.org/git/pkg-games/gtkballs.git/
 Vcs-Browser: http://git.debian.org/?p=pkg-games/gtkballs.git
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 Homepage: http://gtkballs.antex.ru/
 
 Package: gtkballs
 Architecture: any
-Depends: ${shlibs:Depends} 
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A simple logic game  
  The goal of this game is to make the highest score by matching a number of
  balls of the same color in a horizontal,  vertical or diagonal line. 
diff --git a/debian/copyright b/debian/copyright
index c43ec25..376ba6c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,4 +23,4 @@ Copyright:
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the full text of the GPL can be found in
-/usr/share/common-licenses/GPL
+/usr/share/common-licenses/GPL-*
diff --git a/debian/gtkballs.lintian-overrides b/debian/gtkballs.lintian-overrides
new file mode 100644
index 0000000..4192e1f
--- /dev/null
+++ b/debian/gtkballs.lintian-overrides
@@ -0,0 +1 @@
+gtkballs binary: arch-dep-package-has-big-usr-share
diff --git a/debian/patches/01-no-copy-copying.diff b/debian/patches/01-no-copy-copying.diff
index aa56c24..e24058e 100644
--- a/debian/patches/01-no-copy-copying.diff
+++ b/debian/patches/01-no-copy-copying.diff
@@ -1,5 +1,9 @@
---- Makefile.in.orig	2005-04-16 18:45:13.022147208 +0000
-+++ Makefile.in	2005-04-16 18:45:50.275483840 +0000
+Patch inherited from previous maintainer
+
+Prevents installation of COPYRIGHT file
+
+--- a/Makefile.in.orig	2005-04-16 18:45:13.022147208 +0000
++++ b/Makefile.in	2005-04-16 18:45:50.275483840 +0000
 @@ -158,7 +158,7 @@
  	installdirs-recursive install-recursive uninstall-recursive \
  	check-recursive installcheck-recursive
diff --git a/debian/patches/02-de-po.diff b/debian/patches/02-de-po.diff
index a742956..d435b78 100644
--- a/debian/patches/02-de-po.diff
+++ b/debian/patches/02-de-po.diff
@@ -1,5 +1,10 @@
---- po/de.po	2005-06-11 16:42:50.000000000 +0200
-+++ po/de.po	2005-06-11 17:58:29.000000000 +0200
+Patch inherited from previous maintainer
+
+Fixes an spelling error in german translation
+Index: gtkballs/po/de.po
+===================================================================
+--- gtkballs.orig/po/de.po	2009-04-09 21:27:59.000000000 +0200
++++ gtkballs/po/de.po	2009-04-09 21:28:21.000000000 +0200
 @@ -521,7 +521,7 @@
  #~ msgstr "Abbruch"
  
diff --git a/debian/patches/03-sv-po.diff b/debian/patches/03-sv-po.diff
index 9b57932..616328e 100644
--- a/debian/patches/03-sv-po.diff
+++ b/debian/patches/03-sv-po.diff
@@ -1,5 +1,8 @@
---- none	2006-06-03 21:03:14.000000000 +0100
-+++ po/sv.po	2006-06-03 21:01:23.000000000 +0100
+Patch inherited from previous maintainer
+
+Adding an Swedish translation
+--- a/none	2006-06-03 21:03:14.000000000 +0100
++++ b/po/sv.po	2006-06-03 21:01:23.000000000 +0100
 @@ -0,0 +1,464 @@
 +# Swedish translation of gtkballs.
 +# Copyright (C) 2006 Free Software Foundation, Inc.
@@ -189,7 +192,7 @@
 +#: src/mainwin.c:75
 +msgid ""
 +"Score writer process died unexpectedly. No scores will be writen!\n"
-+"Save your game and restart programm.\n"
++"Save your game and restart program.\n"
 +msgstr ""
 +"Processen som skriver poÃ¤ngen avslutades ovÃ¤ntat. Inga poÃ¤ng kommer att skrivas!\n"
 +"Spara ditt spel och starta om programmet.\n"
diff --git a/debian/patches/correct-spelling.diff b/debian/patches/correct-spelling.diff
new file mode 100644
index 0000000..3bbcadd
--- /dev/null
+++ b/debian/patches/correct-spelling.diff
@@ -0,0 +1,68 @@
+Author: Christoph Egger <debian at christoph-egger.org>
+
+Fix an spelling issue found by lintian
+Index: gtkballs/po/fr.po
+===================================================================
+--- gtkballs.orig/po/fr.po	2009-04-09 21:32:35.000000000 +0200
++++ gtkballs/po/fr.po	2009-04-09 21:32:38.000000000 +0200
+@@ -189,7 +189,7 @@
+ #: src/mainwin.c:75
+ msgid ""
+ "Score writer process died unexpectedly. No scores will be writen!\n"
+-"Save your game and restart programm.\n"
++"Save your game and restart program.\n"
+ msgstr ""
+ 
+ #: src/mainwin.c:77
+Index: gtkballs/po/pl.po
+===================================================================
+--- gtkballs.orig/po/pl.po	2009-04-09 21:32:35.000000000 +0200
++++ gtkballs/po/pl.po	2009-04-09 21:32:38.000000000 +0200
+@@ -188,7 +188,7 @@
+ #: src/mainwin.c:75
+ msgid ""
+ "Score writer process died unexpectedly. No scores will be writen!\n"
+-"Save your game and restart programm.\n"
++"Save your game and restart program.\n"
+ msgstr ""
+ 
+ #: src/mainwin.c:77
+Index: gtkballs/po/ru.po
+===================================================================
+--- gtkballs.orig/po/ru.po	2009-04-09 21:32:35.000000000 +0200
++++ gtkballs/po/ru.po	2009-04-09 21:32:38.000000000 +0200
+@@ -184,7 +184,7 @@
+ #: src/mainwin.c:75
+ msgid ""
+ "Score writer process died unexpectedly. No scores will be writen!\n"
+-"Save your game and restart programm.\n"
++"Save your game and restart program.\n"
+ msgstr ""
+ "ðÒÏÃÅÓÓ ÚÁÐÉÓÙ×ÁÀÝÉÊ ÏÞËÉ ÎÅÏÖÉÄÁÎÎÏ ÕÍÅÒ. ïÞËÉ ÎÅ ÂÕÄÕÔ ÓÏÈÒÁÎÅÎÙ!\n"
+ "óÏÈÒÁÎÉÔÅ ×ÁÛÕ ÉÇÒÕ É ÐÅÒÅÚÁÐÕÓÔÉÔÅ ÐÒÏÇÒÁÍÍÕ.\n"
+Index: gtkballs/po/de.po
+===================================================================
+--- gtkballs.orig/po/de.po	2009-04-09 21:33:23.000000000 +0200
++++ gtkballs/po/de.po	2009-04-09 21:33:39.000000000 +0200
+@@ -190,7 +190,7 @@
+ #: src/mainwin.c:75
+ msgid ""
+ "Score writer process died unexpectedly. No scores will be writen!\n"
+-"Save your game and restart programm.\n"
++"Save your game and restart program.\n"
+ msgstr ""
+ "Der Prozess zum Speichern der Bestenliste ist abgestÃ¼rzt. Die Bestenliste "
+ "wird nicht gespeichert.\n"
+diff --git a/src/mainwin.c b/src/mainwin.c
+index 4ffe7ae..5df2844 100644
+--- a/src/mainwin.c
++++ b/src/mainwin.c
+@@ -73,7 +73,7 @@ gboolean _countdown_timer(gpointer data) {
+ 
+         if(child_writer_dead_handler()) {
+         	ut_simple_message_box_with_title(_("Score writer process died unexpectedly. No scores will be writen!\n" \
+-						   "Save your game and restart programm.\n"),
++						   "Save your game and restart program.\n"),
+ 				                 _("Who Killed Bambi?"));
+         }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..884c5e2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01-no-copy-copying.diff
+02-de-po.diff
+03-sv-po.diff
+correct-spelling.diff
+xpm.diff
diff --git a/debian/patches/xpm.diff b/debian/patches/xpm.diff
new file mode 100644
index 0000000..df1c633
--- /dev/null
+++ b/debian/patches/xpm.diff
@@ -0,0 +1,53 @@
+Author: Christoph Egger <debian at christoph-egger.org>
+
+Add an .xpm file for debian/menu and freedesktop .desktop files
+Index: gtkballs/gtkballs-data/Makefile.in
+===================================================================
+--- gtkballs.orig/gtkballs-data/Makefile.in	2009-04-09 22:01:24.000000000 +0200
++++ gtkballs/gtkballs-data/Makefile.in	2009-04-09 22:02:08.000000000 +0200
+@@ -134,7 +134,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-EXTRA_DIST = gtkballs-logo.png gtkballs_16x16.png themes
++EXTRA_DIST = gtkballs-logo.png gtkballs_16x16.xpm themes
+ subdir = gtkballs-data
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -275,6 +275,7 @@
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gtkballs
+ 	$(INSTALL_DATA) *.png $(DESTDIR)$(datadir)/gtkballs
++	$(INSTALL_DATA) *.xpm $(DESTDIR)$(datadir)/gtkballs
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gtkballs/themes
+ 	for d in themes/*; do \
+ 	    $(mkinstalldirs) $(DESTDIR)$(datadir)/gtkballs/$$d; \
+Index: gtkballs/gtkballs-data/gtkballs_16x16.xpm
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gtkballs/gtkballs-data/gtkballs_16x16.xpm	2009-04-09 22:02:58.000000000 +0200
+@@ -0,0 +1,24 @@
++/* XPM */
++static char * gtkballs_16x16_xpm[] = {
++"16 16 4 1",
++"      c #000000",
++".     c #FFFFFF",
++"+     c #FF0000",
++"@     c #00FF00",
++"                ",
++" ......  ...... ",
++" ..++..  ...... ",
++" .++++.  ...... ",
++" .++++.  ...... ",
++" ..++..  ...... ",
++" ......  ...... ",
++"                ",
++"                ",
++" ......  ...... ",
++" ......  ..@@.. ",
++" ......  .@@@@. ",
++" ......  .@@@@. ",
++" ......  ..@@.. ",
++" ......  ...... ",
++"                "};
++
diff --git a/debian/rules b/debian/rules
index 94fccf3..e01de0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 DEB_CONFIGURE_USER_FLAGS=--localstatedir=/var/games --bindir=\$${prefix}/games
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 

-- 
Packaging GTK Balls

