[rocksndiamonds] 01/04: Switch to simple dh rules, compatibility level 11

Stephen Kitt skitt at moszumanska.debian.org
Sat Feb 10 22:05:12 UTC 2018


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

skitt pushed a commit to branch master
in repository rocksndiamonds.

commit cabc4e09cc9cb5174daae631d2f9cfb8cbf47ed4
Author: Stephen Kitt <skitt at debian.org>
Date:   Sat Feb 10 22:45:19 2018 +0100

    Switch to simple dh rules, compatibility level 11
---
 debian/changelog | 13 ++++++++++---
 debian/compat    |  2 +-
 debian/control   |  3 +--
 debian/docs      |  1 +
 debian/rules     | 12 +++++++-----
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9250455..1623263 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rocksndiamonds (4.0.1.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Switch to debhelper compatibility level 11, with “simple dh” rules
+    instead of cdbs.
+
+ -- Stephen Kitt <skitt at debian.org>  Mon, 15 Jan 2018 08:46:17 +0100
+
 rocksndiamonds (4.0.1.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
@@ -267,7 +274,7 @@ rocksndiamonds (3.2.4+dfsg-1) unstable; urgency=low
 
 rocksndiamonds (3.2.3-4) unstable; urgency=low
 
-  * Added Portuguese translation for debconf messages, thanks 
+  * Added Portuguese translation for debconf messages, thanks
      Américo Monteiro <a_monteiro at netcabo.pt>, closes: #437285.
   * Added debian/watch file.
 
@@ -282,7 +289,7 @@ rocksndiamonds (3.2.3-3) unstable; urgency=low
 
 rocksndiamonds (3.2.3-2) unstable; urgency=low
 
-  * Added Spanish language (closes: #419240), thanks 
+  * Added Spanish language (closes: #419240), thanks
     '"Enrique Matías Sánchez (Quique)" <cronopios at gmail.com>'.
 
  -- Dmitry E. Oboukhov <dimka at avanto.org>  Sat, 14 Apr 2007 20:30:10 +0400
@@ -309,7 +316,7 @@ rocksndiamonds (3.2.2-12) unstable; urgency=low
 
   * Fix conflict with rocks-n-diamonds (closes: #405909);
   * Fix debconf-template (closes: #405889);
-  * Added Swedish language for debconf dialogs, 
+  * Added Swedish language for debconf dialogs,
     thanks 'Daniel Nylander <po at danielnylander.se>';
   * Added Czech language for debconf dialogs,
     thanks 'Miroslav Kure <kurem at debian.cz>' (closes: #405939).
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 958fd53..3b02025 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Dmitry E. Oboukhov <unera at debian.org>, Stephen Kitt <skitt at debian.org>
 Section: contrib/games
 Priority: optional
-Build-Depends: debhelper (>= 10),
-               cdbs,
+Build-Depends: debhelper (>= 11~),
                po-debconf,
                libsdl2-dev,
                libsdl2-image-dev,
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..168e5d2
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+CREDITS
diff --git a/debian/rules b/debian/rules
index a600b34..9b94ea7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,19 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 export DEB_BUILD_MAINT_OPTIONS=harderning=+all
 
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/dpkg/pkg-info.mk
 include /usr/share/dpkg/buildflags.mk
 
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+.*//')
 LEVEL_DIR := /usr/share/games/rocksndiamonds
 
-build/rocksndiamonds::
-	make RO_GAME_DIR=$(LEVEL_DIR) sdl2
+%:
+	dh $@
 
-install/rocksndiamonds::
+override_dh_auto_build:
+	dh_auto_build -- RO_GAME_DIR=$(LEVEL_DIR) sdl2
+
+override_dh_auto_install:
 	set -e; \
 	for file in postinst preinst prerm; do \
 		cp debian/$$file.in debian/$$file; \
@@ -23,7 +25,7 @@ install/rocksndiamonds::
 	mv rocksndiamonds rocksndiamonds-bin
 	install -m 0755 debian/start_binary.sh rocksndiamonds
 
-clean::
+override_dh_auto_clean:
 	make clean
 	rm -fr src/conftime.h rocksndiamonds-bin \
 		debian/postinst debian/preinst debian/prerm

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/rocksndiamonds.git



More information about the Pkg-games-commits mailing list