Change to dh style debian/rules

diff --git a/debian/changelog b/debian/changelog
index 31a70ba9babb670f3b20b722bdf8d44eef17fec0..9ce2db95a0e23af3b0a3204c47895b86176db597 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ netris (0.52-10) unstable; urgency=medium
   * Fix bug number in former changelog entry for documentation purposes.
   * Fix Vcs-* fields.
   * Switch to source format 3.0 (quilt).
+  * Change to dh style debian/rules.
 
  -- 
 

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9

diff --git a/debian/control b/debian/control
index f799e374162009fcbf5f7dfe2e326251d70f9a35..c9b101f6cf3d6a55b07160b48aeb0cd9ff04157f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: netris
 Section: games
 Priority: optional
-Maintainer: Gerfried Fuchs <rhonda@debian.at>
-Build-Depends: libncurses5-dev, quilt
+Maintainer: Rhonda D'Vine <rhonda@debian.org>
+Build-Depends: debhelper (>= 9~), libncurses5-dev
 Standards-Version: 3.9.1
 Homepage: http://netris.org/
 Vcs-Git: git://git.deb.at/pkg/netris.git
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.deb.at/w/pkg/netris.git
 
 Package: netris
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: free, networked version of T*tris
  Netris is a free, networked variant of Tetris.
  .

diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..33359b8
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/games

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..9c9991c
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+FAQ
+robot_desc

diff --git a/debian/examples b/debian/examples
new file mode 100644 (file)
index 0000000..9a7af8a
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+sr.c

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..e217c25
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+netris usr/games

diff --git a/debian/manpages b/debian/manpages
new file mode 100644 (file)
index 0000000..f108d9d
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+debian/netris.6
+debian/netris-sample-robot.6

diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index 28d1730..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# debian/postinst script for netris
-# copyright 2002-2010 by Rhonda D'Vine <rhonda@debian.org>
-# Licenced under WTFPLv2
-
-set -e
-
-if [ "$1" != configure ]; then
-       exit 0
-fi
-
-if [ -x /usr/bin/update-menus ]; then
-       update-menus
-fi

diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644 (file)
index f5dbfab..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# debian/postrm script for netris
-# copyright 2002-2010 by Rhonda D'Vine <rhonda@debian.org>
-# Licenced under WTFPLv2
-
-set -e
-
-if [ -x /usr/bin/update-menus ]; then
-       update-menus
-fi

diff --git a/debian/rules b/debian/rules
index 9afcdfe310941ffb0cc35bd82d7222f939d929ca..3ff179415d52e0f8c9b4ac7f2400aa17f0aaa4c1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,111 +1,18 @@
 #!/usr/bin/make -f
-# debian/rules file for netris
-# copyright 2002-2010 by Rhonda D'Vine <rhonda@debian.org>
-# Licenced under WTFPLv2
+#DH_VERBOSE = 1
 
-PKG = netris
-TMP = $(CURDIR)/debian/$(PKG)
+%:
+       dh $@
 
-COPT = -g
-INSTALL = install
-INSTALL_FILE    = $(INSTALL) -p    -oroot -groot -m644
-INSTALL_PROGRAM = $(INSTALL) -p    -oroot -groot -m755
-INSTALL_SCRIPT  = $(INSTALL) -p    -oroot -groot -m755
-INSTALL_DIR     = $(INSTALL) -p -d -oroot -groot -m755
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-       COPT += -O0
-else
-       COPT += -O2
-endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-       STRIP = true
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-       NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-       MAKEFLAGS += -j$(NUMJOBS)
-endif
+override_dh_clean:
+       -rm -rf config.h .depend
+       dh_clean
+       -rm -f Makefile
 
-
-
-include /usr/share/quilt/quilt.make
-
-clean: unpatch
-       $(checkdir)
-       $(checkroot)
-       -rm -rf $(TMP) debian/substvars debian/files \
-               build-stamp install-stamp config.h .depend
-       [ ! -f Makefile ] || $(MAKE) clean
-       -rm -rf Makefile
-
-
-build: build-stamp
-build-stamp: patch
-       $(checkdir)
+override_dh_auto_configure:
        ./Configure -g
-       $(MAKE) COPT="$(COPT)"
-       touch build-stamp
-
-
-install: install-stamp
-install-stamp: build
-       $(checkdir)
-       $(checkroot)
-       -rm -rf $(TMP)
-       $(INSTALL_DIR) $(TMP)
-       cd $(TMP) && $(INSTALL_DIR) usr/games usr/share/man/man6 \
-               usr/share/doc/$(PKG)/examples
-       $(INSTALL_PROGRAM) netris $(TMP)/usr/games
-       $(INSTALL_PROGRAM) sr     $(TMP)/usr/games/netris-sample-robot
-       test "$(STRIP)" != true || strip \
-               --remove-section=.comment --remove-section=.note \
-               $(TMP)/usr/games/*
-       $(INSTALL_FILE) debian/netris*.6 $(TMP)/usr/share/man/man6
-       $(INSTALL_FILE) FAQ robot_desc   $(TMP)/usr/share/doc/$(PKG)
-       $(INSTALL_FILE) sr.c $(TMP)/usr/share/doc/$(PKG)/examples
-       gzip -9 $(TMP)/usr/share/man/man6/netris*.6 \
-               $(TMP)/usr/share/doc/$(PKG)/FAQ \
-               $(TMP)/usr/share/doc/$(PKG)/robot_desc \
-               $(TMP)/usr/share/doc/$(PKG)/examples/sr.c
-       touch install-stamp
-
-
-# Build architecture-independent files here.
-binary-indep: build
-# We have nothing to do by default.
-
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       $(checkdir)
-       $(checkroot)
-       $(INSTALL_DIR) $(TMP)/DEBIAN $(TMP)/usr/share/menu
-       $(INSTALL_FILE) debian/menu      $(TMP)/usr/share/menu/$(PKG)
-       $(INSTALL_FILE) debian/copyright debian/README.Debian \
-               $(TMP)/usr/share/doc/$(PKG)
-       $(INSTALL_FILE) debian/changelog \
-               $(TMP)/usr/share/doc/$(PKG)/changelog.Debian
-       gzip -9 $(TMP)/usr/share/doc/$(PKG)/changelog.Debian
-       $(INSTALL_SCRIPT) debian/postinst debian/postrm \
-               $(TMP)/DEBIAN
-       dpkg-shlibdeps -Tdebian/substvars -dDepends \
-               $(TMP)/usr/games/netris*
-       dpkg-gencontrol -ldebian/changelog -isp -Tdebian/substvars -pnetris \
-               -P$(TMP)
-       cd $(TMP) && find * -type f ! -regex '^DEBIAN/.*' -print0 | \
-               xargs -r0 md5sum > DEBIAN/md5sums
-       dpkg --build $(TMP) ..
-
-
-binary: binary-indep binary-arch
-
-define checkdir
-       test -f debian/rules
-endef
-
-define checkroot
-       test root = "`whoami`"
-endef
 
-.PHONY: clean build install binary-indep binary-arch binary
+override_dh_installdirs:
+       dh_installdirs
+       cp sr debian/netris/usr/games/netris-sample-robot