[SCM] libmms packaging branch, master, updated. upstream/0.6-28-g9126361

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Sun Jun 6 19:57:43 UTC 2010


The following commit has been merged in the master branch:
commit 9ee872782fd1f27caedad2a93929f574e61307f5
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Sun Jun 6 21:22:55 2010 +0200

    Convert Debian packaging to dh 7, use dh_autoconf-dev* and remove chrpath usage.

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 9714ed1..857ff43 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ Priority: optional
 Maintainer: Debian Multimedia Packages Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Arthur Loiret <aloiret at debian.org>,
  Fabian Greffrath <fabian+debian at greffrath.com>
-Build-Depends: debhelper (>= 5),
- autotools-dev,
+Build-Depends: autotools-dev (>= 20100122.1),
+ debhelper (>= 7.0.50~),
  libglib2.0-dev,
- quilt (>= 0.40),
- chrpath
+ quilt (>= 0.40)
 Standards-Version: 3.7.3
 Section: libs
 XS-DM-Upload-Allowed: yes
diff --git a/debian/rules b/debian/rules
index cfc1842..7c5e80b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,85 +1,4 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-confflags += \
-	--build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr \
-	--mandir=\$${prefix}/share/man \
-	--infodir=\$${prefix}/share/info
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-confflags += --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-PATCH_DIR := debian/patches
-
-CFLAGS += -Wall -g $(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),-O0,-O2)
-
-config.status: configure patch-stamp
-	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure $(confflags)
-
-patch-stamp:
-	dh_testdir
-	# apply patches
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
-	# backup the original (potentially patched) files to restore them in
-	# the clean target
-	-test -r config.sub && cp config.sub config.sub.orig
-	-test -r config.guess && cp config.guess config.guess.orig
-	-test -r /usr/share/misc/config.sub && \
-	cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-	cp -f /usr/share/misc/config.guess config.guess
-	touch $@
-
-build: build-stamp
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-	# restore files from backup (before unpatching)
-	-test -r config.sub.orig && mv -f config.sub.orig config.sub
-	-test -r config.guess.orig && mv -f config.guess.orig config.guess
-	# unapply patches, if any
-	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
-	rm -rf .pc
-	rm -f patch-stamp
-	rm -f build-stamp
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	# remove rpath
-	chrpath -d debian/tmp/usr/lib/libmms.so.0.0.2
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V 'libmms0 (>= 0.3-4)'
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+	dh --with autotools-dev,quilt $@

-- 
libmms packaging



More information about the pkg-multimedia-commits mailing list