[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.8.1-2-3-g915ed01

2012-06-12 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit c965a573078a885839c2d9c6ecf1350ba66dd64a
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 12 15:19:19 2012 +0200

Fully qualify name of input'ed files

diff --git a/debian/changelog b/debian/changelog
index 29a0055..786d9dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mlpost (0.8.1-3) UNRELEASED; urgency=low
+
+  * Since context (= 2012.05.23.20120524-1), mp-tool.mp and mp-spec.mp
+are no longer provided. Instead, context provide .mpii and .mpiv files.
+- add 0005-Fully-qualify-name-of-input-ed-files.patch
+- {build-,}depend on context (= 2012.05.23.20120524-1~)
+(Closes: #676116, #676127).
+
+ -- Mehdi Dogguy me...@debian.org  Tue, 12 Jun 2012 15:01:00 +0200
+
 mlpost (0.8.1-2) unstable; urgency=low
 
   * Set OCAMLFIND_DESTDIR at configure time, so that the paths compiled
diff --git a/debian/control b/debian/control
index 96fd2c3..9d0d5ac 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  ocaml-findlib,
  ocaml-nox (= 3.11.1-3~)
 Build-Depends-Indep:
- context,
+ context (= 2012.05.23.20120524-1~),
  texlive-latex-base,
  texlive-latex-recommended,
  texlive-metapost,
@@ -26,7 +26,7 @@ Vcs-Git: 
git://git.debian.org/git/pkg-ocaml-maint/packages/mlpost.git
 Package: mlpost
 Architecture: any
 Depends:
- context,
+ context (= 2012.05.23.20120524-1~),
  texlive-latex-base,
  texlive-latex-recommended,
  texlive-metapost,
@@ -64,7 +64,7 @@ Recommends:
  libmlpost-ocaml-doc,
  ocaml-findlib
 Suggests:
- context,
+ context (= 2012.05.23.20120524-1~),
  texlive-latex-base,
  texlive-latex-recommended,
  texlive-metapost,
diff --git a/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch 
b/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
index 2946250..8c3d8cf 100644
--- a/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
+++ b/debian/patches/0001-Do-not-remove-ocamlbuild.Makefile.patch
@@ -1,6 +1,6 @@
 From: Stephane Glondu st...@glondu.net
 Date: Fri, 21 May 2010 15:53:08 +0200
-Subject: [PATCH] Do not remove ocamlbuild.Makefile
+Subject: Do not remove ocamlbuild.Makefile
 
 This file is present in upstream tarball; do not remove it so that the
 tree is in the same state as freshly unpacked after distclean.
@@ -8,7 +8,7 @@ tree is in the same state as freshly unpacked after distclean.
 Signed-off-by: Stephane Glondu st...@glondu.net
 ---
  ocamlbuild.Makefile |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ocamlbuild.Makefile b/ocamlbuild.Makefile
 index ef32e7d..f8ee8ec 100644
diff --git a/debian/patches/0002-Create-man-dir-before-installing-into-it.patch 
b/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
index 0fad413..c132a04 100644
--- a/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
+++ b/debian/patches/0002-Create-man-dir-before-installing-into-it.patch
@@ -1,11 +1,11 @@
 From: Stephane Glondu st...@glondu.net
 Date: Fri, 21 May 2010 17:16:12 +0200
-Subject: [PATCH] Create man dir before installing into it
+Subject: Create man dir before installing into it
 
 Signed-off-by: Stephane Glondu st...@glondu.net
 ---
  Makefile.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index 07301a8..d4e835e 100644
diff --git a/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch 
b/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
index 56c4aec..8d70b95 100644
--- a/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
+++ b/debian/patches/0003-Fix-hyphen-escapes-in-manpage.patch
@@ -1,11 +1,11 @@
 From: Stephane Glondu st...@glondu.net
 Date: Sat, 22 May 2010 21:27:27 +0200
-Subject: [PATCH] Fix hyphen escapes in manpage
+Subject: Fix hyphen escapes in manpage
 
 Signed-off-by: Stephane Glondu st...@glondu.net
 ---
  mlpost.1 |   12 ++--
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/mlpost.1 b/mlpost.1
 index b41ec62..11afcb7 100644
diff --git 
a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch 
b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
index b00352c..a711aeb 100644
--- a/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
+++ b/debian/patches/0004-myocamlmacroparser-use-.byte-instead-of-.native.patch
@@ -1,11 +1,11 @@
 From: Stephane Glondu st...@glondu.net
 Date: Sat, 22 May 2010 22:29:34 +0200
-Subject: [PATCH] myocamlmacroparser: use .byte instead of .native
+Subject: myocamlmacroparser: use .byte instead of .native
 
 Signed-off-by: Stephane Glondu st...@glondu.net
 ---
  myocamlbuild.ml.in |4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/myocamlbuild.ml.in 

[Pkg-ocaml-maint-commits] [SCM] mlpost packaging branch, master, updated. debian/0.8.1-2-3-g915ed01

2012-06-12 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit 9ce9ca5ccba3b6d6b6dd0ba7d88ce813c7d138c7
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 12 15:19:55 2012 +0200

Use Breaks instead of Conflicts with mlpost ( 0.8.1).

diff --git a/debian/changelog b/debian/changelog
index 786d9dd..9f18a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ mlpost (0.8.1-3) UNRELEASED; urgency=low
 - add 0005-Fully-qualify-name-of-input-ed-files.patch
 - {build-,}depend on context (= 2012.05.23.20120524-1~)
 (Closes: #676116, #676127).
+  * Use Breaks instead of Conflicts with mlpost ( 0.8.1).
 
  -- Mehdi Dogguy me...@debian.org  Tue, 12 Jun 2012 15:01:00 +0200
 
diff --git a/debian/control b/debian/control
index 9d0d5ac..8c25d4f 100644
--- a/debian/control
+++ b/debian/control
@@ -72,7 +72,7 @@ Suggests:
  ghostscript,
  imagemagick
 Replaces: mlpost ( 0.8.1)
-Conflicts: mlpost ( 0.8.1)
+Breaks: mlpost ( 0.8.1)
 Description: Objective Caml interface to Metapost (library)
  Mlpost is an OCaml library for scientific drawing. It relies on
  Metapost, giving the possibility to include (La)TeX fragments.
@@ -89,7 +89,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Enhances: libmlpost-ocaml-dev
 Replaces: mlpost ( 0.8.1)
-Conflicts: mlpost ( 0.8.1)
+Breaks: mlpost ( 0.8.1)
 Description: Objective Caml interface to Metapost (doc)
  Mlpost is an OCaml library for scientific drawing. It relies on
  Metapost, giving the possibility to include (La)TeX fragments.

-- 
mlpost 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] mlpost packaging branch, master, updated. debian/0.8.1-2-3-g915ed01

2012-06-12 Thread Mehdi Dogguy
The following commit has been merged in the master branch:
commit 915ed013d975a1275fc99de82605b91dc77bd518
Author: Mehdi Dogguy me...@debian.org
Date:   Tue Jun 12 15:22:18 2012 +0200

Bump Standards-Version to 3.9.3 (no changes)

diff --git a/debian/changelog b/debian/changelog
index 9f18a39..49fc053 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ mlpost (0.8.1-3) UNRELEASED; urgency=low
 - {build-,}depend on context (= 2012.05.23.20120524-1~)
 (Closes: #676116, #676127).
   * Use Breaks instead of Conflicts with mlpost ( 0.8.1).
+  * Bump Standards-Version to 3.9.3 (no changes)
 
  -- Mehdi Dogguy me...@debian.org  Tue, 12 Jun 2012 15:01:00 +0200
 
diff --git a/debian/control b/debian/control
index 8c25d4f..117a36d 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep:
  texlive-metapost,
  ghostscript,
  imagemagick
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 Section: tex
 Homepage: http://mlpost.lri.fr/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mlpost.git

-- 
mlpost 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