The following commit has been merged in the master branch:
commit 0c85d7aa0b73bb3d33ef0a0a9364ba490ee7e2cf
Author: Ralf Treinen <trei...@free.fr>
Date:   Sun Jun 17 13:24:34 2012 +0200

    install upstream's manpage of apt-cudf-get instead of our own

diff --git a/debian/apt-cudf-get.pod b/debian/apt-cudf-get.pod
deleted file mode 100644
index 991cde3..0000000
--- a/debian/apt-cudf-get.pod
+++ /dev/null
@@ -1,61 +0,0 @@
-=head1 NAME
-
-apt-cudf-get - wrapper for calling apt-get with external solvers
-
-=head1 SYNOPSIS
-
-=over
-
-=item B<apt-cudf-get> [arguments]
-
-=back
-=cut
-
-=head1 DESCRIPTION
-
-B<apt-cudf-get> is a wrapper that allows to invoke B<apt-get> with
-external solvers while ignoring apt's pinning.
-
-All options are passed on to apt-get.
-
-Normally, apt uses so-called pinning to select a candidate version of
-a package in case there are several versions available. This also
-holds when calling apt-get with external solvers. However, when it is
-not possible to find a solution under this constraint, it may be
-useful to relax pinning and to allow the external solver to choose
-among all available versions of packages in order to satisfy
-dependencies, not only those that are selected by the pinning.  This
-is precisely what apt-cudf-get does.
-
-Note that, when using an external solver, the proposed solution may
-contain any available version of the packages that are given as
-arguments to install on the command line without specifying a version
-qualifier.
-
-For example
-
-    apt-cudf-get --solver aspcud install ocaml
-
-may propose to install any available version of ocaml, while
-
-    apt-cudf-get --solver aspcud install ocaml=4.01.0
-
-will only propose to install ocaml in version 4.01.0
-
-=head1 AUTHOR
-
-Pietro Abate and Roberto Di Cosmo
-
-=head1 BUGS
-
-Not all types of arguements to apt are correctly treated by this wrapper,
-in particular not the +I<pkg> and -I<pkg> shorthands for installation and 
removal requests.
-
-=head1 SEE ALSO
-
-B<apt-get>(8),
-B<apt-cudf>(1),
-B<apt-cudf.conf>(5),
-B<update-cudf-solvers>(8),
-README.cudf-solvers <file:///usr/share/doc/apt-cudf/README.cudf-solvers>,
-README.Debian <file:///usr/share/doc/apt-cudf/README.Debian>
diff --git a/debian/apt-cudf.manpages b/debian/apt-cudf.manpages
index 0963dd9..b1e814d 100644
--- a/debian/apt-cudf.manpages
+++ b/debian/apt-cudf.manpages
@@ -1,5 +1,5 @@
 doc/manpages/apt-cudf.1
 doc/manpages/apt-cudf.conf.5
+doc/manpages/apt-cudf-get.8
 debian/update-cudf-solvers.8
-debian/apt-cudf-get.8
 
diff --git a/debian/changelog b/debian/changelog
index 581a3a2..69a31fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,10 @@ dose3 (3.0-1) unstable; urgency=low
 
   * New upstream version
   * Remove patch manpages-section5 which has been applied by upstream
-  * Install upstream's version of apt-cudf-get, drop our version in debian/
+  * Install upstream's version of apt-cudf-get script an manpage, drop our
+    version in debian/
 
- -- Ralf Treinen <trei...@debian.org>  Sun, 17 Jun 2012 13:17:41 +0200
+ -- Ralf Treinen <trei...@debian.org>  Sun, 17 Jun 2012 13:23:40 +0200
 
 dose3 (2.9.17-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 0ad93a8..2416809 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,6 @@ override_dh_auto_build:
        cd doc/debcheck-primer && $(MAKE) 
        pod2man --section 8 -release "apt-cudf $(RELEASE)" \
                debian/update-cudf-solvers > debian/update-cudf-solvers.8
-       pod2man --section 8 --release "apt-cudf $(RELEASE)" \
-               debian/apt-cudf-get.pod > debian/apt-cudf-get.8
 
 override_dh_auto_clean:
        dh_auto_clean

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