[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#633494: holotz-castle: Switch to dh-sequencer in debian/rules



Package: holotz-castle
Version: 1.3.14-3
Severity: wishlist

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


Hello there,

since I think the dh-7 style rules is much more easier to read, I worked on
the conversion of holotz-castle. The attached patch does:

- - switch to dh(1)
- - use debian/*.install|manpages
- - switch to compat level 8

It builds cleanly and the resulting package works flawlessly.

I cc debian-devel-games@l.d.o because I'm unsure if such a rather intrusive
change is ok to commit without prior discussion.

Thanks.

- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-999-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages holotz-castle depends on:
ii  holotz-castle-data      1.3.14-3         platform game with high doses of m
ii  libc6                   2.13-10          Embedded GNU C Library: Shared lib
ii  libgcc1                 1:4.6.1-2        GCC support library
ii  libsdl-image1.2         1.2.10-2.1       image loading library for Simple D
ii  libsdl-mixer1.2         1.2.8-6.3        mixer library for Simple DirectMed
ii  libsdl-ttf2.0-0         2.0.9-1          ttf library for Simple DirectMedia
ii  libsdl1.2debian         1.2.14-6.4       Simple DirectMedia Layer
ii  libstdc++6              4.6.1-2          GNU Standard C++ Library v3
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

holotz-castle recommends no packages.

Versions of packages holotz-castle suggests:
ii  holotz-castle-data [holotz-ca 1.3.14-3   platform game with high doses of m

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBAgAGBQJOGfoRAAoJEGHzRCZ03mYknQ8P/jcQWnv0tS1jLzN/KSXCzmIn
QyJjsvsvJ/2U0Q3VfLJDhmN/bBQNZ2Sa0+GMzeqBSG5Jyqe66PNl2uN4yFWfL8Lb
7otH8jZh8pqJIlAyFNSzvmGxKnzooTpPVPdT+9e9h1y3ErRVr7w8BoGAcan23xpI
GMYKPXzm8NDxCW9641SMg+QzvAYSVSLZh/1JG4Ga5jK3nX21uClXVk9kWSW7VmaF
+Jt/rJfCfMbjXaAdV3iPsqgU/3vcc3vzF0S8w8LMIrWBAotWV/39BGLeCIE+6v4U
Gvv4EwBjFRKluwOA1YlexQ1FuDhoKi6LbsjOVhlONS9sMhpsd+Q78ifcVnfvvx8D
vJXJinPobVXTUOIxeJIBkQQoCnU7M/ahk0Nr2jgGSYdvQrRRSgnCe6k+036MDU7j
z68Fj+DM74zs0E5HnLQDYfzYilLoLfHdhTNX/q8+Da5ddcr0kLMXQ4vIAFe+Krgz
V9vPV27yRSIVFVTN9Q8NdVUerBvillzJDiF74SOjK9Aj8LtK+cdgwOTVLppVj0uz
Zjd+vdcSuYRaeBgjff2BNphj6azrNBr8aTJCEvyIqn+pMx73fUmb7hGL0aU9aziV
0Chbe9bTLrcjmZ4ZQ9Aw3qShrzruU76BNLEr/AQJ8/pOdcaNOi/JYR6f+EMsAtOL
lQLkKx7temfjn7ElIVpL
=gaTd
-----END PGP SIGNATURE-----
Index: control
===================================================================
--- control	(revision 12512)
+++ control	(working copy)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry@yahoo.es>, Barry deFreese <bdefreese@debian.org>
-Build-Depends: debhelper (>= 5.0.0), dpkg-dev (>= 1.13.19),
+Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.13.19),
  libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libsdl-ttf2.0-dev
 Standards-Version: 3.9.1
 Homepage: http://www.mainreactor.net/holotzcastle/en/index_en.html
Index: holotz-castle-editor.install
===================================================================
--- holotz-castle-editor.install	(revision 0)
+++ holotz-castle-editor.install	(revision 0)
@@ -0,0 +1 @@
+holotz-castle-editor usr/games/
Index: holotz-castle.manpages
===================================================================
--- holotz-castle.manpages	(revision 0)
+++ holotz-castle.manpages	(revision 0)
@@ -0,0 +1 @@
+man/holotz-castle.6
Index: compat
===================================================================
--- compat	(revision 12512)
+++ compat	(working copy)
@@ -1 +1 @@
-5
+8
Index: rules
===================================================================
--- rules	(revision 12512)
+++ rules	(working copy)
@@ -1,79 +1,9 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+%:
+	dh $@
 
-CFLAGS = -DLINUX -g
+override_dh_installdocs:
+	dh_installdocs --link-doc=holotz-castle-data
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-	$(MAKE) MORE_CFLAGS="$(CFLAGS)"
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f *-stamp
-	chmod -x res/stories/milanb/*
-	$(MAKE) clean
-	dh_clean
-
-install-indep:
-	dh_installdirs -i usr/share/games/holotz-castle/game
-	dh_installdirs -i usr/share/games/holotz-castle/editor
-	cp -r res/* debian/holotz-castle-data/usr/share/games/holotz-castle/game
-	cp -r HCedHome/res/* debian/holotz-castle-data/usr/share/games/holotz-castle/editor
-
-install-arch: build
-	dh_testdir
-	dh_testroot
-	dh_installdirs -a usr/games
-	dh_install -pholotz-castle holotz-castle usr/games/
-	dh_installdirs -pholotz-castle usr/share/pixmaps
-	dh_installdirs -pholotz-castle usr/share/applications
-	dh_install -pholotz-castle debian/holotz-castle.xpm usr/share/pixmaps
-	dh_install -pholotz-castle debian/holotz-castle.desktop usr/share/applications
-	dh_install -pholotz-castle-editor holotz-castle-editor usr/games/
-
-install: install-arch install-indep
-
-binary-indep: install-indep
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: install-arch
-	dh_testdir
-	dh_testroot
-	dh_installmenu
-	dh_installman -pholotz-castle man/holotz-castle.6
-	dh_installman -pholotz-castle-editor man/holotz-castle-editor.6
-	dh_link -pholotz-castle usr/share/doc/holotz-castle-data usr/share/doc/holotz-castle
-	dh_link -pholotz-castle-editor usr/share/doc/holotz-castle-data usr/share/doc/holotz-castle-editor
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean install-indep install-arch install binary-indep \
-	binary-arch binary
+override_dh_auto_install:
Index: holotz-castle.install
===================================================================
--- holotz-castle.install	(revision 0)
+++ holotz-castle.install	(revision 0)
@@ -0,0 +1,3 @@
+debian/holotz-castle.xpm usr/share/pixmaps
+debian/holotz-castle.desktop usr/share/applications
+holotz-castle usr/games/
Index: holotz-castle-data.install
===================================================================
--- holotz-castle-data.install	(revision 0)
+++ holotz-castle-data.install	(revision 0)
@@ -0,0 +1,2 @@
+res/* usr/share/games/holotz-castle/game
+HCedHome/res/* usr/share/games/holotz-castle/editor
Index: holotz-castle-editor.manpages
===================================================================
--- holotz-castle-editor.manpages	(revision 0)
+++ holotz-castle-editor.manpages	(revision 0)
@@ -0,0 +1 @@
+man/holotz-castle-editor.6

Reply to: