[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.2-1-7-g4a9a15e
The following commit has been merged in the master branch: commit f9e91232fed156e5c94b63636d491325321699cc Author: Ralf Treinen trei...@pps.univ-paris-diderot.fr Date: Fri Sep 14 16:05:35 2012 +0200 fix version numbers in CUDF installation requests diff --git a/debian/changelog b/debian/changelog index 014516a..4e32631 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,11 @@ dose3 (3.0.2-2) unstable; urgency=low architectures. (closes: #685171). Extracted from the upstream git repository (commit 7c30da3d). Thanks to Pietro Abate for having fixed this. + * Patch apt-cudf-pinning: Fix version numbers in the package installation +requests in the translation process from EDSP to CUDF (closes: #687643). +Thanks to Pietro Abate for the patch! - -- Ralf Treinen trei...@debian.org Sat, 08 Sep 2012 13:29:48 +0200 + -- Ralf Treinen trei...@debian.org Fri, 14 Sep 2012 16:04:03 +0200 dose3 (3.0.2-1) unstable; urgency=low diff --git a/debian/patches/apt-cudf-pinning b/debian/patches/apt-cudf-pinning new file mode 100644 index 000..d101e58 --- /dev/null +++ b/debian/patches/apt-cudf-pinning @@ -0,0 +1,60 @@ +Author: Pietro Abate pietro.ab...@pps.jussieu.fr +Integrated: Ralf Treinen trei...@debian.org +Description: Fixes version numbers in CUDF installation requests + +diff --git a/applications/apt-cudf.ml b/applications/apt-cudf.ml +index ffbb872..5ae7fdc 100644 +--- a/applications/apt-cudf.ml b/applications/apt-cudf.ml +@@ -63,27 +63,37 @@ let print_progress ?i msg = + Format.printf Message: %s@. msg + ;; + ++ ++(* Debian specific assumption: only one version of a package ++ can be installed at a given time. ++ Hence, when a remove request is issued without version constraint, ++ we return (candidate.Cudf.package,None) that designates the only ++ package installed. ++ *) ++ + let make_request tables universe native_arch request = + let to_cudf (p,v) = (p,Debian.Debcudf.get_cudf_version tables (p,v)) in ++ let get_candidate (name,constr) = ++try ++ List.find ++ (fun pkg - ++try (Cudf.lookup_package_property pkg apt-candidate) = true ++with Not_found - false) ++ (CudfAdd.who_provides universe (name,constr)) ++with Not_found - ++ print_error Package %s does not have a suitable candidate name ++ in + let select_packages ?(remove=false) l = + List.map (fun ((n,a),c) - + let (name,constr) = Boilerplate.debvpkg ~native_arch to_cudf ((n,a),c) in +- let candidate = +-try +- List.find (fun pkg - +-if request.Edsp.strict_pin then +- try (Cudf.lookup_package_property pkg apt-candidate) = true +- with Not_found - false +-else +- true +- ) (CudfAdd.who_provides universe (name,constr)) +-with Not_found - +- print_error Package %s does not have a suitable candidate n +- in + if remove then +-(candidate.Cudf.package,None) ++(name,None) + else +-(candidate.Cudf.package,Some(`Eq,candidate.Cudf.version)) ++ match constr, request.Edsp.strict_pin with ++ None, false - (name, None) ++ | _, _ - (name,Some(`Eq,(get_candidate (name,constr)).Cudf.version)) ++(* FIXME: when apt will accept version constraints different from `Eq, ++ we will need to pass them through. *) + ) l + in + if request.Edsp.upgrade || request.Edsp.distupgrade then diff --git a/debian/patches/series b/debian/patches/series index 8405a18..b6ff5fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ binaries-prefix-edos version-3.0.2 multiarch-conflicts +apt-cudf-pinning -- 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/3.0.2-1-7-g4a9a15e
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 a2f69265323d8cead0882a731db582d3cc81). 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 000..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=Iname ++ ++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 [,Iname] ... + +-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
[Pkg-ocaml-maint-commits] [SCM] dose3 packaging branch, master, updated. debian/3.0.2-1-7-g4a9a15e
The following commit has been merged in the master branch: commit 4a9a15eec304d44fb88cff18ef0e08ddf1f32b43 Merge: 98f6b219477e01ed3f1be5839657f3f41a423bae f9e91232fed156e5c94b63636d491325321699cc Author: Ralf Treinen trei...@pps.univ-paris-diderot.fr Date: Wed Sep 26 17:22:26 2012 +0200 Merge branch 'bug687643' Conflicts: debian/changelog debian/patches/series diff --combined debian/changelog index 8bd567d,4e32631..5c26f4c --- a/debian/changelog +++ b/debian/changelog @@@ -2,14 -2,14 +2,17 @@@ dose3 (3.0.2-2) unstable; urgency=lo * Patch multiarch-conflicts: fix the translation of conflicts in case of multiarchs, a conflict on package p has to apply to p of all possible -architectures. (closes: #685171). Extracted from the upstream git -repository (commit 7c30da3d). Thanks to Pietro Abate for having fixed -this. +architectures. (closes: #685171). Patch extracted from the +3.0.2-hotfix branch of the upstream git repository (commit +a2f69265323d8cead0882a731db582d3cc81). Thanks to Pietro Abate for +having fixed this. - * Fix architecture options in the dose-builddebcheck manpage - (closes: #680271). + * Patch apt-cudf-pinning: Fix version numbers in the package installation + requests in the translation process from EDSP to CUDF (closes: #687643). + Thanks to Pietro Abate for the patch! ++ * Patch builddebcheck-manpage: Fix architecture options in the ++dose-builddebcheck manpage (closes: #680271). - -- Ralf Treinen trei...@debian.org Wed, 26 Sep 2012 17:16:02 +0200 - -- Ralf Treinen trei...@debian.org Fri, 14 Sep 2012 16:04:03 +0200 ++ -- Ralf Treinen trei...@debian.org Wed, 26 Sep 2012 17:21:15 +0200 dose3 (3.0.2-1) unstable; urgency=low diff --combined debian/patches/series index b77967d,b6ff5fe..4670029 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,4 +1,5 @@@ binaries-prefix-edos version-3.0.2 multiarch-conflicts +builddebcheck-manpage + apt-cudf-pinning -- 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
