[SCM] libmatroska packaging branch, master, updated. upstream/1.0.0-21-g3c30531

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ceb4997c2a72d7cc1bc5c89a9ce9192afc4c62df
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Aug 2 11:59:23 2010 +0200

    Convert Debian packaging to dh7.

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 2b69830..3284039 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Fabian Greffrath <fabian+debian at greffrath.com>
-Build-Depends: debhelper (>= 5.0), quilt, libebml-dev (>= 1.0.0)
+Build-Depends: debhelper (>= 7.0.50~), quilt, libebml-dev (>= 1.0.0)
 Standards-Version: 3.7.3
 XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/libmatroska
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmatroska/
diff --git a/debian/rules b/debian/rules
index 61f726c..25b2c71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,60 +1,7 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --sourcedirectory=make/linux
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS = -O0
-else
-CFLAGS = -O2
-endif
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	$(MAKE) -C make/linux LIBEBML_INCLUDE_DIR=/usr/include/ebml CUSTOMFLAGS="$(CFLAGS)"
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	rm -f debian/dirs debian/docs debian/*.files
-	-$(MAKE) -C make/linux clean
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) -C make/linux prefix=$(CURDIR)/debian/tmp/usr install
-	dh_install -si --fail-missing --sourcedir=debian/tmp
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_install:
+	dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr

-- 
libmatroska packaging