[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 8b92b28dc7a94cb719654a9694363196e638e6ff Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 20:19:01 2011 +0200 Unbreak the watch file Upstream decided to HTML-encode some 0s as #48; in the webpages, so we have to decode them in the watch file. diff --git a/debian/watch b/debian/watch index 3d5abfb..74012d6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 -opts=dversionmangle=s/\+debian\d*$// \ -http://download.camlcity.org/download/findlib-(\d+.*)\.tar\.gz +opts=dversionmangle=s/\+debian\d*$//,uversionmangle=s/#48\x3b/0/g \ +http://download.camlcity.org/download/findlib-(\d+\..*)\.tar\.gz -- findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit d5ad41f3f121f3bb0bb30e6bcefb64b4721dce05 Merge: 8b92b28dc7a94cb719654a9694363196e638e6ff 28cc2e780093efdc3ba3accdbf8a248590f902b1 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 21:32:11 2011 +0200 Merge branch 'upstream' -- findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit a62724c5a3d21578b4d2cd3e574fbde66504af66 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 21:37:28 2011 +0200 New upstream release diff --git a/debian/changelog b/debian/changelog index 35c3cdf..0607ed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +findlib (1.2.7+debian-1) unstable; urgency=low + + * New upstream release + + -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011 21:34:08 +0200 + findlib (1.2.6+debian-2) unstable; urgency=low * Updated 0002-Extra-configuration-search-path.patch -- findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit bcfc0148219a6b9b22b06167f91c04e4e0b5fb1f Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 21:40:00 2011 +0200 Refresh patches diff --git a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch index 8b1a522..090d6d0 100644 --- a/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch +++ b/debian/patches/0001-Change-standard-directories-to-conform-our-own-polic.patch @@ -1,6 +1,6 @@ From: Stefano Zacchiroli z...@debian.org Date: Sat, 12 Feb 2011 10:17:31 +0100 -Subject: [PATCH] Change standard directories to conform our own policy +Subject: Change standard directories to conform our own policy Patch upstream findlib.conf.in so that: - default manual installation dir is /usr/local/lib/ocaml/version diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch index 486ca3f..7a5e351 100644 --- a/debian/patches/0002-Extra-configuration-search-path.patch +++ b/debian/patches/0002-Extra-configuration-search-path.patch @@ -1,6 +1,6 @@ From: Stefano Zacchiroli z...@debian.org Date: Sat, 12 Feb 2011 10:21:40 +0100 -Subject: [PATCH] Extra configuration search path +Subject: Extra configuration search path Support for an extra, debian-specific, dir where to look for configuration file snippets (namely /usr/share/ocaml-findlib/). @@ -12,11 +12,11 @@ Signed-off-by: Stephane Glondu st...@glondu.net src/findlib/findlib_config.mlp |1 + 2 files changed, 9 insertions(+), 1 deletions(-) -Index: findlib/src/findlib/findlib.ml -=== findlib.orig/src/findlib/findlib.ml2011-04-04 19:58:12.0 -0500 -+++ findlib/src/findlib/findlib.ml 2011-04-04 20:06:33.0 -0500 -@@ -103,6 +103,8 @@ +diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml +index b8dbdc5..828544b 100644 +--- a/src/findlib/findlib.ml b/src/findlib/findlib.ml +@@ -103,6 +103,8 @@ let init let configd_file = config_file ^ .d in @@ -25,7 +25,7 @@ Index: findlib/src/findlib/findlib.ml let vars_of_file f = let ch = open_in f in try -@@ -140,12 +142,17 @@ +@@ -140,12 +142,17 @@ let init vars_of_file config_file else [] in @@ -44,10 +44,10 @@ Index: findlib/src/findlib/findlib.ml if vars [] then ( let lookup name default = try Fl_metascanner.lookup name config_preds vars -Index: findlib/src/findlib/findlib_config.mlp -=== findlib.orig/src/findlib/findlib_config.mlp2011-04-04 19:58:12.0 -0500 -+++ findlib/src/findlib/findlib_config.mlp 2011-04-04 20:04:07.0 -0500 +diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp +index 5b4ab69..09d0089 100644 +--- a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp @@ -4,6 +4,7 @@ *) @@ -56,3 +56,4 @@ Index: findlib/src/findlib/findlib_config.mlp let ocaml_stdlib = @STDLIB@;; +-- diff --git a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch index 0e17081..f1c8f17 100644 --- a/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch +++ b/debian/patches/0003-META.num-bugfix-moved-directory-directive-outside-co.patch @@ -1,6 +1,7 @@ From: Stefano Zacchiroli z...@debian.org Date: Sat, 12 Feb 2011 10:23:55 +0100 -Subject: [PATCH] META.num*: bugfix, moved directory directive outside core subpackage +Subject: META.num*: bugfix, moved directory directive outside core + subpackage --- site-lib-src/num-top/META.in |1 + -- findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch:
commit bba1e3704ab7d60d1149cfb9bcec3280b2684c27
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date: Mon Jun 27 21:40:40 2011 +0200
Add patch to make Camlp4 depend on Dynlink on all arches (Closes: #630490)
diff --git a/debian/changelog b/debian/changelog
index 0607ed6..3651ea9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
findlib (1.2.7+debian-1) unstable; urgency=low
* New upstream release
+ * Add patch to make Camlp4 depend on Dynlink on every arch (Closes:
+#630490)
- -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011
21:34:08 +0200
+ -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011
21:37:42 +0200
findlib (1.2.6+debian-2) unstable; urgency=low
diff --git
a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
new file mode 100644
index 000..6e5dc32
--- /dev/null
+++ b/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
@@ -0,0 +1,31 @@
+From: Nicolas Dandrimont nicolas.dandrim...@crans.org
+Date: Tue, 14 Jun 2011 15:21:31 +0200
+Subject: Camlp4 depends on Dynlink on every architecture
+
+---
+ site-lib-src/camlp4.310/META.in |4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in
+index 637d848..a490ab1 100644
+--- a/site-lib-src/camlp4.310/META.in
b/site-lib-src/camlp4.310/META.in
+@@ -6,7 +6,7 @@ dnl This file is input of the m4 macro processor.
+ `directory = 'camlp4_dir`'
+
+ `# For the toploop:'
+-`requires(byte,toploop) = 'camlp4_dynlink`'
++`requires(byte,toploop) = dynlink'
+ `archive(byte,toploop,camlp4o) = camlp4o.cma'
+ `archive(byte,toploop,camlp4r) = camlp4r.cma'
+
+@@ -16,7 +16,7 @@ dnl This file is input of the m4 macro processor.
+ `preprocessor = 'camlp4_cmd`'
+
+ `package lib ('
+-` requires = camlp4 'camlp4_dynlink`'
++` requires = camlp4 dynlink'
+ ` version = [distributed with Ocaml]'
+ ` description = Camlp4 library'
+ ` archive(byte) = camlp4lib.cma'
+--
diff --git a/debian/patches/series b/debian/patches/series
index 08faec1..eface1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
0001-Change-standard-directories-to-conform-our-own-polic.patch
0002-Extra-configuration-search-path.patch
0003-META.num-bugfix-moved-directory-directive-outside-co.patch
+0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
--
findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 29285fafcc7b96c5cb9d0eb2fbc905165458a1d0 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 21:46:22 2011 +0200 Bump Standards-Version to 3.9.2 diff --git a/debian/control b/debian/control index 1e3893b..52deca1 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: m4, gawk | awk, dh-ocaml (= 0.9~) -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/findlib.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/findlib.git Homepage: http://projects.camlcity.org/projects/findlib.html -- findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 43dcbcd4c1e0f3ef71d16563ff57974121bcdd4f Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 21:55:00 2011 +0200 Add myself to uploaders diff --git a/debian/changelog b/debian/changelog index 3651ea9..80abef8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release + * Add myself to Uploaders * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: #630490) - -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011 21:37:42 +0200 + -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011 21:50:32 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 52deca1..925a7f9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian OCaml Maintainers debian-ocaml-ma...@lists.debian.org Uploaders: Mehdi Dogguy me...@debian.org, - Stéphane Glondu glo...@debian.org + Stéphane Glondu glo...@debian.org, + Nicolas Dandrimont nicolas.dandrim...@crans.org Build-Depends: debhelper (= 8), ocaml-nox (= 3.11.1-3~), -- findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch:
commit 5a5050accb2c06f8dd31ab2c14e281796645a0ab
Author: Nicolas Dandrimont nicolas.dandrim...@crans.org
Date: Mon Jun 27 21:56:33 2011 +0200
Do not use an absolute path in META.camlp4 (Closes: #628021)
diff --git a/debian/changelog b/debian/changelog
index 80abef8..e0506dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ findlib (1.2.7+debian-1) unstable; urgency=low
* Add myself to Uploaders
* Add patch to make Camlp4 depend on Dynlink on every arch (Closes:
#630490)
+ * Add patch to use a relative path in META.camlp4 (Closes: #628021)
- -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011
21:50:32 +0200
+ -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011
21:55:51 +0200
findlib (1.2.6+debian-2) unstable; urgency=low
diff --git
a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
new file mode 100644
index 000..08e0824
--- /dev/null
+++ b/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
@@ -0,0 +1,22 @@
+From: Nicolas Dandrimont nicolas.dandrim...@crans.org
+Date: Mon, 27 Jun 2011 21:55:16 +0200
+Subject: Do not use an absolute path in META.camlp4
+
+---
+ configure |2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index e82ecc1..a896c35 100755
+--- a/configure
b/configure
+@@ -416,7 +416,7 @@ fi
+ # Check on camlp4:
+
+ if in_path camlp4; then
+-camlp4_dir=`camlp4 -where`
++camlp4_dir=`camlp4 -where | sed -s 's@/usr/lib/ocaml/@^@'`
+ if [ ${use_cygpath} -gt 0 ]; then
+ camlp4_dir=`echo x | env USE_CYGPATH=1 tools/patch x $camlp4_dir`
+ # This makes camlp4_dir a windows path
+--
diff --git a/debian/patches/series b/debian/patches/series
index eface1e..2dd0d66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-Extra-configuration-search-path.patch
0003-META.num-bugfix-moved-directory-directive-outside-co.patch
0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
+0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
--
findlib 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] findlib packaging branch, master, updated. debian/1.2.6+debian-1-14-g693f729
The following commit has been merged in the master branch: commit 693f729d68db06ba405866e7073417675962b999 Author: Nicolas Dandrimont nicolas.dandrim...@crans.org Date: Mon Jun 27 22:46:53 2011 +0200 Disable graphics and labltk when unavailable (Closes: #605695) diff --git a/debian/changelog b/debian/changelog index e0506dc..3ea82f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,12 @@ findlib (1.2.7+debian-1) unstable; urgency=low * New upstream release * Add myself to Uploaders - * Add patch to make Camlp4 depend on Dynlink on every arch (Closes: -#630490) - * Add patch to use a relative path in META.camlp4 (Closes: #628021) + * Add patches: +- Make Camlp4 depend on Dynlink on every arch (Closes: #630490) +- Use a relative path in META.camlp4 (Closes: #628021) +- Disable graphics and labltk when unavailable (Closes: #605695) - -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011 21:55:51 +0200 + -- Nicolas Dandrimont nicolas.dandrim...@crans.org Mon, 27 Jun 2011 22:45:07 +0200 findlib (1.2.6+debian-2) unstable; urgency=low diff --git a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch new file mode 100644 index 000..93e3b93 --- /dev/null +++ b/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch @@ -0,0 +1,34 @@ +From: Nicolas Dandrimont nicolas.dandrim...@crans.org +Date: Mon, 27 Jun 2011 22:41:54 +0200 +Subject: Disable graphics and labltk when unavailable + +--- + site-lib-src/graphics/META.in |1 + + site-lib-src/labltk/META.in |1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in +index 7fd5ec2..eacac66 100644 +--- a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in +@@ -1,6 +1,7 @@ + dnl This file is input of the m4 macro processor. + `# Specifications for the graphics library:' + `requires = ' ++`exists_if = graphics.cma' + `version = [distributed with Ocaml]' + `description = Portable drawing primitives' + `directory = ^' +diff --git a/site-lib-src/labltk/META.in b/site-lib-src/labltk/META.in +index 29347bd..6819198 100644 +--- a/site-lib-src/labltk/META.in b/site-lib-src/labltk/META.in +@@ -1,6 +1,7 @@ + dnl This file is input of the m4 macro processor. + `# Specifications for the labltk library:' + `requires = ' ++`exists_if = labltk.cma' + `version = [distributed with Ocaml]' + `description = The Tk windowing toolkit' + `directory = +labltk' +-- diff --git a/debian/patches/series b/debian/patches/series index 2dd0d66..2ee13c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-META.num-bugfix-moved-directory-directive-outside-co.patch 0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch 0005-Do-not-use-an-absolute-path-in-META.camlp4.patch +0006-Disable-graphics-and-labltk-when-unavailable.patch -- findlib 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
