The following commit has been merged in the master branch:
commit 15dc9be881bae52edaef0d418816115889ac9ce1
Author: Andres Mejia <[email protected]>
Date:   Sat May 16 15:26:04 2009 -0400

    Take advantage of debhelper 7 features.
    
    We build depend on debhelper (>= 7). We also use quilt addon so we build 
depend
    on quilt (>= 0.46-7).

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index ce929f1..73c666f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openal-soft
 Priority: optional
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Bruno "Fuddl" Kleinert <[email protected]>, Andres Mejia 
<[email protected]>, Reinhard Tartler <[email protected]>, Thierry Reding 
<[email protected]>, Cyril Brulebois <[email protected]>, GonĂ©ri Le 
Bouder <[email protected]>
-Build-Depends: debhelper (>= 5), quilt, libasound2-dev [!kfreebsd-i386 
!kfreebsd-amd64 !hurd-i386], cmake
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7), libasound2-dev 
[!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], cmake
 Standards-Version: 3.8.1
 Section: libs
 Vcs-Git: git://git.debian.org/git/pkg-games/openal-soft.git
diff --git a/debian/rules b/debian/rules
index 146350d..7fc96b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 # nostrip option implies noopt
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
@@ -21,43 +17,21 @@ DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
 
 BUILD_TREE=$(CURDIR)/build-tree
 
-patch: patch-stamp
-patch-stamp:
-       dh_testdir
-       QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-       touch patch-stamp
+%:
+       dh --with quilt $@
+
+override_dh_auto_clean:
+       rm -rf $(BUILD_TREE)
 
-configure: patch configure-stamp
-configure-stamp:
-       dh_testdir
+override_dh_auto_configure:
        mkdir -p $(BUILD_TREE)
        cd $(BUILD_TREE) && \
                cmake $(DEB_CMAKE_OPTIONS)
-       touch configure-stamp
 
-build: configure build-stamp
-build-stamp:
-       dh_testdir
+override_dh_auto_build:
        $(MAKE) --directory=$(BUILD_TREE)
-       touch $@
-
-clean: clean-stamp unpatch
-clean-stamp:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       rm -rf $(BUILD_TREE)
-       dh_clean
-
-unpatch:
-       dh_testdir
-       QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-       rm -rf patch-stamp .pc
 
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
+override_dh_auto_install:
        $(MAKE) --directory=$(BUILD_TREE) install DESTDIR=$(CURDIR)/debian/tmp
        mkdir -p debian/tmp/etc/openal
        cp alsoftrc.sample debian/tmp/etc/openal/alsoft.conf
@@ -66,31 +40,11 @@ install: build
        mkdir -p debian/tmp/usr/bin
        cp debian/openal-config debian/tmp/usr/bin/openal-config
 
-# Build architecture-independent files here.
-binary-indep:
+override_dh_strip:
+       dh_strip --dbg-package=libopenal1-dbg
 
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs -a
-       dh_installdocs -a
-       dh_installexamples -a
-       dh_install -a
+override_dh_installman:
        dh_installman -plibopenal-dev debian/openal-config.1
-       dh_strip -a --dbg-package=libopenal1-dbg
-       dh_compress -a
-       dh_fixperms -a
-       dh_makeshlibs -a
-       dh_installdeb -a
-       dh_shlibdeps -a
-       dh_gencontrol -a
-       dh_md5sums -a
-       dh_builddeb -a
-
-binary: binary-indep binary-arch
 
 get-orig-source:
        $(dir $_)openal-soft-get-orig-source --remove-upstream-tarball
-
-.PHONY: build clean binary-indep binary-arch binary install configure

-- 
Packaging for openal-soft

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

Reply via email to