[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.1-1-4-g4dd6a18

2009-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit c8aba839fc78bd19a5463d8771aca5cd0ed465be
Author: Ralf Treinen trei...@free.fr
Date:   Mon May 25 21:32:13 2009 +0200

add build-dependncy on hevea

diff --git a/debian/changelog b/debian/changelog
index e8d2de9..c89985d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,10 @@ pkglab (1.4.1-1) unstable; urgency=low
   * New upstream version.
   * debian/rules: put explicit MANDIR in install target
   * Create edos-distcheck package, providing at the moment only pscheck.
-  * Build and install pkglab documentation
+  * Build and install pkglab documentation, add build-dependency on hevea
   * Remove reference to dose in pkglab long description.
 
- -- Ralf Treinen trei...@debian.org  Mon, 25 May 2009 09:03:55 +0200
+ -- Ralf Treinen trei...@debian.org  Mon, 25 May 2009 21:31:55 +0200
 
 pkglab (1.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 9ed93bb..d93d327 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends:
  menhir,
  libdose2-ocaml-dev,
  libledit-ocaml-dev,
- libzip-ocaml-dev
+ libzip-ocaml-dev,
+ hevea
 Standards-Version: 3.8.1
 Homepage: http://sodiac.gforge.inria.fr/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pkglab.git

-- 
pkglab packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.1-1-4-g4dd6a18

2009-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit d722d0aef4060374d5a3c7d8b754261553469c06
Author: Ralf Treinen trei...@free.fr
Date:   Sat Jun 13 11:51:52 2009 +0200

merge in new upstream 1.4.2

diff --git a/debian/changelog b/debian/changelog
index c89985d..2ebef1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkglab (1.4.2-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Ralf Treinen trei...@debian.org  Sat, 13 Jun 2009 11:51:07 +0200
+
 pkglab (1.4.1-1) unstable; urgency=low
 
   * New upstream version.

-- 
pkglab packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.1-1-4-g4dd6a18

2009-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit 4dd6a188c810f72b1fa8329765a4282276bea010
Author: Ralf Treinen trei...@free.fr
Date:   Sat Jun 13 12:23:57 2009 +0200

fix missing quote before vesion (in documentation)

diff --git a/debian/changelog b/debian/changelog
index 2ebef1b..897f1e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 pkglab (1.4.2-1) unstable; urgency=low
 
   * New Upstream Version
+  * Merge in dql/help.ml and doc/pkglab.ml from upstream svn to fix
+missing quote before version strings (closes: #532771).
 
- -- Ralf Treinen trei...@debian.org  Sat, 13 Jun 2009 11:51:07 +0200
+ -- Ralf Treinen trei...@debian.org  Sat, 13 Jun 2009 12:23:21 +0200
 
 pkglab (1.4.1-1) unstable; urgency=low
 
diff --git a/doc/pkglab.tex b/doc/pkglab.tex
index 8da2705..1c4f74d 100644
--- a/doc/pkglab.tex
+++ b/doc/pkglab.tex
@@ -83,10 +83,10 @@ Pkglab knows several different types of objects:
   sets; used to track the contents of a distribution through times
   \item[Dates] (denoted: {\tt -MM-DD})
   \item[Date ranges] (denoted: {\tt [-MM-DD;-MM-DD]})
-  \item[Specifications] (denoted: {\tt [. kde (= 5.2) .]}) A selector
+  \item[Specifications] (denoted: {\tt [. kde (= '5.2) .]}) A selector
   on the versions of a unit, in this case all versions of the unit {\tt kde}
   greater than or equal to {\tt 5.2}. The version is optional;
-  {\tt [. kde .]} is a valid specification as well.
+  {\tt [. kde .]} is a valid specification as well. The spaces between the 
{\tt [.} brackets and the specification are necessary!
   \item[Sets] (denoted: {\tt \{a, b, \ldots\}})
   \item[Diagnoses] The result of a check operation: a list of packages that
   are not installable with their reasons.
@@ -98,7 +98,7 @@ It is possible to use variables: like in Unix shells, 
variable names are
 prefixed by a dollar sign ({\tt \$}). Assignment is done as follows:
 
 \codebox{
- \$a - select([. kde (= 5.2) .])
+ \$a - select([. kde (= '5.2) .])
 }
 
 Pkglab has the following operators:
diff --git a/dql/help.ml b/dql/help.ml
index 38b1865..5c66ccb 100644
--- a/dql/help.ml
+++ b/dql/help.ml
@@ -62,7 +62,7 @@ let help_string =
Simple   $; Red name; Tab; Tab; Tab; Tab; Simple 
Variable; Newline;
Simple   ; Red ; Simple -; Red mm; Simple -; Red 
dd; Tab; Tab; Tab; Simple Date; Newline;
Simple   [; Red date1; Simple ;; Red date2; Simple ]; 
Tab; Tab; Tab; Simple Date range; Newline;
-   Simple   [.; Red unit; Simple (; Red operator version; 
Simple ).]; Tab; Simple Version specification (e.g. [.kde (= 5.2).]); 
Newline;
+   Simple   [.; Red unit; Simple (; Red operator version; 
Simple ).]; Tab; Simple Version specification (e.g. [. kde (= '5.2) .]); 
Newline;
Tab; Tab; Tab; Tab; Simple (version part is optional); 
Newline;
Simple   {; Red e1; Simple ,; Red e2; Simple ,; Red 
...; Simple ,; Red en; Simple }; Tab; Tab; Simple Set construction; 
Newline;
Simple   ; Red set1; Simple |; Red set2; Simple  ; 
Red set1; Simple ; Red set2; Simple  ; Red set1; Simple \\; Red 
set2; Tab; Simple Set union/intersection/difference; Newline;

-- 
pkglab packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4.1-1-4-g4dd6a18

2009-06-13 Thread Ralf Treinen
The following commit has been merged in the master branch:
commit a4c336f22ea6cedce2bb56999580e8cd1fc1f7e4
Merge: c8aba839fc78bd19a5463d8771aca5cd0ed465be 
0fb479321ef696d473db850e9e160a878c33b55d
Author: Ralf Treinen trei...@free.fr
Date:   Sat Jun 13 11:51:06 2009 +0200

Merge commit 'upstream/1.4.2'


-- 
pkglab packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits