The following commit has been merged in the master branch:
commit 9dde8c6a98c6d062645459a58c2343c9229111c7
Author: Damyan Ivanov <[email protected]>
Date:   Sat Oct 31 15:11:30 2009 +0200

    rules: trim further by using debhelper overrides

diff --git a/debian/changelog b/debian/changelog
index 9ece740..5ec0cf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kobodeluxe (0.5.1-5) UNRELEASED; urgency=low
     Closes: #552548; thanks to Ilya Barygin
   * clean build-dependencies from versions satisfied by Etch
   * rules: move the list of files to clean in debian/clean
+    + trim further by using debhelper overrides
 
  -- Damyan Ivanov <[email protected]>  Sat, 31 Oct 2009 14:41:33 +0200
 
diff --git a/debian/control b/debian/control
index 23ebec7..e0b9cfd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: kobodeluxe
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 7), libsdl-image1.2-dev, libsdl1.2-dev, 
automake1.7, autotools-dev, quilt
+Build-Depends: debhelper (>= 7.0.50), libsdl-image1.2-dev, libsdl1.2-dev, 
automake1.7, autotools-dev, quilt
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Damyan Ivanov <[email protected]>
 Standards-Version: 3.8.1
diff --git a/debian/kobodeluxe.install b/debian/kobodeluxe.install
index f277a25..b71c9b5 100644
--- a/debian/kobodeluxe.install
+++ b/debian/kobodeluxe.install
@@ -2,3 +2,4 @@ usr/games
 var
 usr/share/man
 debian/kobodeluxe.desktop usr/share/applications
+debian/kobo-icon.xpm usr/share/pixmaps/
diff --git a/debian/rules b/debian/rules
index 9d96649..97c2cb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,15 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 SCORES = var/games/kobo-deluxe/scores
 PACKAGE        = $(firstword $(shell dh_listpackages))
 DATAPKG        = $(PACKAGE)-data
 TMP    = $(CURDIR)/debian/tmp
 PKGDIR = $(CURDIR)/debian/$(PACKAGE)
 
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
-       dh build --before configure
+%:
+       dh --with=quilt $@
+
+override_dh_auto_configure:
        ln -sf /usr/share/misc/config.sub
        ln -sf /usr/share/misc/config.guess
        aclocal-1.7
@@ -18,35 +17,19 @@ build-stamp: $(QUILT_STAMPFN)
        autoconf
        ./configure --bindir=/usr/games --prefix=/usr --sysconfdir=/etc \
                --mandir=/usr/share/man --sharedstatedir=/usr/share
-       dh build --after configure --before auto_build
+
+override_dh_auto_build:
        $(MAKE) kobo_scoredir=/$(SCORES)
-       dh build --after auto_build
-       touch $@
 
-install: install-stamp
-install-stamp:
-       dh install --before auto_install
+override_dh_auto_install:
        mkdir -p $(TMP)/$(SCORES)
        $(MAKE) DESTDIR=$(TMP) kobo_scoredir=/$(SCORES) install
        rm -rfv $(TMP)/usr/games/kobo-deluxe \
                $(TMP)/usr/share/kobo-deluxe/scores
-       dh_install -p $(PACKAGE) debian/kobo-icon.xpm usr/share/pixmaps/
-       dh install --after auto_install --until fixperms
+
+override_dh_fixperms:
+       dh_fixperms
        chown root.games $(PKGDIR)/usr/games/kobodl \
                $(PKGDIR)/$(SCORES)
        chmod g+s $(PKGDIR)/usr/games/kobodl
        chmod 2775 $(PKGDIR)/$(SCORES)
-       dh install --after fixperms
-       touch $@
-
-clean: unpatch
-       dh $@
-
-binary-indep: install
-       dh $@
-
-binary-arch: install
-       dh $@
-
-binary: binary-indep binary-arch
-.PHONY: build install clean binary-indep binary-arch binary

-- 
Packaging of kobodeluxe

_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits

Reply via email to