[SCM] Packaging for grhino branch, master, updated. debian/0.16.0-4-3-g517b614

Vincent Legout vincent at legout.info
Thu Dec 31 15:39:14 UTC 2009 

The following commit has been merged in the master branch:
commit 517b6145deeb67e6660b9e0fc2642051bb0189e9
Author: Vincent Legout <vincent at legout.info>
Date:   Thu Dec 31 16:14:28 2009 +0100

    Switch to 3.0 (quilt) source format

diff --git a/debian/changelog b/debian/changelog
index b3f4a28..7d30ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ grhino (0.16.0-5) UNRELEASED; urgency=low
 
   * grhino-data conflicts with grhino << 0.16.0-4 (Closes: #561523)
   * Bump Standards Version to 3.8.3
+  * Switch to 3.0 (quilt) source format:
+    - Switch to quilt
+    - Add debian/source/format
+    - Remove patching/unpatching code in debian/rules
 
- -- Vincent Legout <vincent at legout.info>  Wed, 23 Dec 2009 11:04:03 +0100
+ -- Vincent Legout <vincent at legout.info>  Thu, 31 Dec 2009 15:55:11 +0100
 
 grhino (0.16.0-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 86181c0..827554b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Legout <vincent at legout.info>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, autoconf (>= 2.61-3), automake1.9 (>= 1.9.6+nogfdl-3), gettext (>= 0.16.1), scrollkeeper
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libgtk2.0-dev, libgnome2-dev, libgnomeui-dev, imagemagick, autoconf (>= 2.61-3), automake1.9 (>= 1.9.6+nogfdl-3), gettext (>= 0.16.1), scrollkeeper, quilt
 Standards-Version: 3.8.3
 Homepage: http://rhino.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-games/grhino.git
diff --git a/debian/patches/01_dirname_no_version.diff b/debian/patches/01_dirname_no_version.diff
index a669c2e..2788962 100644
--- a/debian/patches/01_dirname_no_version.diff
+++ b/debian/patches/01_dirname_no_version.diff
@@ -1,8 +1,13 @@
---- orig/grhino-0.15.2/Makefile.in	2006-08-10 16:57:38.000000000 +0200
-+++ grhino-0.15.2/Makefile.in	2006-11-24 14:34:44.000000000 +0100
-@@ -45,9 +45,9 @@
- localedir	= @datadir@/locale
- helpdir		= @datadir@/gnome/help/grhino
+# Description: Remove -${VERSION} in directory name
+# Author: Bart Martens <bartm at knars.be>
+
+Index: grhino/Makefile.in
+===================================================================
+--- grhino.orig/Makefile.in	2009-12-31 15:57:35.889135440 +0100
++++ grhino/Makefile.in	2009-12-31 15:57:44.605136960 +0100
+@@ -48,9 +48,9 @@
+ omfdir		= @datadir@/omf/grhino
+ icon_dir	= @datadir@/pixmaps
  
 -pattern_dir	= @datadir@/${PACKAGE}-${VERSION}/pattern
 -book_dir	= @datadir@/${PACKAGE}-${VERSION}/book
diff --git a/debian/patches/02_gcc_4_3.diff b/debian/patches/02_gcc_4_3.diff
index 7bdb0ba..e48a2a1 100644
--- a/debian/patches/02_gcc_4_3.diff
+++ b/debian/patches/02_gcc_4_3.diff
@@ -1,8 +1,11 @@
-Bug 417215 - grhino: FTBFS with GCC 4.3: missing #includes
-Patch by Martin Michlmayr <tbm at cyrius.com>, thanks.
+# Description: Fix FTBFS with GCC 4.3
+# Author: Martin Michlmayr <tbm at cyrius.com>
+# Bug-Debian: http://bugs.debian.org/417215
 
---- book.cc~	2007-04-01 20:35:35.000000000 +0000
-+++ book.cc	2007-04-01 20:35:42.000000000 +0000
+Index: grhino/book.cc
+===================================================================
+--- grhino.orig/book.cc	2009-12-31 15:58:08.561137506 +0100
++++ grhino/book.cc	2009-12-31 15:58:16.717137812 +0100
 @@ -25,6 +25,7 @@
  #include "rand.h"
  #include "gtstream.h"
@@ -11,8 +14,10 @@ Patch by Martin Michlmayr <tbm at cyrius.com>, thanks.
  #include <vector>
  #include <iostream>
  #include <stdexcept>
---- game.cc~	2007-04-01 20:36:06.000000000 +0000
-+++ game.cc	2007-04-01 20:36:13.000000000 +0000
+Index: grhino/game.cc
+===================================================================
+--- grhino.orig/game.cc	2009-12-31 15:58:22.497138852 +0100
++++ grhino/game.cc	2009-12-31 15:58:29.381147547 +0100
 @@ -33,6 +33,7 @@
  #include "fdstream.h"
  #include "boardio.h"
@@ -21,8 +26,10 @@ Patch by Martin Michlmayr <tbm at cyrius.com>, thanks.
  #include <sys/types.h>
  #include <sys/stat.h> 
  #include <unistd.h>
---- log_proc.h~	2007-04-01 20:36:58.000000000 +0000
-+++ log_proc.h	2007-04-01 20:37:53.000000000 +0000
+Index: grhino/log_proc.h
+===================================================================
+--- grhino.orig/log_proc.h	2009-12-31 15:58:35.381136372 +0100
++++ grhino/log_proc.h	2009-12-31 15:58:43.349152965 +0100
 @@ -20,6 +20,7 @@
  
  #include "config.h"
diff --git a/debian/patches/03_desktop_file.diff b/debian/patches/03_desktop_file.diff
index 0f8be8d..7591d3e 100644
--- a/debian/patches/03_desktop_file.diff
+++ b/debian/patches/03_desktop_file.diff
@@ -1,6 +1,10 @@
-diff -Nur -x '*.orig' -x '*~' grhino-0.16.0/desktop/grhino.desktop.in grhino-0.16.0.new/desktop/grhino.desktop.in
---- grhino-0.16.0/desktop/grhino.desktop.in	2006-11-25 18:07:41.000000000 +0100
-+++ grhino-0.16.0.new/desktop/grhino.desktop.in	2008-09-05 10:36:08.000000000 +0200
+# Description: Remove Encoding field in grhino.desktop
+# Author: Vincent Legout <vincent at legout.info>
+
+Index: grhino/desktop/grhino.desktop.in
+===================================================================
+--- grhino.orig/desktop/grhino.desktop.in	2009-12-31 15:59:08.013136986 +0100
++++ grhino/desktop/grhino.desktop.in	2009-12-31 15:59:09.465138410 +0100
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3252275
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_dirname_no_version.diff
+02_gcc_4_3.diff
+03_desktop_file.diff
diff --git a/debian/rules b/debian/rules
index 4ddd047..e30ab12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ DEB_AUTO_UPDATE_ACLOCAL := 1.9
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 export LDFLAGS=-Wl,-z,defs -Wl,--as-needed
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Packaging for grhino

More information about the Pkg-games-commits mailing list