[gweled] 04/07: Switch to debhelper compatibility level 11

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch debian-sid
in repository gweled.

commit 7c14fcdada89b6d7ebf83d3bbc7536f9566a601a
Author: Stephen Kitt <skitt at debian.org>
Date:   Fri Feb 9 09:23:41 2018 +0100

    Switch to debhelper compatibility level 11
---
 debian/changelog                                   |  2 ++
 debian/compat                                      |  2 +-
 debian/control                                     |  3 +-
 debian/patches/004-use-pkg-config-for-mikmod.patch | 13 -------
 .../patches/005-continue-endless-timed-modes.patch | 41 ----------------------
 debian/rules                                       |  2 +-
 6 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12a4021..afdd6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ gweled (0.9.1-5) UNRELEASED; urgency=medium
     paths. (Closes: #889688.)
   * Add a missing function declaration.
   * Document old patches.
+  * Switch to debhelper compatibility 11, and adjust patches so the
+    package can build multiple times in a row.
 
  -- Stephen Kitt <skitt at debian.org>  Fri, 09 Feb 2018 09:02:48 +0100
 
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 1da716a..7932bfe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen Kitt <skitt at debian.org>
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
+Build-Depends: debhelper (>= 11~),
                intltool,
                libgtk2.0-dev,
                libmikmod-dev,
diff --git a/debian/patches/004-use-pkg-config-for-mikmod.patch b/debian/patches/004-use-pkg-config-for-mikmod.patch
index 92a95b2..b872625 100644
--- a/debian/patches/004-use-pkg-config-for-mikmod.patch
+++ b/debian/patches/004-use-pkg-config-for-mikmod.patch
@@ -19,19 +19,6 @@ Author: Stephen Kitt <skitt at debian.org>
  
  AC_CHECK_HEADER(pthread.h, [],
                    AC_MSG_ERROR([*** Cannot find pthread.h header]))
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -176,8 +176,8 @@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
--MIKMOD_CFLAGS = @MIKMOD_CFLAGS@
--MIKMOD_LIBS = @MIKMOD_LIBS@
-+MIKMOD_CFLAGS = @libmikmod_CFLAGS@
-+MIKMOD_LIBS = @libmikmod_LIBS@
- MKDIR_P = @MKDIR_P@
- MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -9,7 +9,7 @@
diff --git a/debian/patches/005-continue-endless-timed-modes.patch b/debian/patches/005-continue-endless-timed-modes.patch
index 1e8943c..f3ab8a3 100644
--- a/debian/patches/005-continue-endless-timed-modes.patch
+++ b/debian/patches/005-continue-endless-timed-modes.patch
@@ -4,47 +4,6 @@ Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/86
 Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/87
 Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/88
 
---- a/po/gweled.pot
-+++ b/po/gweled.pot
-@@ -8,7 +8,7 @@
- msgstr ""
- "Project-Id-Version: PACKAGE VERSION\n"
- "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2011-03-31 00:33+0200\n"
-+"POT-Creation-Date: 2011-10-31 11:05+0100\n"
- "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
- "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
- "Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -60,15 +60,15 @@
- msgstr ""
- 
- #: ../src/main.c:397
--msgid "Get as many point as you can. The game ends if you out of moves."
-+msgid "Get as many points as you can. The game ends if you run out of moves."
- msgstr ""
- 
- #: ../src/main.c:399
--msgid "Get as many points as you can, but you are limited on time."
-+msgid "Get as many points as you can. The game ends if you run out of time."
- msgstr ""
- 
- #: ../src/main.c:401
--msgid "Game will never end. Your scores will not be registered."
-+msgid "The game never ends, but your score will not be saved."
- msgstr ""
- 
- #: ../src/main.c:461
-@@ -103,8 +103,8 @@
- msgid "_Pause"
- msgstr ""
- 
--#: ../src/board_engine.c:829 ../src/board_engine.c:902
--#: ../src/board_engine.c:1004
-+#: ../src/board_engine.c:830 ../src/board_engine.c:903
-+#: ../src/board_engine.c:1005
- #, c-format
- msgid "Level %d"
- msgstr ""
 --- a/src/board_engine.c
 +++ b/src/board_engine.c
 @@ -764,7 +764,7 @@
diff --git a/debian/rules b/debian/rules
index 3a37c22..0923d8b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export DH_OPTIONS
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --bindir=\$${prefix}/games --localstatedir=/var

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git