[SCM] flac packaging branch, master, updated. debian/1.2.1-3-16-g9e53ca2

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

The following commit has been merged in the master branch:
commit c8436ba58f5a1d3dc6edbe4046bef1093a32810e
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jun 15 15:16:37 2010 +0200

    Convert package to use dh7 with quilt and autotools-dev sequence addons.

diff --git a/debian/README.source b/debian/README.source
index b8f2569..6b36218 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
-This package uses dpatch to manage all modifications to the upstream
+This package uses quilt to manage all modifications to the upstream
 source.  Changes are stored in the source package as diffs in
 debian/patches and applied during the build.
 
-For more information about dpatch, see /usr/share/doc/dpatch/README.source.gz
+For more information about quilt, see /usr/share/doc/quilt/README.source
diff --git a/debian/clean b/debian/clean
index b595f77..b0fea34 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,4 +1,2 @@
-config.guess
-config.sub
 man/flac.1
 man/metaflac.1
diff --git a/debian/control b/debian/control
index 366e5b5..3d5a02b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Joshua Kwan <joshk at triplehelix.org>,
            Fabian Greffrath <fabian+debian at greffrath.com>
-Build-Depends: autotools-dev,
-               debhelper (>= 7),
+Build-Depends: autotools-dev (>= 20100122.1~),
+               debhelper (>= 7.0.50~),
                docbook-to-man,
                doxygen,
-               quilt (>= 0.40),
+               quilt (>= 0.46-7~),
                libid3-3.8.3-dev,
                libogg-dev
 Standards-Version: 3.8.4
diff --git a/debian/libflac-doc.install b/debian/libflac-doc.install
index 5528be1..a6ab535 100644
--- a/debian/libflac-doc.install
+++ b/debian/libflac-doc.install
@@ -1 +1 @@
-usr/share/doc/flac-1.2.1/html
+usr/share/doc/flac-1.2.1/* usr/share/doc/libflac-doc
diff --git a/debian/rules b/debian/rules
index fd90590..3bed96c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,105 +1,20 @@
 #!/usr/bin/make -f
-# debian/rules for flac
 
-include /usr/share/quilt/quilt.make
-
-top_srcdir:=$(shell pwd)
-tmp:=debian/tmp
-tmp_absolute:=$(top_srcdir)/$(tmp)
-
-DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 ifeq ($(DEB_HOST_ARCH),m68k)
 CFLAGS += -fno-inline-functions
 endif
 
-CONFIGURE_ARGS = --build=$(DEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-CONFIGURE_ARGS += --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-configure: patch configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess .
-endif
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub .
-endif
+%:
+	dh $@ --with autotools-dev,quilt
 
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure $(CONFIGURE_ARGS) \
-		--prefix=/usr --mandir=/usr/share/man --disable-rpath \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--disable-rpath \
 		--disable-xmms-plugin \
 		--disable-asm-optimizations
-	sh debian/fixrpath
-	touch $@
-
-build: patch configure-stamp build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	$(MAKE) DESTDIR=$(tmp_absolute) install
-
-	dh_install --sourcedir=$(tmp)
-
-	mv debian/libflac-doc/usr/share/doc/flac-1.2.1 \
-		debian/libflac-doc/usr/share/doc/libflac-doc
-
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installchangelogs -i
-	dh_compress -i -X.html
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
+override_dh_makeshlibs:
 	dh_makeshlibs -plibflac8 -V "libflac8 (>= 1.2.1)"
 	dh_makeshlibs -plibflac++6 -V "libflac++6 (>= 1.2.1)"
-	dh_link -a
-	dh_installdeb -a
-	dh_shlibdeps -a -ldebian/libflac8/usr/lib:debian/libflac++6/usr/lib
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

-- 
flac packaging