[SCM] flac packaging branch, master, updated. debian/1.2.1-1.2-24-gdbac4d2

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

The following commit has been merged in the master branch:
commit 681fb04b74cb1349036d9d53be56a9bf6d899472
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Tue Aug 4 08:52:54 2009 +0200

    Regenerate manpages at compile time: Add docbook-to-man to Build-Depends, change debian/patches/02_doc_path.dpatch to modify man/flac.sgml and stop touching man/flac.1 in debian/rules.

diff --git a/debian/control b/debian/control
index dd9bf03..f242af2 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at l
 Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>
 Build-Depends: autotools-dev,
                debhelper (>= 7),
+               docbook-to-man,
                doxygen,
                dpatch,
                libid3-3.8.3-dev,
diff --git a/debian/patches/02_doc_path.dpatch b/debian/patches/02_doc_path.dpatch
index 4cf0a79..554dd6f 100755
--- a/debian/patches/02_doc_path.dpatch
+++ b/debian/patches/02_doc_path.dpatch
@@ -5,14 +5,15 @@
 ## DP: Correct path to documentation. closes: #413411.
 
 @DPATCH@
---- flac-1.1.4/man/flac.1~	2007-06-06 00:51:58.000000000 -0700
-+++ flac-1.1.4/man/flac.1	2007-06-06 00:53:51.000000000 -0700
-@@ -319,7 +319,7 @@
- .PP
- metaflac(1).
- .PP
--The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
-+The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
- .SH "AUTHOR"
- .PP
- This manual page was written by Matt Zimmerman <mdz at debian.org> for the Debian GNU/Linux system (but may be used by others).
+diff -urNad flac~/man/flac.sgml flac/man/flac.sgml
+--- flac~/man/flac.sgml	2009-08-04 08:44:05.000000000 +0200
++++ flac/man/flac.sgml	2009-08-04 08:49:17.000000000 +0200
+@@ -697,7 +697,7 @@
+ 
+     <para>metaflac(1).</para>
+ 
+-    <para>The programs are documented fully by HTML format documentation, available in <filename>/usr/share/doc/flac/html</filename> on &debian; systems.</para>
++    <para>The programs are documented fully by HTML format documentation, available in <filename>/usr/share/doc/libflac-doc/html</filename> on &debian; systems.</para>
+   </refsect1>
+   <refsect1>
+     <title>AUTHOR</title>
diff --git a/debian/rules b/debian/rules
index 47bb4f5..696a8ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,6 @@ build: patch configure-stamp build-stamp
 build-stamp: configure-stamp
 	dh_testdir
 
-	touch man/flac.1
 	# Add here commands to compile the package.
 	$(MAKE)
 

-- 
flac packaging