[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
The following commit has been merged in the master branch: commit ab774c090787829df675b03dd5473c6133c591b5 Merge: 976f6a56a85cf51d9e57fd06873ad2446cb9853d 92906aee94fa4a18f56bc7e88571d9cc2a473765 Author: Ralf Treinen trei...@free.fr Date: Sun Jun 17 13:03:04 2012 +0200 Merge tag 'upstream/3.0' Upstream version 3.0 -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
The following commit has been merged in the master branch: commit 7ba259ce4b89cbb4ce4a04a4c503ace99fe36db2 Author: Ralf Treinen trei...@free.fr Date: Sun Jun 17 13:04:06 2012 +0200 upstream 3.0 diff --git a/debian/changelog b/debian/changelog index 0fba91a..3059ad2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dose3 (3.0-1) unstable; urgency=low + + * New upstream version + + -- Ralf Treinen trei...@debian.org Sun, 17 Jun 2012 13:03:54 +0200 + dose3 (2.9.17-1) unstable; urgency=low * New upstream version. -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
The following commit has been merged in the master branch: commit 44b29d3cda8bbb7b7128f5c2185f82a844cc36be Author: Ralf Treinen trei...@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 trei...@debian.org Sun, 17 Jun 2012 13:03:54 +0200 + -- Ralf Treinen trei...@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.0 +0200 -+++ dose3/doc/manpages/distcheck.pod 2012-05-31 10:25:54.0 +0200 +--- dose3.orig/doc/manpages/distcheck.pod 2012-06-17 13:03:04.0 +0200 dose3/doc/manpages/distcheck.pod 2012-06-17 13:05:21.0 +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.0 +0200 -+++ dose3/doc/manpages/buildcheck.pod 2012-05-31 10:25:54.0 +0200 +--- dose3.orig/doc/manpages/buildcheck.pod 2012-05-31 21:24:01.0 +0200 dose3/doc/manpages/buildcheck.pod 2012-06-17 13:05:21.0 +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.0 +0200 -+++ dose3/doc/manpages/outdated.pod2012-05-31 10:25:54.0 +0200 +--- dose3.orig/doc/manpages/outdated.pod 2012-05-31 19:39:17.0 +0200 dose3/doc/manpages/outdated.pod2012-06-17 13:05:21.0 +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.0 +0200 -+++ dose3/doc/manpages/challenged.pod 2012-05-31 10:27:33.0 +0200 +--- dose3.orig/doc/manpages/challenged.pod 2012-06-17 13:03:04.0 +0200 dose3/doc/manpages/challenged.pod 2012-06-17 13:06:17.0 +0200 @@ -1,19 +1,19 @@ =head1 NAME @@ -239,8 +239,8 @@ Index: dose3/doc/manpages/challenged.pod =head1 SEE ALSO --LBdistcheck(5)B --LBoutdated(5)B +-LBdistcheck(1)B +-LBoutdated(1)B +LBdose-distcheck(1)B +LBdose-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.0 +0200 -+++ dose3/doc/manpages/ceve.pod2012-05-31 10:25:54.0 +0200 +--- dose3.orig/doc/manpages/ceve.pod 2012-05-31 21:24:01.0 +0200 dose3/doc/manpages/ceve.pod2012-06-17 13:05:21.0 +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..000 --- a/debian/patches/manpages-section5 +++ /dev/null @@ -1,28 +0,0 @@ -Author: Ralf Treinen trei...@debian.org -Description: apt-cudf.conf manpage has to be section 5, not 1 - -Index: dose3/Makefile -=== dose3.orig/Makefile2012-05-31 11:34:11.0 +0200 -+++ dose3/Makefile 2012-05-31 11:34:42.0 +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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
The following commit has been merged in the master branch: commit 68616ef2ad2265b4a2eea606e462d175474e7cff Author: Ralf Treinen trei...@free.fr Date: Sun Jun 17 13:18:49 2012 +0200 install upstream's apt-cudf-get instead of our own diff --git a/debian/apt-cudf-get b/debian/apt-cudf-get deleted file mode 100644 index cda9975..000 --- a/debian/apt-cudf-get +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -export APT_GET_CUDF_CMDLINE=apt-get $* -o APT::Solver::Strict-Pinning=\false\ -apt-get $* -o APT::Solver::Strict-Pinning=false diff --git a/debian/apt-cudf.install b/debian/apt-cudf.install index 5013c43..63003ee 100644 --- a/debian/apt-cudf.install +++ b/debian/apt-cudf.install @@ -1,5 +1,5 @@ usr/bin/apt-cudf -debian/update-cudf-solvers usr/sbin -debian/apt-cudf.conf etc -debian/apt-cudf-getusr/bin +debian/update-cudf-solvers usr/sbin +debian/apt-cudf.conf etc +applications/scripts/apt-cudf-get usr/bin diff --git a/debian/changelog b/debian/changelog index bf44c4b..581a3a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ 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/ - -- Ralf Treinen trei...@debian.org Sun, 17 Jun 2012 13:09:07 +0200 + -- Ralf Treinen trei...@debian.org Sun, 17 Jun 2012 13:17:41 +0200 dose3 (2.9.17-1) unstable; urgency=low -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
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..000 --- 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 Bapt-cudf-get [arguments] - -=back -=cut - -=head1 DESCRIPTION - -Bapt-cudf-get is a wrapper that allows to invoke Bapt-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 +Ipkg and -Ipkg shorthands for installation and removal requests. - -=head1 SEE ALSO - -Bapt-get(8), -Bapt-cudf(1), -Bapt-cudf.conf(5), -Bupdate-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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
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 000..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.0 +0200 dose3/doc/manpages/distcheck.pod 2012-06-17 13:47:56.0 +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=Iname + +-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=Iname ++=item B--deb-foreign-archs=Iname [,Iname] ... + +-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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
The following commit has been merged in the master branch: commit 769989d555db3ca03641202e992ec415f3a531b6 Merge: 65a47e5b374a55be99f3be8ee00cc6b7c65bbba2 cc861659f8eeb39cd8cffd1f87dbe24bee543e68 Author: Ralf Treinen trei...@free.fr Date: Sun Jun 17 14:54:42 2012 +0200 Merge tag 'upstream/3.0.1' Upstream version 3.0.1 -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/2.9.17-1-10-g2b3461c
The following commit has been merged in the master branch: commit 2b3461c536e843fcf660134dac5496cd7f7c6e55 Author: Ralf Treinen trei...@free.fr Date: Sun Jun 17 14:55:08 2012 +0200 upstream version 3.0.1 diff --git a/debian/changelog b/debian/changelog index ecee520..5468b37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dose3 (3.0-1) unstable; urgency=low +dose3 (3.0.1-1) unstable; urgency=low * New upstream version * Remove patch manpages-section5 which has been applied by upstream -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, pristine-tar, updated. 8210d01588abe7f7cdfb8b57db0a19d9a3cfc926
The following commit has been merged in the pristine-tar branch: commit 018a13fb1b36e578d6d9a53127c20ebb882c148a Author: Ralf Treinen trei...@free.fr Date: Sun Jun 17 13:03:03 2012 +0200 pristine-tar data for dose3_3.0.orig.tar.gz diff --git a/dose3_3.0.orig.tar.gz.delta b/dose3_3.0.orig.tar.gz.delta new file mode 100644 index 000..0015013 Binary files /dev/null and b/dose3_3.0.orig.tar.gz.delta differ diff --git a/dose3_3.0.orig.tar.gz.id b/dose3_3.0.orig.tar.gz.id new file mode 100644 index 000..93af971 --- /dev/null +++ b/dose3_3.0.orig.tar.gz.id @@ -0,0 +1 @@ +e91fbaaacb37fcedf3fc22f2b108f4eacf1bc899 -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging annotated tag, upstream/3.0, created. upstream/3.0
The annotated tag, upstream/3.0 has been created at 99e431fd29e97c3c61769e794bc18e70ae03afce (tag) tagging 92906aee94fa4a18f56bc7e88571d9cc2a473765 (commit) replaces upstream/2.9.17 tagged by Ralf Treinen on Sun Jun 17 13:03:03 2012 +0200 - Shortlog Upstream version 3.0 Ralf Treinen (1): Imported Upstream version 3.0 --- -- 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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging annotated tag, upstream/3.0.1, created. upstream/3.0.1
The annotated tag, upstream/3.0.1 has been created at ffc7a33b917070dbc995bca39c2657607878ec9f (tag) tagging cc861659f8eeb39cd8cffd1f87dbe24bee543e68 (commit) replaces upstream/3.0 tagged by Ralf Treinen on Sun Jun 17 14:54:42 2012 +0200 - Shortlog Upstream version 3.0.1 Ralf Treinen (1): Imported Upstream version 3.0.1 --- -- 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
