[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.2-4-7-g6df5dfd

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 6538ecf9271f73e89a22d4fe314970ecf04abf0b
Author: Ralf Treinen <treinen at free.fr>
Date:   Tue Aug 18 23:08:49 2009 +0200

    dont use xml encoding whe you don't have to
    force uing the good dose lib

diff --git a/debian/changelog b/debian/changelog
index edc0972..cb8f5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pkglab (1.4.2-5) unstable; urgency=low
+
+  * enforce dependency on version >= 1.4.2 of dose2 (which implements
+    correctly the Breaks field), say in edos-debcheck man page that
+    Breaks is treated like Conflicts.
+  * Do not use xml entities when printing version constraints unless 
+    xml mode has been required (closes: #539211).
+
+ -- Ralf Treinen <treinen at debian.org>  Mon, 17 Aug 2009 21:18:58 +0200
+
 pkglab (1.4.2-4) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 3f71fba..cc144c2 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
  cdbs, debhelper (>= 7),
  ocaml-nox, ocaml-findlib, dh-ocaml,
  menhir,
- libdose2-ocaml-dev,
+ libdose2-ocaml-dev (>= 1.4.2),
  libledit-ocaml-dev,
  libzip-ocaml-dev,
  hevea
diff --git a/debian/manpages/edos-debcheck.1 b/debian/manpages/edos-debcheck.1
index 8f25f65..705f184 100644
--- a/debian/manpages/edos-debcheck.1
+++ b/debian/manpages/edos-debcheck.1
@@ -25,7 +25,8 @@ packages if there exists a subset of the packages that
  - contains at most one version for each package name
  - contains the goal package (in any version, or a specific version)
  - all packages of the subset have their dependencies and conflicts satisfied 
-in this subset.
+in this subset. Pre-depends are treated like Depends, and Breaks are
+treated like Conflicts.
 
 Debcheck checks whether every package given as argument is installable with
 respect to the input set of packages. Specific versions can be specified by
diff --git a/distcheck/common.ml b/distcheck/common.ml
index d8799e7..dfa5baa 100644
--- a/distcheck/common.ml
+++ b/distcheck/common.ml
@@ -89,19 +89,28 @@ let pkg_xml_of p_id =
 		| Some rn -> "-" ^ rn);;
 
 let spec_string s =
-let version_string (v, r) =
-	let vn = Version_index.get_version v
-	and rn = Release_index.get_version r in
-	vn ^ (match rn with None -> "" | Some r -> r) in
-begin
-	match s with
+  let version_string (v, r) =
+    let vn = Version_index.get_version v
+    and rn = Release_index.get_version r in
+      vn ^ (match rn with None -> "" | Some r -> r) in
+    if !output_xml
+    then
+      match s with
 	| Sel_ANY -> ""
 	| Sel_LT v -> Printf.sprintf " (&lt; %s)" (version_string v) 
 	| Sel_LEQ v -> Printf.sprintf " (&lt;= %s)" (version_string v) 
 	| Sel_EQ v -> Printf.sprintf " (= %s)" (version_string v) 
 	| Sel_GEQ v -> Printf.sprintf " (&gt;= %s)" (version_string v) 
-	| Sel_GT v -> Printf.sprintf " (&gt; %s)" (version_string v) 
-end;;
+	| Sel_GT v -> Printf.sprintf " (&gt; %s)"  (version_string v) 
+    else
+      match s with
+	| Sel_ANY -> ""
+	| Sel_LT v -> Printf.sprintf " (< %s)" (version_string v) 
+	| Sel_LEQ v -> Printf.sprintf " (<= %s)" (version_string v) 
+	| Sel_EQ v -> Printf.sprintf " (= %s)" (version_string v) 
+	| Sel_GEQ v -> Printf.sprintf " (>= %s)" (version_string v) 
+	| Sel_GT v -> Printf.sprintf " (> %s)"  (version_string v) 
+;;
 
 (* the check will be restricted to the packages whose names are in pkgs_only, *)
 (* in case pkgs_to_check_set is true *)
diff --git a/dql/.depend b/dql/.depend
deleted file mode 100644
index 69a0885..0000000
--- a/dql/.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-query.cmo: 
-query.cmx: 
-help.cmo: help.cmi 
-help.cmx: help.cmi 
-gregorian.cmo: gregorian.cmi 
-gregorian.cmx: gregorian.cmi 
-cache.cmo: cache.cmi 
-cache.cmx: cache.cmi 
-error.cmo: error.cmi 
-error.cmx: error.cmi 
-interpreter.cmo: query.cmo lexic.cmi help.cmi interpreter.cmi 
-interpreter.cmx: query.cmx lexic.cmi help.cmx interpreter.cmi 
-help.cmi: 
-gregorian.cmi: 
-cache.cmi: 
-error.cmi: 
-interpreter.cmi: query.cmo 
-lexic.cmi: 

-- 
pkglab packaging