The following commit has been merged in the master branch:
commit 84a01e75b71097310acfd7dd13c84092cd6e15d5
Author: Stephane Glondu <st...@glondu.net>
Date:   Fri Feb 10 06:48:30 2012 +0100

    Refresh patches

diff --git a/debian/patches/0001-enable-byte-only-build.patch 
b/debian/patches/0001-enable-byte-only-build.patch
index 5bd8d9a..e7b4778 100644
--- a/debian/patches/0001-enable-byte-only-build.patch
+++ b/debian/patches/0001-enable-byte-only-build.patch
@@ -28,7 +28,7 @@ index 880d68f..a3c84ed 100644
  examples:
        @for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
 diff --git a/OCamlMakefile b/OCamlMakefile
-index b3dc99d..86e6700 100644
+index 7d42c88..5ba6928 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
 @@ -525,8 +525,14 @@ ifndef STATIC
@@ -48,7 +48,7 @@ index b3dc99d..86e6700 100644
    ifndef STATIC
      ifneq ($(strip $(OBJ_LINK)),)
        LIBINSTALL_FILES += $(DLLSONAME)
-@@ -1225,7 +1231,8 @@ subprojs: $(SUBPROJS:%=subproj_%)
+@@ -1227,7 +1233,8 @@ subprojs: $(SUBPROJS:%=subproj_%)
  .PHONY: libinstall
  libinstall:   all
        $(QUIET)printf "\nInstalling library with ocamlfind\n"
diff --git a/debian/patches/0002-build-PIC-shared-objects.patch 
b/debian/patches/0002-build-PIC-shared-objects.patch
index 52cdc67..a00b579 100644
--- a/debian/patches/0002-build-PIC-shared-objects.patch
+++ b/debian/patches/0002-build-PIC-shared-objects.patch
@@ -7,12 +7,12 @@ Subject: build PIC shared objects
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/OCamlMakefile b/OCamlMakefile
-index 86e6700..2c2fe49 100644
+index 5ba6928..8b982f0 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
-@@ -1127,6 +1127,7 @@ endif
+@@ -1129,6 +1129,7 @@ endif
  
- .c.$(EXT_OBJ):
+ %.$(EXT_OBJ): %.c
                        $(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
 +                              -fPIC \
                                $(CPPFLAGS) $(CPPFLAGS_WIN32) \
diff --git 
a/debian/patches/0004-Fix-typo-in-debug-native-code-library-target-of-OCam.patch
 
b/debian/patches/0004-Fix-typo-in-debug-native-code-library-target-of-OCam.patch
deleted file mode 100644
index 3f82663..0000000
--- 
a/debian/patches/0004-Fix-typo-in-debug-native-code-library-target-of-OCam.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Sun, 1 Jan 2012 16:16:14 +0100
-Subject: Fix typo in debug-native-code-library target of OCamlMakefile
-
----
- OCamlMakefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/OCamlMakefile b/OCamlMakefile
-index 2c2fe49..b10cf68 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -869,7 +869,7 @@ dcl:       debug-code-library
- # generates byte-code libraries with debugging information (native code)
- debug-native-code-library:    $(PRE_TARGETS)
-                       $(QUIET)$(MAKE) -r -f $(OCAMLMAKEFILE) \
--                              $(RES_CLIB) $(NCRESULT).cma \
-+                              $(RES_CLIB) $(NCRESULT).cmxa \
-                               REAL_RESULT="$(NCRESULT)" make_deps=yes \
-                               REAL_OCAMLC="$(OCAMLOPT)" \
-                               CREATE_LIB=yes \
--- 
diff --git a/debian/patches/0005-Temporary-fix.patch 
b/debian/patches/0004-Temporary-fix.patch
similarity index 98%
rename from debian/patches/0005-Temporary-fix.patch
rename to debian/patches/0004-Temporary-fix.patch
index 6d77f88..cb8ab24 100644
--- a/debian/patches/0005-Temporary-fix.patch
+++ b/debian/patches/0004-Temporary-fix.patch
@@ -11,7 +11,7 @@ a dirty hack to "fix" it.
  1 files changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/OCamlMakefile b/OCamlMakefile
-index b10cf68..4038a4d 100644
+index 8b982f0..8bf1934 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
 @@ -862,8 +862,7 @@ debug-code-library:        $(PRE_TARGETS)
diff --git a/debian/patches/series b/debian/patches/series
index 3da006a..8339421 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-enable-byte-only-build.patch
 0002-build-PIC-shared-objects.patch
 0003-Compile-with-debugging-symbols.patch
-0004-Fix-typo-in-debug-native-code-library-target-of-OCam.patch
-0005-Temporary-fix.patch
+0004-Temporary-fix.patch

-- 
pcre-ocaml 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

Reply via email to