[Pkg-ocaml-maint-commits] [findlib] 07/13: Refresh patches
Stéphane Glondu
glondu at moszumanska.debian.org
Thu Jun 9 11:07:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository findlib.
commit 6e68c936da57c1b7b506dc52bd3c0efbbd093db0
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Jun 9 11:42:20 2016 +0200
Refresh patches
---
debian/patches/0002-Extra-configuration-search-path.patch | 8 ++++----
...003-META.num-bugfix-moved-directory-directive-outside-co.patch | 2 +-
.../0004-Disable-graphics-and-labltk-when-unavailable.patch | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch b/debian/patches/0002-Extra-configuration-search-path.patch
index d167d6d..90fcfa8 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -13,10 +13,10 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/findlib/findlib.ml b/src/findlib/findlib.ml
-index b8fd035..d1382d1 100644
+index 2376315..e2e2689 100644
--- a/src/findlib/findlib.ml
+++ b/src/findlib/findlib.ml
-@@ -111,6 +111,8 @@ let init
+@@ -116,6 +116,8 @@ let init
let configd_file =
config_file ^ ".d" in
@@ -25,7 +25,7 @@ index b8fd035..d1382d1 100644
let vars_of_file f =
let ch = open_in f in
try
-@@ -154,12 +156,17 @@ let init
+@@ -159,12 +161,17 @@ let init
vars_of_file config_file
else
[] in
@@ -45,7 +45,7 @@ index b8fd035..d1382d1 100644
let found = ref false in
let lookup name default =
diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp
-index 5b4ab69..09d0089 100644
+index 64b4840..cf2fa86 100644
--- a/src/findlib/findlib_config.mlp
+++ b/src/findlib/findlib_config.mlp
@@ -4,6 +4,7 @@
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 83bc854..40c94c0 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
@@ -20,7 +20,7 @@ index 184d65f..1b18b74 100644
`archive(byte,toploop) = "num_top.cma"'
diff --git a/site-lib-src/num/META.in b/site-lib-src/num/META.in
-index 16e1946..489bc8e 100644
+index c6d950e..b22b568 100644
--- a/site-lib-src/num/META.in
+++ b/site-lib-src/num/META.in
@@ -4,8 +4,8 @@ dnl This file is input of the m4 macro processor.
diff --git a/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch b/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
index 79ef48a..12d9084 100644
--- a/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
+++ b/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
@@ -9,7 +9,7 @@ Debian-Bug: https://bugs.debian.org/605695
2 files changed, 2 insertions(+)
diff --git a/site-lib-src/graphics/META.in b/site-lib-src/graphics/META.in
-index 7fd5ec2..eacac66 100644
+index 561ec5f..c654a9c 100644
--- a/site-lib-src/graphics/META.in
+++ b/site-lib-src/graphics/META.in
@@ -1,6 +1,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/findlib.git
More information about the Pkg-ocaml-maint-commits
mailing list