[SCM] libdvbpsi/master: Switch to DH 7 short-form and with dh-autoreconf support.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Jan 12 16:16:16 UTC 2013


The following commit has been merged in the master branch:
commit 61560a0131d6c95e0e7504caefc7d1d1088ccdad
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 12 16:15:54 2013 +0000

    Switch to DH 7 short-form and with dh-autoreconf support.

diff --git a/debian/control b/debian/control
index b4c3f86..77ef12f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders:
  Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
  Christophe Mutricy <xtophe at videolan.org>
 Build-Depends:
- debhelper (>= 9~)
+ debhelper (>= 9~),
+ dh-autoreconf
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libdvbpsi.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libdvbpsi.git
diff --git a/debian/libdvbpsi-dev.changelogs b/debian/libdvbpsi-dev.changelogs
new file mode 100644
index 0000000..edc0071
--- /dev/null
+++ b/debian/libdvbpsi-dev.changelogs
@@ -0,0 +1 @@
+NEWS
diff --git a/debian/libdvbpsi-dev.docs b/debian/libdvbpsi-dev.docs
new file mode 100644
index 0000000..11f7d7b
--- /dev/null
+++ b/debian/libdvbpsi-dev.docs
@@ -0,0 +1,3 @@
+README
+AUTHORS
+ChangeLog
diff --git a/debian/rules b/debian/rules
index 3b42da6..d211940 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,62 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# See /usr/share/doc/autotools-dev/README.Debian.gz
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-# FOR AUTOCONF 2.52 AND NEWER ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	./configure $(confflags) --prefix=/usr --mandir=$${prefix}/share/man \
-		--infodir=$${prefix}/share/info --enable-release 
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp/
-	find debian/tmp -type f -name '*.la' -delete
-	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_link
-	dh_installdocs AUTHORS README NEWS
-	dh_installchangelogs ChangeLog
-	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
+%:
+	dh $@ --parallel --with autoreconf
 
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-release

-- 
libdvbpsi packaging



More information about the pkg-multimedia-commits mailing list