[Pkg-ocaml-maint-commits] [SCM] postgresql-ocaml packaging branch, master, updated. debian/1.11.1-1-14-g76c5c7e

Mehdi Dogguy mehdi at debian.org
Mon Oct 5 22:26:11 UTC 2009


The following commit has been merged in the master branch:
commit f6f0c8f80e9a4c2ee152d8a1ce19db68f4d1359b
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 00:23:17 2009 +0200

    Do not link system libraries into cma (Closes: #549794).

diff --git a/debian/changelog b/debian/changelog
index 40cc212..9f8af08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ postgresql-ocaml (1.12.1-1) UNRELEASED; urgency=low
 
   [ Mehdi Dogguy ]
   * Add myself to uploaders
+  * Do not link system libraries into cma (Closes: #549794).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 00:20:51 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Tue, 06 Oct 2009 00:22:20 +0200
 
 postgresql-ocaml (1.11.1-1) unstable; urgency=low
 
diff --git a/debian/patches/0003-Do-not-link-system-libraries-into-cma.patch b/debian/patches/0003-Do-not-link-system-libraries-into-cma.patch
new file mode 100644
index 0000000..bc386d9
--- /dev/null
+++ b/debian/patches/0003-Do-not-link-system-libraries-into-cma.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Tue, 6 Oct 2009 00:22:04 +0200
+Subject: [PATCH] Do not link system libraries into cma
+
+---
+ lib/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index c458f4e..991160c 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -7,7 +7,7 @@ CFLAGS += -O2 -Wall -pedantic -Wno-long-long -fPIC -DPIC
+ CFLAGS += -DPG_OCAML_MAJOR_VERSION=$(PG_OCAML_MAJOR_VERSION)
+ CFLAGS += -DPG_OCAML_MINOR_VERSION=$(PG_OCAML_MINOR_VERSION)
+ CLIBS   = pq
+-LIBS    = threads
++LIBS    =
+ RESULT  = postgresql
+ THREADS = yes
+ DESTDIR =
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index d213c46..52222b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-DESTDIR-in-Makefiles.patch
 0002-Examples.patch
+0003-Do-not-link-system-libraries-into-cma.patch

-- 
postgresql-ocaml packaging



More information about the Pkg-ocaml-maint-commits mailing list