The following commit has been merged in the master branch:
commit 98f6b219477e01ed3f1be5839657f3f41a423bae
Author: Ralf Treinen <trei...@pps.univ-paris-diderot.fr>
Date:   Wed Sep 26 17:16:51 2012 +0200

    fix architecture options in buildebcheck manpage

diff --git a/debian/changelog b/debian/changelog
index 625cbd3..8bd567d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ dose3 (3.0.2-2) unstable; urgency=low
     3.0.2-hotfix branch of the upstream git repository (commit
     a2f69265323d8cead088eeee2a731db582d3cc81). Thanks to Pietro Abate for
     having fixed this.
+  * Fix architecture options in the dose-builddebcheck manpage
+    (closes: #680271).
 
- -- Ralf Treinen <trei...@debian.org>  Wed, 26 Sep 2012 16:57:24 +0200
+ -- Ralf Treinen <trei...@debian.org>  Wed, 26 Sep 2012 17:16:02 +0200
 
 dose3 (3.0.2-1) unstable; urgency=low
 
diff --git a/debian/patches/builddebcheck-manpage 
b/debian/patches/builddebcheck-manpage
new file mode 100644
index 0000000..c19b918
--- /dev/null
+++ b/debian/patches/builddebcheck-manpage
@@ -0,0 +1,42 @@
+Author: Ralf Treinen
+Description: Fix the description of architecture options in the buildcheck
+ manpage
+Debian-bug: #680271
+
+--- a/doc/manpages/buildcheck.pod
++++ b/doc/manpages/buildcheck.pod
+@@ -41,17 +41,30 @@ control stanzas, separated by one blank line. For 
instance, the Sources files
+ as found on a Debian mirror server, or in the directory I</var/lib/apt/lists/>
+ of a Debian system, are suitable. 
+ 
++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. Here, native
++and foreign refers at the same time to the architecture on which the
++compilation will be run, and to the target architecture of the
++compilation. Cross-compilation is not supported in the current
++version.
++
+ =cut
+ 
+ =head1 OPTIONS
+ 
+ =over 8
+ 
+-=item B<-a --architecture > 
++=item B<--deb-native-arch=>I<name>
++
++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> [,I<name>] ...
+ 
+-Specify the architecture for which installability of build
+-environments should be checked. This argument is (in the current version
+-of this program) mandatory. 
++Specify a comma-separated list of foreign architectures. The default
++is an empty list of foreign architectures.
+ 
+ =item B<-f --failures> 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8405a18..b77967d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 binaries-prefix-edos
 version-3.0.2
 multiarch-conflicts
+builddebcheck-manpage

-- 
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