[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.1-1-6-ge953786

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 4a84c0151a82ce759ba643b1b618e39ae8132028
Author: Ralf Treinen <treinen at debian.org>
Date:   Mon Jun 25 15:51:32 2012 +0200

    drop patch manpage-distcheck
    
    since it has been integrated upstream now

diff --git a/debian/changelog b/debian/changelog
index 6b0197e..06864a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 dose3 (3.0.2-1) unstable; urgency=low
 
   * New upstream version.
+  * Remove patch manpage-distcheck which has been applied upstream
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 25 Jun 2012 15:45:39 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 25 Jun 2012 15:50:56 +0200
 
 dose3 (3.0.1-1) unstable; urgency=low
 
diff --git a/debian/patches/manpage-distcheck b/debian/patches/manpage-distcheck
deleted file mode 100644
index 1bc53dd..0000000
--- a/debian/patches/manpage-distcheck
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: improve description of multiarch options
-
-Index: dose3/doc/manpages/distcheck.pod
-===================================================================
---- dose3.orig/doc/manpages/distcheck.pod	2012-06-17 13:45:59.000000000 +0200
-+++ dose3/doc/manpages/distcheck.pod	2012-06-17 13:47:56.000000000 +0200
-@@ -136,22 +136,22 @@
- 
- =head2 DEBIAN SPECIFIC OPTIONS
- 
--=over 8
-+Multi-arch annotations are correctly considered by distcheck. Packages
-+whose's architecture is neither the native architecture nor in the list
-+of foreign architectures (see below) are ignored.
- 
--Multi-arch annotations are correctly considered by distcheck. Since the from a
--set of control stanzas it is impossible to determine the native and foreign
--architectures, the user can specify them using the following options. By
--default the native architecture is deduced by looking at the architecture of
--the first stanza that is not architecture all. All other packages with
--different architecture are ignored.
-+=over 8
- 
- =item B<--deb-native-arch=>I<name>
- 
--Specify the native architecture.
-+Specify the native architecture. The default behavior is to deduce
-+the native architecture from the first package stanza in the input
-+that has an architecture different from all.
- 
--=item B<--deb-foreign-archs=>I<name>
-+=item B<--deb-foreign-archs=>I<name> [,I<name>] ...
- 
--Specify a comma-separated list of foreign architectures.
-+Specify a comma-separated list of foreign architectures. The default
-+is an empty list of foreign architectures.
- 
- =item B<--deb-ignore-essential>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 190adde..9dceec7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 binaries-prefix-edos
-manpage-distcheck

-- 
dose3 packaging