[SCM] flac/master: According to lintian, upstream autotools is still not recent enough.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Jun 6 10:31:14 UTC 2013


The following commit has been merged in the master branch:
commit be4b8b832bd3424a3527a7760080b1b563b34fb3
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jun 6 12:21:09 2013 +0200

    According to lintian, upstream autotools is still not recent enough.

diff --git a/debian/control b/debian/control
index 1b2fb3a..5bfa4f0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Joshua Kwan <joshk at triplehelix.org>,
  Fabian Greffrath <fabian+debian at greffrath.com>
 Build-Depends: debhelper (>= 8.1.3),
+ dh-autoreconf,
  docbook-to-man,
  doxygen,
  libogg-dev
diff --git a/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch b/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch
index 3f82157..46abf3b 100644
--- a/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch
+++ b/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch
@@ -25,20 +25,3 @@ This reverts commit 023f06f6cbc316127ca1a4fb4178ef344a413bd5.
  else
  flac.1:
  	echo "*** Warning: docbook-to-man not found; man pages will not be built."
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -536,12 +536,10 @@ uninstall-man: uninstall-man1
- 
- 
- @FLaC__HAS_DOCBOOK_TO_MAN_TRUE at flac.1: flac.sgml
-- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@
-- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	(docbook2man $? && mv FLAC.1 $@)
-+ at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@ || (docbook2man $? && mv FLAC.1 $@)
- 
- @FLaC__HAS_DOCBOOK_TO_MAN_TRUE at metaflac.1: metaflac.sgml
-- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@
-- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	(docbook2man $? && mv METAFLAC.1 $@)
-+ at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@ || (docbook2man $? && mv METAFLAC.1 $@)
- @FLaC__HAS_DOCBOOK_TO_MAN_FALSE at flac.1:
- @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@	echo "*** Warning: docbook-to-man not found; man pages will not be built."
- @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@	touch $@
diff --git a/debian/rules b/debian/rules
index 207f8e6..cc32fe9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

-- 
flac packaging



More information about the pkg-multimedia-commits mailing list