[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.5-1-4-ge9e4567

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e5d3bff199a1a5fbcad3a44eb364ba2bbaef60dc
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jun 6 15:02:28 2012 +0200

    Findlib is needed to link pgocaml provided binaries
    
    - add patch 05_makefile_findlib

diff --git a/debian/changelog b/debian/changelog
index 9cbd162..66c9f0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ pgocaml (1.5-1) unstable; urgency=low
 
   [ Mehdi Dogguy ]
   * Bump Standards-Version to 3.9.3, no changes needed.
+  * Findlib is needed to link pgocaml provided binaries
+    - add libfindlib-ocaml-dev to Build-Depends
+    - add patch 05_makefile_findlib
 
- -- Sylvain Le Gall <gildor at debian.org>  Thu, 26 Apr 2012 22:35:22 +0000
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 06 Jun 2012 15:09:50 +0200
 
 pgocaml (1.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 966a160..ecdff0f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: cdbs (>= 0.4.52),
  libbatteries-ocaml-dev,
  libpcre-ocaml-dev,
  libcsv-ocaml-dev,
+ libfindlib-ocaml-dev,
  libcalendar-ocaml-dev (>= 2)
 Standards-Version: 3.9.3
 Homepage: http://pgocaml.forge.ocamlcore.org/
diff --git a/debian/patches/05_makefile_findlib b/debian/patches/05_makefile_findlib
new file mode 100644
index 0000000..6b7647a
--- /dev/null
+++ b/debian/patches/05_makefile_findlib
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -28,7 +28,7 @@
+ FGREP	:= fgrep
+ 
+ OCAMLCFLAGS	:= -g
+-OCAMLCPACKAGES	:= -package unix,$(EXTLIB),pcre,calendar,csv
++OCAMLCPACKAGES	:= -package unix,$(EXTLIB),pcre,calendar,csv,findlib
+ OCAMLCLIBS	:= -linkpkg
+ 
+ OCAMLSYNTAX := -syntax camlp4o -package camlp4.macro
diff --git a/debian/patches/series b/debian/patches/series
index 30105b5..febe7a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_postgresql_socket
 03_makefile_cmxs
 04_makefile_byte
+05_makefile_findlib

-- 
pgocaml packaging