The following commit has been merged in the master branch:
commit 65a47e5b374a55be99f3be8ee00cc6b7c65bbba2
Author: Ralf Treinen <trei...@free.fr>
Date:   Sun Jun 17 13:51:41 2012 +0200

    improvements in distcheck manpage

diff --git a/debian/changelog b/debian/changelog
index 69a31fb..ecee520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ dose3 (3.0-1) unstable; urgency=low
   * Remove patch manpages-section5 which has been applied by upstream
   * Install upstream's version of apt-cudf-get script an manpage, drop our
     version in debian/
+  * Patch manpage-distcheck: some improvements to distcheck manpage.
 
- -- Ralf Treinen <trei...@debian.org>  Sun, 17 Jun 2012 13:23:40 +0200
+ -- Ralf Treinen <trei...@debian.org>  Sun, 17 Jun 2012 13:50:36 +0200
 
 dose3 (2.9.17-1) unstable; urgency=low
 
diff --git a/debian/patches/manpage-distcheck b/debian/patches/manpage-distcheck
new file mode 100644
index 0000000..1bc53dd
--- /dev/null
+++ b/debian/patches/manpage-distcheck
@@ -0,0 +1,40 @@
+Author: Ralf Treinen <trei...@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 9dceec7..190adde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 binaries-prefix-edos
+manpage-distcheck

-- 
dose3 packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to