This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository findlib.

commit 2660ac6fe4dbecc0112e5415c7cf687b55de9b38
Author: Stephane Glondu <st...@glondu.net>
Date:   Tue Feb 17 16:54:00 2015 +0100

    Refresh patches
    
     * Remove camlp4-related patches
---
 ...dard-directories-to-conform-our-own-polic.patch |  2 +-
 .../0002-Extra-configuration-search-path.patch     | 10 +++----
 ...gfix-moved-directory-directive-outside-co.patch |  4 +--
 ...-depends-on-Dynlink-on-every-architecture.patch | 31 ----------------------
 ...ble-graphics-and-labltk-when-unavailable.patch} |  4 +--
 ...o-not-use-an-absolute-path-in-META.camlp4.patch | 22 ---------------
 debian/patches/series                              |  4 +--
 7 files changed, 11 insertions(+), 66 deletions(-)

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 8d67103..3967164 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
@@ -10,7 +10,7 @@ Patch upstream findlib.conf.in so that:
 Forwarded: not-needed
 Signed-off-by: Stephane Glondu <st...@glondu.net>
 ---
- findlib.conf.in |    4 ++--
+ findlib.conf.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/findlib.conf.in b/findlib.conf.in
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch 
b/debian/patches/0002-Extra-configuration-search-path.patch
index f81e68a..f3463a1 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -8,15 +8,15 @@ configuration file snippets (namely 
/usr/share/ocaml-findlib/).
 Forwarded: not-needed
 Signed-off-by: Stephane Glondu <st...@glondu.net>
 ---
- src/findlib/findlib.ml         |    9 ++++++++-
- src/findlib/findlib_config.mlp |    1 +
+ src/findlib/findlib.ml         | 9 ++++++++-
+ src/findlib/findlib_config.mlp | 1 +
  2 files changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
-index 8f99932..4f8fe9f 100644
+index b8fd035..d1382d1 100644
 --- a/src/findlib/findlib.ml
 +++ b/src/findlib/findlib.ml
-@@ -108,6 +108,8 @@ let init
+@@ -111,6 +111,8 @@ let init
    let configd_file =
      config_file ^ ".d" in
  
@@ -25,7 +25,7 @@ index 8f99932..4f8fe9f 100644
    let vars_of_file f =
      let ch = open_in f in
      try
-@@ -151,12 +153,17 @@ let init
+@@ -154,12 +156,17 @@ let init
          vars_of_file config_file
        else
          [] in
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 8bf41b3..395c895 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
@@ -4,8 +4,8 @@ Subject: META.num*: bugfix, moved "directory" directive outside 
"core"
  subpackage
 
 ---
- site-lib-src/num-top/META.in |    1 +
- site-lib-src/num/META.in     |    2 +-
+ site-lib-src/num-top/META.in | 1 +
+ site-lib-src/num/META.in     | 2 +-
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/site-lib-src/num-top/META.in b/site-lib-src/num-top/META.in
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
deleted file mode 100644
index 1d585d7..0000000
--- a/debian/patches/0004-Camlp4-depends-on-Dynlink-on-every-architecture.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/site-lib-src/camlp4.310/META.in b/site-lib-src/camlp4.310/META.in
-index f54c775..e1f4d31 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"'
- 
- `# 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/0006-Disable-graphics-and-labltk-when-unavailable.patch 
b/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
similarity index 93%
rename from 
debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch
rename to debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
index 888c47b..2a01b96 100644
--- a/debian/patches/0006-Disable-graphics-and-labltk-when-unavailable.patch
+++ b/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
@@ -3,8 +3,8 @@ 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 +
+ site-lib-src/graphics/META.in | 1 +
+ site-lib-src/labltk/META.in   | 1 +
  2 files changed, 2 insertions(+)
 
 diff --git a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in
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
deleted file mode 100644
index ddf358d..0000000
--- a/debian/patches/0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index b4ff612..a71754b 100755
---- a/configure
-+++ b/configure
-@@ -423,7 +423,7 @@ fi
- # Check on camlp4:
- 
- if in_path camlp4; then
--    camlp4_dir=`camlp4 -where | tr -d '\015'`
-+    camlp4_dir=`camlp4 -where | tr -d '\015' | 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 2ee13c4..a183565 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +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
-0005-Do-not-use-an-absolute-path-in-META.camlp4.patch
-0006-Disable-graphics-and-labltk-when-unavailable.patch
+0004-Disable-graphics-and-labltk-when-unavailable.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/findlib.git

_______________________________________________
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

Reply via email to