[SCM] ezstream/master: Fix install upstream manpage (not outdated Debian-specific one). Closes: bug#573928. Thanks to Philip Muskovac and John Pearson.

Sun Jan 16 12:47:27 UTC 2011

The following commit has been merged in the master branch:
commit 681d699d2bec0579e54359d92577315982a34a12
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jan 16 13:36:46 2011 +0100

    Fix install upstream manpage (not outdated Debian-specific one). Closes: bug#573928. Thanks to Philip Muskovac and John Pearson.

diff --git a/debian/ezstream.sgml b/debian/ezstream.sgml
deleted file mode 100644
index c754816..0000000
--- a/debian/ezstream.sgml
+++ /dev/null
@@ -1,156 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Guillaume</firstname>">
-  <!ENTITY dhsurname   "<surname>PELLERIN</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>octobre 20, 2006</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>yomguy at altern.org</email>">
-  <!ENTITY dhusername  "Guillaume Pellerin">
-  <!ENTITY dhucpackage "<refentrytitle>ezstream</refentrytitle>">
-  <!ENTITY dhpackage   "ezstream">
-
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2007</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-	<refpurpose>easy media streaming client for icecast servers</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-	  <arg><option>-h</option></arg>
-      <arg><option>-c <replaceable>CONFIGFILE</replaceable></option></arg>
-	  
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para>This manual page documents briefly the
-      <command>&dhpackage;</command> usage.
-    </para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-
-  <para><command>&dhpackage;</command> is an audio and video streaming client which feeds any icecast server from MP3 or OGG (Vorbis, Theora) playlists without reencoding. On-the-fly reencoding of the input stream (FLAC for example) is also possible. <command>&dhpackage;</command> also handles shoutcast metadatas.</para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>These programs follow the usual &gnu; command line syntax,
-      with long options starting with two dashes (`-').  A summary of
-      options is included below.  For a complete description, see the
-      <application>Info</application> files.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term><option>-h</option>
-        </term>
-        <listitem>
-          <para>Show summary of options.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-		  <term><option>-c <replaceable>CONFIGFILE</replaceable></option>
-        </term>
-        <listitem>
-          <para>Start ezstream with a config file.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>SEE ALSO</title>
-    <para>
-		README informations in /usr/share/doc/ezstream/README.gz
-	<para>
-		CONFIGFILE examples in /usr/share/doc/ezstream/examples/
-	</para>
-    <para>
-		icecast2 (http://icecast.org)
-	</para>
-
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; <&dhemail;> for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index eb29a2a..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/ezstream.1
diff --git a/debian/rules b/debian/rules
index b7c8d5f..0ab2be9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,6 @@ CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
 # Set examples dir:
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-examplesdir="\$${prefix}/share/doc/ezstream/examples"
 
-build/ezstream::
-	docbook-to-man debian/ezstream.sgml > debian/ezstream.1
-
-cleanbuilddir/ezstream::
-	rm -f debian/ezstream.1
-
 install/ezstream::
 	find debian/ezstream -depth \( -name "COPYING" \) -exec rm -rf {} \;
 	# Remove language-specific extension
@@ -57,4 +51,4 @@ install/ezstream::
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libogg-dev (>> 1.1.0), libshout3-dev (>= 2.0-9), libvorbis-dev (>> 1.0.1), libxml2-dev (>= 2.6.11)
 
 # Packaging requirements
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), docbook-to-man, autotools-dev
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), autotools-dev

-- 
ezstream packaging

