[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.15-1-7-g9cad0ed

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 477d0f12a07e78c179df1331095bddd0e5e6c1f6
Author: Ralf Treinen <treinen at pps.univ-paris-diderot.fr>
Date:   Thu May 31 10:59:01 2012 +0200

    install apt-cudf.conf manpage
    
    we have to rename it from .1 to .5 as upstream wrongly puts is into
    section 1. It belongs into 5 (file formats).

diff --git a/debian/apt-cudf.manpages b/debian/apt-cudf.manpages
index dfe8c9f..884eef4 100644
--- a/debian/apt-cudf.manpages
+++ b/debian/apt-cudf.manpages
@@ -1,2 +1,3 @@
 doc/manpages/apt-cudf.1
+doc/manpages/apt-cudf.conf.5
 debian/update-cudf-solvers.8
diff --git a/debian/changelog b/debian/changelog
index 34c518d..1681626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ dose3 (2.9.17-1) UNRELEASED; urgency=low
   * New upstream version.
     - refreshed patch binaries-prefix-edos
   * New file debian/apt-cudf.conf, install into /etc
+  * debian/apt-cudf.manpages: install apt-cudf.conf
+  * patch manpages-section5: apt-cudf.conf manpage is section 5 not 1
 
- -- Ralf Treinen <treinen at debian.org>  Thu, 31 May 2012 10:50:38 +0200
+ -- Ralf Treinen <treinen at debian.org>  Thu, 31 May 2012 10:58:08 +0200
 
 dose3 (2.9.15-1) unstable; urgency=low
 
diff --git a/debian/patches/manpages-section5 b/debian/patches/manpages-section5
new file mode 100644
index 0000000..20d112f
--- /dev/null
+++ b/debian/patches/manpages-section5
@@ -0,0 +1,28 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: apt-cudf.conf manpage has to be section 5, not 1
+
+Index: dose3/Makefile
+===================================================================
+--- dose3.orig/Makefile	2012-05-31 11:34:11.000000000 +0200
++++ dose3/Makefile	2012-05-31 11:34:42.000000000 +0200
+@@ -103,7 +103,9 @@
+ 	done
+ 
+ POD = $(wildcard doc/manpages/*.pod)
+-MAN = $(patsubst %.pod,%.1,$(POD))
++POD5 = doc/manpages/apt-cudf.conf.pod
++POD1 = $(filter-out $(POD5),$(POD))
++MAN = $(patsubst %.pod,%.1,$(POD1)) $(patsubst %.pod,%.5,$(POD5))
+ HTML = $(patsubst %.pod,%.html,$(POD))
+ 
+ man: $(MAN)
+@@ -114,6 +116,9 @@
+ doc/manpages/%.1: doc/manpages/%.pod
+ 	pod2man --section 1 --center="DOSE Tools" --release "$(NAME) $(VERSION)" doc/manpages/$*.pod > $@
+ 
++doc/manpages/%.5: doc/manpages/%.pod
++	pod2man --section 5 --center="DOSE Tools" --release "$(NAME) $(VERSION)" doc/manpages/$*.pod > $@
++
+ doc/manpages/%.html: doc/manpages/%.pod
+ 	pod2html doc/manpages/$*.pod > $@
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9dceec7..988143b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 binaries-prefix-edos
+manpages-section5
diff --git a/debian/rules b/debian/rules
index 1586968..8f79842 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_installman:
 	cd debian/dose-extra/usr/share/man/man1 \
 		&& mv outdated.1 dose-outdated.1 \
 		&& mv challenged.1 dose-challenged.1 \
-		&& mv ceve.1 dose-ceve.1
+		&& mv ceve.1 dose-ceve.1 
 	cd debian/dose-builddebcheck/usr/share/man/man1 \
 		&& mv buildcheck.1 dose-builddebcheck.1
 
@@ -32,7 +32,7 @@ override_dh_auto_build:
 	cd doc/debcheck-primer && $(MAKE) 
 	pod2man --section 8 \
 	  --release "apt-cudf $(shell dpkg-parsechangelog | grep ^Version: | cut -f 2 -d' ')" \
-	  debian/update-cudf-solvers > debian/update-cudf-solvers.8
+	debian/update-cudf-solvers > debian/update-cudf-solvers.8
 
 override_dh_auto_clean:
 	dh_auto_clean

-- 
dose3 packaging