[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 44b29d3cda8bbb7b7128f5c2185f82a844cc36be
Author: Ralf Treinen <treinen at free.fr>
Date:   Sun Jun 17 13:09:23 2012 +0200

    drop patch manpages-section5
    
    since it has been integrated in upstream version 3.0

diff --git a/debian/changelog b/debian/changelog
index 3059ad2..bf44c4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 dose3 (3.0-1) unstable; urgency=low
 
   * New upstream version
+  * Remove patch manpages-section5 which has been applied by upstream
 
- -- Ralf Treinen <treinen at debian.org>  Sun, 17 Jun 2012 13:03:54 +0200
+ -- Ralf Treinen <treinen at debian.org>  Sun, 17 Jun 2012 13:09:07 +0200
 
 dose3 (2.9.17-1) unstable; urgency=low
 
diff --git a/debian/patches/binaries-prefix-edos b/debian/patches/binaries-prefix-edos
index 080e3d3..26331ef 100644
--- a/debian/patches/binaries-prefix-edos
+++ b/debian/patches/binaries-prefix-edos
@@ -3,8 +3,8 @@ Description: all binaries have prefix dose-
 
 Index: dose3/doc/manpages/distcheck.pod
 ===================================================================
---- dose3.orig/doc/manpages/distcheck.pod	2012-05-31 10:25:52.000000000 +0200
-+++ dose3/doc/manpages/distcheck.pod	2012-05-31 10:25:54.000000000 +0200
+--- dose3.orig/doc/manpages/distcheck.pod	2012-06-17 13:03:04.000000000 +0200
++++ dose3/doc/manpages/distcheck.pod	2012-06-17 13:05:21.000000000 +0200
 @@ -1,25 +1,25 @@
  =head1 NAME
  
@@ -78,7 +78,7 @@ Index: dose3/doc/manpages/distcheck.pod
  
  =cut
  
-@@ -239,13 +239,13 @@
+@@ -272,13 +272,13 @@
  Check which packages in contrib are not installable when dependencies may
  be satisfied from main:
   
@@ -96,8 +96,8 @@ Index: dose3/doc/manpages/distcheck.pod
  =cut
 Index: dose3/doc/manpages/buildcheck.pod
 ===================================================================
---- dose3.orig/doc/manpages/buildcheck.pod	2012-05-31 10:25:52.000000000 +0200
-+++ dose3/doc/manpages/buildcheck.pod	2012-05-31 10:25:54.000000000 +0200
+--- dose3.orig/doc/manpages/buildcheck.pod	2012-05-31 21:24:01.000000000 +0200
++++ dose3/doc/manpages/buildcheck.pod	2012-06-17 13:05:21.000000000 +0200
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -132,8 +132,8 @@ Index: dose3/doc/manpages/buildcheck.pod
  <http://www.mancoosi.org> is the home page of the Mancoosi project. 
 Index: dose3/doc/manpages/outdated.pod
 ===================================================================
---- dose3.orig/doc/manpages/outdated.pod	2012-05-31 10:25:52.000000000 +0200
-+++ dose3/doc/manpages/outdated.pod	2012-05-31 10:25:54.000000000 +0200
+--- dose3.orig/doc/manpages/outdated.pod	2012-05-31 19:39:17.000000000 +0200
++++ dose3/doc/manpages/outdated.pod	2012-06-17 13:05:21.000000000 +0200
 @@ -1,16 +1,16 @@
  =head1 NAME
  
@@ -185,8 +185,8 @@ Index: dose3/doc/manpages/outdated.pod
   
 Index: dose3/doc/manpages/challenged.pod
 ===================================================================
---- dose3.orig/doc/manpages/challenged.pod	2012-05-31 10:25:52.000000000 +0200
-+++ dose3/doc/manpages/challenged.pod	2012-05-31 10:27:33.000000000 +0200
+--- dose3.orig/doc/manpages/challenged.pod	2012-06-17 13:03:04.000000000 +0200
++++ dose3/doc/manpages/challenged.pod	2012-06-17 13:06:17.000000000 +0200
 @@ -1,19 +1,19 @@
  =head1 NAME
  
@@ -239,8 +239,8 @@ Index: dose3/doc/manpages/challenged.pod
  
  =head1 SEE ALSO
  
--L<B<distcheck>(5)B<>>
--L<B<outdated>(5)B<>> 
+-L<B<distcheck>(1)B<>>
+-L<B<outdated>(1)B<>> 
 +L<B<dose-distcheck>(1)B<>>
 +L<B<dose-outdated>(1)B<>> 
  
@@ -248,8 +248,8 @@ Index: dose3/doc/manpages/challenged.pod
  
 Index: dose3/doc/manpages/ceve.pod
 ===================================================================
---- dose3.orig/doc/manpages/ceve.pod	2012-05-31 10:25:52.000000000 +0200
-+++ dose3/doc/manpages/ceve.pod	2012-05-31 10:25:54.000000000 +0200
+--- dose3.orig/doc/manpages/ceve.pod	2012-05-31 21:24:01.000000000 +0200
++++ dose3/doc/manpages/ceve.pod	2012-06-17 13:05:21.000000000 +0200
 @@ -1,18 +1,18 @@
  =head1 NAME
  
diff --git a/debian/patches/manpages-section5 b/debian/patches/manpages-section5
deleted file mode 100644
index 20d112f..0000000
--- a/debian/patches/manpages-section5
+++ /dev/null
@@ -1,28 +0,0 @@
-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 988143b..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 binaries-prefix-edos
-manpages-section5

-- 
dose3 packaging