This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository findlib.
commit 0baaa6b15fe436d02432888539fe1ac7b9d5c291
Author: Ximin Luo <infini...@debian.org>
Date: Thu Oct 20 12:09:02 2016 +0200
Refresh patches and drop a patch applied upstream
---
...ndard-directories-to-conform-our-own-polic.patch | 2 --
.../0002-Extra-configuration-search-path.patch | 8 ++------
...ugfix-moved-directory-directive-outside-co.patch | 8 ++------
...sable-graphics-and-labltk-when-unavailable.patch | 4 ----
debian/patches/0005-Fix-typo-in-Makefile.patch | 21 ---------------------
debian/patches/series | 1 -
6 files changed, 4 insertions(+), 40 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 0b94bc5..4147ac7 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
@@ -13,8 +13,6 @@ Signed-off-by: Stephane Glondu <st...@glondu.net>
findlib.conf.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/findlib.conf.in b/findlib.conf.in
-index 261d2c8..05f6c3d 100644
--- a/findlib.conf.in
+++ b/findlib.conf.in
@@ -1,2 +1,2 @@
diff --git a/debian/patches/0002-Extra-configuration-search-path.patch
b/debian/patches/0002-Extra-configuration-search-path.patch
index 90fcfa8..517262f 100644
--- a/debian/patches/0002-Extra-configuration-search-path.patch
+++ b/debian/patches/0002-Extra-configuration-search-path.patch
@@ -12,11 +12,9 @@ Signed-off-by: Stephane Glondu <st...@glondu.net>
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 2376315..e2e2689 100644
--- a/src/findlib/findlib.ml
+++ b/src/findlib/findlib.ml
-@@ -116,6 +116,8 @@ let init
+@@ -122,6 +122,8 @@
let configd_file =
config_file ^ ".d" in
@@ -25,7 +23,7 @@ index 2376315..e2e2689 100644
let vars_of_file f =
let ch = open_in f in
try
-@@ -159,12 +161,17 @@ let init
+@@ -165,12 +167,17 @@
vars_of_file config_file
else
[] in
@@ -44,8 +42,6 @@ index 2376315..e2e2689 100644
if vars <> [] then (
let found = ref false in
let lookup name default =
-diff --git a/src/findlib/findlib_config.mlp b/src/findlib/findlib_config.mlp
-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 40c94c0..ca65d20 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
@@ -8,22 +8,18 @@ Subject: META.num*: bugfix,
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
-index 184d65f..1b18b74 100644
--- a/site-lib-src/num-top/META.in
+++ b/site-lib-src/num-top/META.in
-@@ -3,5 +3,6 @@ dnl This file is input of the m4 macro processor.
+@@ -3,5 +3,6 @@
`requires = "num.core"'
`version = "'findlib_version`"'
`description = "Add-on for num inside toploops"'
+`directory = "+num-top"'
`archive(byte,toploop) = "num_top.cma"'
-diff --git a/site-lib-src/num/META.in b/site-lib-src/num/META.in
-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.
+@@ -4,8 +4,8 @@
`requires(toploop) = "num.core,num-top"'
`version = "[distributed with Ocaml]"'
`description = "Arbitrary-precision rational arithmetic"'
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 12d9084..62dbc9d 100644
--- a/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
+++ b/debian/patches/0004-Disable-graphics-and-labltk-when-unavailable.patch
@@ -8,8 +8,6 @@ Debian-Bug: https://bugs.debian.org/605695
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
-index 561ec5f..c654a9c 100644
--- a/site-lib-src/graphics/META.in
+++ b/site-lib-src/graphics/META.in
@@ -1,6 +1,7 @@
@@ -20,8 +18,6 @@ index 561ec5f..c654a9c 100644
`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 @@
diff --git a/debian/patches/0005-Fix-typo-in-Makefile.patch
b/debian/patches/0005-Fix-typo-in-Makefile.patch
deleted file mode 100644
index dd68b41..0000000
--- a/debian/patches/0005-Fix-typo-in-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Thu, 9 Jun 2016 12:26:08 +0200
-Subject: Fix typo in Makefile
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index bf3aabb..2b6d4a7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -71,7 +71,7 @@ findlib.conf: findlib.conf.in
-
- .PHONY: install-doc
- install-doc:
-- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1"
"$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
-+ mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1"
"$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
- -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5
doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
-
diff --git a/debian/patches/series b/debian/patches/series
index 4fcc8df..a183565 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
0002-Extra-configuration-search-path.patch
0003-META.num-bugfix-moved-directory-directive-outside-co.patch
0004-Disable-graphics-and-labltk-when-unavailable.patch
-0005-Fix-typo-in-Makefile.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
