[Pkg-ocaml-maint-commits] [SCM] pcre-ocaml packaging branch, master, updated. debian/6.2.2-2-7-ga84c4fb

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 084e6757aef00f9af71242dc235e7e68a3c2e9cd
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Nov 19 15:25:29 2011 +0100

    Refresh patches

diff --git a/debian/patches/0001-enable-byte-only-build.patch b/debian/patches/0001-enable-byte-only-build.patch
index 2a44bd5..5bd8d9a 100644
--- a/debian/patches/0001-enable-byte-only-build.patch
+++ b/debian/patches/0001-enable-byte-only-build.patch
@@ -28,10 +28,10 @@ index 880d68f..a3c84ed 100644
  examples:
  	@for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
 diff --git a/OCamlMakefile b/OCamlMakefile
-index b8898ad..2fbcb07 100644
+index b3dc99d..86e6700 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
-@@ -519,8 +519,14 @@ ifndef STATIC
+@@ -525,8 +525,14 @@ ifndef STATIC
  endif
  
  ifndef LIBINSTALL_FILES
@@ -48,7 +48,7 @@ index b8898ad..2fbcb07 100644
    ifndef STATIC
      ifneq ($(strip $(OBJ_LINK)),)
        LIBINSTALL_FILES += $(DLLSONAME)
-@@ -1211,7 +1217,8 @@ subprojs: $(SUBPROJS:%=subproj_%)
+@@ -1225,7 +1231,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 688b2e3..52cdc67 100644
--- a/debian/patches/0002-build-PIC-shared-objects.patch
+++ b/debian/patches/0002-build-PIC-shared-objects.patch
@@ -7,10 +7,10 @@ Subject: build PIC shared objects
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/OCamlMakefile b/OCamlMakefile
-index 2fbcb07..d1060eb 100644
+index 86e6700..2c2fe49 100644
 --- a/OCamlMakefile
 +++ b/OCamlMakefile
-@@ -1113,6 +1113,7 @@ endif
+@@ -1127,6 +1127,7 @@ endif
  
  .c.$(EXT_OBJ):
  			$(OCAMLC) -c -cc "$(CC)" -ccopt "$(CFLAGS) \
diff --git a/debian/patches/0003-Change-position-of-flag-lpcre.patch b/debian/patches/0003-Change-position-of-flag-lpcre.patch
deleted file mode 100644
index b8933bb..0000000
--- a/debian/patches/0003-Change-position-of-flag-lpcre.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Fri, 3 Dec 2010 23:18:19 +0100
-Subject: Change position of flag -lpcre
-
-This fixes FTBFS of reverse dependencies when --as-needed is on by
-default (in Ubuntu since natty).
-
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- OCamlMakefile |    9 +--------
- lib/Makefile  |    2 +-
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/OCamlMakefile b/OCamlMakefile
-index d1060eb..a558021 100644
---- a/OCamlMakefile
-+++ b/OCamlMakefile
-@@ -62,6 +62,7 @@ export OCAML_DEFAULT_DIRS
- 
- export LIBS
- export CLIBS
-+export CLIBS_OPTS
- export CFRAMEWORKS
- 
- export OCAMLFLAGS
-@@ -597,14 +598,6 @@ else
- 		    $(OCAML_DEFAULT_DIRS:%=-LIBPATH:%) "
- endif
- 
--CLIBS_OPTS := $(CLIBS:%=-cclib -l%) $(CFRAMEWORKS:%=-cclib '-framework %')
--ifdef MSVC
--  ifndef STATIC
--  # MSVC libraries do not have 'lib' prefix
--  CLIBS_OPTS := $(CLIBS:%=-cclib %.lib)
--  endif
--endif
--
- ifneq ($(strip $(OBJ_LINK)),)
-   ifdef CREATE_LIB
-     OBJS_LIBS := -cclib -l$(CLIB_BASE) $(CLIBS_OPTS) $(MAYBE_IDL)
-diff --git a/lib/Makefile b/lib/Makefile
-index 96c23fa..aa0edbb 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -3,7 +3,7 @@ OCAMLMAKEFILE = ../OCamlMakefile
- SOURCES := pcre.mli pcre.ml pcre_stubs.c
- CFLAGS := -O2 $(shell pcre-config --cflags)
- PCRE_FLAGS := $(shell pcre-config --libs)
--OCAMLLDFLAGS := -cclib "$(PCRE_FLAGS)"
-+CLIBS_OPTS := -cclib "$(PCRE_FLAGS)"
- OCAMLMKLIB_FLAGS := $(PCRE_FLAGS)
- RESULT := pcre
- 
--- 
diff --git a/debian/patches/0004-Fix-version-number-in-META.patch b/debian/patches/0003-Fix-version-number-in-META.patch
similarity index 87%
rename from debian/patches/0004-Fix-version-number-in-META.patch
rename to debian/patches/0003-Fix-version-number-in-META.patch
index 5a27f61..14ffc5e 100644
--- a/debian/patches/0004-Fix-version-number-in-META.patch
+++ b/debian/patches/0003-Fix-version-number-in-META.patch
@@ -8,13 +8,13 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/lib/META b/lib/META
-index c180e9c..feefc15 100644
+index 5847205..f9ee0b9 100644
 --- a/lib/META
 +++ b/lib/META
 @@ -1,5 +1,5 @@
  name="pcre"
--version="6.2.0"
-+version="6.2.2"
+-version="6.2.1"
++version="6.2.3"
  description="Perl Compatibility Regular Expressions"
  requires=""
  archive(byte)="pcre.cma"
diff --git a/debian/patches/series b/debian/patches/series
index a79411c..8c16c00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-enable-byte-only-build.patch
 0002-build-PIC-shared-objects.patch
-0003-Change-position-of-flag-lpcre.patch
-0004-Fix-version-number-in-META.patch
+0003-Fix-version-number-in-META.patch

-- 
pcre-ocaml packaging