[Pkg-ocaml-maint-commits] [SCM] hevea packaging branch, experimental/master, updated. debian/1.10-14-21-gc837b65
The following commit has been merged in the experimental/master branch: commit c837b6506050601ffeb4961ec79281bf7874c44b Author: Ralf Treinen trei...@pps.univ-paris-diderot.fr Date: Wed Sep 26 11:48:06 2012 +0200 dropped README.Debian which is no longer needed since debian and upstream now agree on the default image format diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index ad92244..000 --- a/debian/README.Debian +++ /dev/null @@ -1,13 +0,0 @@ -Debian README for hevea - -This version of HeVeA is patched to generate by default PNG picture -files instead of GIF. The patch follows the instructions in Section 9.5 -of the HeVeA manual: - -- redefined \heveaimageext in latexcommon.hva -- patched the imagen script to generate png by default - -See the man pages hevea(1) and imagen(1) for how to generate gif. - --- Ralf Treinen trei...@debian.org diff --git a/debian/changelog b/debian/changelog index acb4c28..7eb001d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,11 @@ hevea (2.00-1) experimental; urgency=low - dropped the paragraph on using a different default image format as upstream, since it no longer applies. - small improvements in description of options. + * debian/README.Debian +- dropped this file, it no longer applies since debian and upstream now + use the same default image format. - -- Ralf Treinen trei...@debian.org Mon, 24 Sep 2012 16:08:42 +0200 + -- Ralf Treinen trei...@debian.org Wed, 26 Sep 2012 11:47:21 +0200 hevea (1.10-14) unstable; urgency=low -- hevea 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] hevea packaging annotated tag, debian/2.00-1, created. debian/2.00-1
The annotated tag, debian/2.00-1 has been created at e7adb9f878fb96374aa04aeca28c550ed8d9 (tag) tagging c837b6506050601ffeb4961ec79281bf7874c44b (commit) replaces debian/1.10-14 tagged by Ralf Treinen on Wed Sep 26 11:59:42 2012 +0200 - Shortlog Debian release 2.00-1 Ralf Treinen (17): Imported Upstream version 2.00 Merge tag 'upstream/2.00' into experimental/master Start new package 2.00-1 (new upstream 2.00) dropped patch gs-options, applied now by upstream debian/rules: pass DESTDIR in the install target, not config target debian/copyright: format 1.0 standards-version 3.9.3 drop duplicate installation of imagen minor improvements in changelog update hevea.1 manpage update hacha manpage update hacha manpage. More small improvements of hevea manpage. fixed a minor formatting problem in hacha manpage update imagen manpage symbolic link for /usr/bin/imagen from /usr/share/hevea dropped Sylvain Le Gall from uploaders dropped README.Debian which is no longer needed --- -- hevea 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-4-gb12ae0e
The following commit has been merged in the master branch:
commit b12ae0e30920c20aa448ce3f731922981173eeca
Author: Ralf Treinen trei...@pps.univ-paris-diderot.fr
Date: Wed Sep 26 16:52:13 2012 +0200
patch multiarch-conflicts: replace our own patch that was cherry-picked from
the master branch of the upstream git, by a patch that was created by
upstream
on top of version 3.0.2
diff --git a/debian/changelog b/debian/changelog
index 014516a..625cbd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,11 +2,12 @@ dose3 (3.0.2-2) unstable; urgency=low
* 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.
- -- Ralf Treinen trei...@debian.org Sat, 08 Sep 2012 13:29:48 +0200
+ -- Ralf Treinen trei...@debian.org Wed, 26 Sep 2012 16:57:24 +0200
dose3 (3.0.2-1) unstable; urgency=low
diff --git a/debian/patches/multiarch-conflicts
b/debian/patches/multiarch-conflicts
index 12188bd..25b3d8c 100644
--- a/debian/patches/multiarch-conflicts
+++ b/debian/patches/multiarch-conflicts
@@ -1,67 +1,94 @@
-Index: dose3/deb/debcudf.ml
-===
dose3.orig/deb/debcudf.ml 2012-09-08 14:06:46.0 +0200
-+++ dose3/deb/debcudf.ml 2012-09-08 14:14:46.0 +0200
-@@ -320,27 +320,66 @@
+--- a/deb/debcudf.ml
b/deb/debcudf.ml
+@@ -12,6 +12,7 @@
+ (** Debian Specific Cudf conversion routines *)
+
++module SSet = Set.Make(String)
+ open ExtLib
+ open Common
+ open Packages
+@@ -20,7 +21,7 @@ include Util.Logging(struct let label = __FILE__ end) ;;
+ module SMap = Map.Make (String)
+
+ type tables = {
+- virtual_table : unit Util.StringHashtbl.t;
++ virtual_table : SSet.t ref Util.StringHashtbl.t;
+ unit_table : unit Util.StringHashtbl.t ;
+ versions_table : int Util.StringHashtbl.t;
+ versioned_table : unit Util.StringHashtbl.t;
+@@ -93,9 +94,14 @@ let add_v table k v =
+ if not(Hashtbl.mem table k) then
+ Hashtbl.add table k v
+
++let add_s h k v =
++ try let s = Util.StringHashtbl.find h k in s := SSet.add v !s
++ with Not_found - Util.StringHashtbl.add h k (ref (SSet.singleton v))
++;;
++
+ (* collect names of virtual packages *)
+ let init_virtual_table table pkg =
+- List.iter (fun ((name,_),_) - add table name ()) pkg.provides
++ List.iter (fun ((name,_),_) - add_s table name pkg.name) pkg.provides
+
+ (* collect names of real packages *)
+ let init_unit_table table pkg =
+@@ -321,26 +327,88 @@ let add_extra extras tables pkg =
let tocudf tables ?(options=default_options) ?(inst=false) pkg =
if options.native then begin
--let _name = add_arch options.native pkg.architecture pkg.name in
+ let _name = add_arch options.native pkg.architecture pkg.name in
-let version = get_cudf_version tables (pkg.name,pkg.version) in
--let _provides =
++let _version = get_cudf_version tables (pkg.name,pkg.version) in
++
+ let _provides =
- let l =
--match pkg.multiarch with
++ let pr = CudfAdd.encode pkg.name,None in
++ let multiarchprovides =
+ match pkg.multiarch with
-|`None - [(CudfAdd.encode pkg.name,None)]
-|`Foreign - List.map (fun arch - (add_arch options.native arch
pkg.name,Some(`Eq,version))) options.foreign
-|`Allowed - [(CudfAdd.encode pkg.name,None) ; (CudfAdd.encode
(pkg.name^:any),None)]
-|`Same - []
- in
- l@(add_arch_l options.native pkg.architecture (loadlp tables
pkg.provides))
-+let pkgarch = pkg.architecture (* binary package : dependencies are
package specific *)
-+in
-+let _name = add_arch options.native pkgarch pkg.name
-+in
-+let _version = get_cudf_version tables (pkg.name,pkg.version) in
-+let _provides = match pkg.multiarch with
-+ |`None -
-+ (* only arch-less package and pkgarch provides *)
-+ (CudfAdd.encode pkg.name,None)::
-+ (add_arch_l options.native pkgarch (loadlp tables pkg.provides))
-+ |`Foreign -
-+ (* packages of same name and version of itself in all archs except
its own
-+each package this package provides is provided in all arches *)
-+ List.flatten (
-+List.map (function
-+ |arch when arch = pkgarch -
-+ (add_arch_l options.native arch (loadlp tables
pkg.provides))
-+ |arch -
-+ (add_arch options.native arch pkg.name,Some(`Eq,_version))
::
++|`None -
++ (* only arch-less package and
[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
