[SCM] Packaging GTK Balls branch, master, updated. d60997b24db5824353bb5fd5d59e077a3fc08ca8

[Christoph Egger]

The following commit has been merged in the master branch:
commit d60997b24db5824353bb5fd5d59e077a3fc08ca8
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sun Apr 12 12:46:51 2009 +0200

    Get rid of CDBS ( -> dh7)
    Add desktop files
    No longer abuse upstream Makefile to install debian XPM

diff --git a/debian/changelog b/debian/changelog
index 54b0229..ec71ae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ gtkballs (3.1.5-9) unstable; urgency=low
   * Fix spelling error found by lintian -> correct-spelling.diff 
   * Comment patches 
   * All source changes are now in debian/patches again
+  * Switch from CDBS to dh7 minimal
+  * Add desktop file
 
  -- Christoph Egger <debian at christoph-egger.org>  Thu, 09 Apr 2009 22:07:57 +0200
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index d3abc96..5ea52e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: games
 Priority: optional
 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,
+Build-Depends: debhelper (>= 7.0.50), libfreetype6-dev, libglib2.0-dev,
  libgtk2.0-dev (>= 2.0.6), libncurses5-dev, libpango1.0-dev, perl,
- perl-modules, automake1.7, cdbs, quilt
+ perl-modules, automake1.7, 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.8.1
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..9ecda26
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/share/applications
diff --git a/debian/gtkballs.desktop b/debian/gtkballs.desktop
new file mode 100644
index 0000000..26c30ca
--- /dev/null
+++ b/debian/gtkballs.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=GtkBalls
+GenericName=GtkBalls
+Icon=gtkballs_16x16
+Comment=Puzzle game
+Exec=/usr/games/gtkballs
+Terminal=false
+StartupNotify=false
+Type=Application
+Categories=Game;LogicGame;
diff --git a/debian/gtkballs_16x16.xpm b/debian/gtkballs_16x16.xpm
new file mode 100644
index 0000000..4ce5304
--- /dev/null
+++ b/debian/gtkballs_16x16.xpm
@@ -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/patches/series b/debian/patches/series
index 884c5e2..1cb3014 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 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
deleted file mode 100644
index df1c633..0000000
--- a/debian/patches/xpm.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-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 e01de0f..5521171 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,17 @@
 #!/usr/bin/make -f
 
-DEB_CONFIGURE_USER_FLAGS=--localstatedir=/var/games --bindir=\$${prefix}/games
+include /usr/share/quilt/quilt.make
 
-include /usr/share/cdbs/1/rules/debhelper.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
+clean: unpatch
+	dh clean
 
+%:
+	dh $@
+
+override_dh_auto_configure: $(QUILT_STAMPFN)
+	./configure --localstatedir=/var/games --bindir=/usr/games --prefix=/usr --datadir=/usr/share --mandir=/usr/share/man
+
+override_dh_auto_install:
+	dh_auto_install
+	/usr/bin/install -c -m 644 debian/*.xpm  $(CURDIR)/debian/gtkballs/usr/share/gtkballs
+	/usr/bin/install -c -m 644 debian/*.desktop $(CURDIR)/debian/gtkballs/usr/share/applications

-- 
Packaging GTK Balls