r148 - in trunk/debian: . patches

[Ludovic Rousseau]

Author: rousseau
Date: 2012-06-09 16:10:18 +0000 (Sat, 09 Jun 2012)
New Revision: 148

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/06_doc_bins.sgml
   trunk/debian/rules
Log:
patch bins.1 directly instead of patching bins.sgml and generating a
bins.1 manpage. debian/rules do not "patch" any file now, only quilt does
that.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2012-06-09 15:58:07 UTC (rev 147)
+++ trunk/debian/changelog	2012-06-09 16:10:18 UTC (rev 148)
@@ -6,6 +6,9 @@
     W: bins source: debian-rules-missing-recommended-target build-arch
   * debian/control: Standards-Version: 3.8.3 -> 3.9.3. No change needed
   * debian/rules: dh_clean -k is deprecated; use dh_prep instead
+  * patch bins.1 directly instead of patching bins.sgml and generating a
+    bins.1 manpage. debian/rules do not "patch" any file now, only quilt does
+    that.
 
  -- Ludovic Rousseau <rousseau at debian.org>  Sat, 09 Jun 2012 17:37:19 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2012-06-09 15:58:07 UTC (rev 147)
+++ trunk/debian/control	2012-06-09 16:10:18 UTC (rev 148)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ludovic Rousseau <rousseau at debian.org>
 Build-Depends: debhelper (>> 5.0.0)
-Build-Depends-Indep: docbook-to-man, gettext
+Build-Depends-Indep: gettext
 Standards-Version: 3.9.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-bins/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-bins/trunk/

Modified: trunk/debian/patches/06_doc_bins.sgml
===================================================================
--- trunk/debian/patches/06_doc_bins.sgml	2012-06-09 15:58:07 UTC (rev 147)
+++ trunk/debian/patches/06_doc_bins.sgml	2012-06-09 16:10:18 UTC (rev 148)
@@ -2,8 +2,8 @@
 Description: the template are not in the upstream defined directory
 	(/etc/bins) but in /usr/share/bins/
 
---- bins-1.1.29.orig/doc/bins.sgml
-+++ bins-1.1.29/doc/bins.sgml
+--- a/doc/bins.sgml
++++ b/doc/bins.sgml
 @@ -188,7 +188,7 @@
  	  <para>Specify location of html templates.</para>
  	  <para>Default is <filename>~/.bins</filename>, falling back
@@ -13,3 +13,23 @@
  	</listitem>
        </varlistentry>
        <varlistentry>
+--- a/doc/bins.1
++++ b/doc/bins.1
+@@ -71,7 +71,7 @@
+ .IP "" 10 
+ Default is \fB~/.bins\fP, falling back 
+ to default versions in 
+-\fB/etc/bins/templates.\fIstyle\fR\fP. 
++\fB/usr/share/bins/templates.\fIstyle\fR\fP. 
+ .IP "\fB-p\fP         " 10 
+ Numbers preceding the album title, followed by  
+ an underscore are stripped. 
+@@ -595,7 +595,7 @@
+ .RE 
+ .IP "" 10 
+ The default versions of these files in 
+-\fB/etc/bins/templates.default\fP should 
++\fB/usr/share/bins/templates.default\fP should 
+ show how they work, as does the 
+ \fBHTML::Template\fP documentation.  Aside 
+ from the \fBCOLOR\fP substitutions described 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2012-06-09 15:58:07 UTC (rev 147)
+++ trunk/debian/rules	2012-06-09 16:10:18 UTC (rev 148)
@@ -32,9 +32,6 @@
 clean:
 	dh_testdir
 	dh_testroot
-
-	if [ -f doc/bins.1.bak ]; then \
-		mv doc/bins.1.bak doc/bins.1; fi
 	dh_clean
 
 install: build
@@ -43,12 +40,6 @@
 	dh_prep
 	dh_installdirs
 
-	# backup original manpages
-	mv doc/bins.1 doc/bins.1.bak
-
-	# regeneate modified manpages
-	docbook-to-man doc/bins.sgml > doc/bins.1
-
 	# Add here commands to install the package into debian/bins.
 	echo | ( DESTDIR=`pwd`/debian/bins PREFIX=/usr ./install.sh )
 	install -m 0755 tools/bins_cleanupgallery debian/bins/usr/bin/