[Pkg-ocaml-maint-commits] [SCM] syslog-ocaml packaging branch, master, updated. debian/1.4-1-7-g5273b4f

[Eric Cooper]

The following commit has been merged in the master branch:
commit 5273b4ff387833dec7cee7762dffe5e4d7990284
Author: Eric Cooper <ecc at cmu.edu>
Date:   Tue Mar 3 16:28:31 2009 -0500

    use ocamlmakefile package so CFLAGS gets set correctly

diff --git a/Makefile b/Makefile
index 62053e6..1facb86 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
--include Makefile.conf
+OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
 
 SOURCES=aux.mli aux.ml aux_stubs.c syslog.mli syslog.ml
 RESULT=syslog
@@ -13,4 +13,4 @@ install: libinstall
 uninstall: libuninstall
 doc: htdoc
 
--include OCamlMakefile
+include $(OCAMLMAKEFILE)
diff --git a/debian/changelog b/debian/changelog
index a1598be..6b638ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+syslog-ocaml (1.4-3) unstable; urgency=low
+
+  * Compile C files with -fPIC (closes: #518041)
+  * Revert to using OCamlMakefile from ocamlmakefile package,
+    since it overrides CFLAGS correctly when invoked by *-buildpackage
+
+ -- Eric Cooper <ecc at cmu.edu>  Tue, 03 Mar 2009 16:20:10 -0500
+
 syslog-ocaml (1.4-2) unstable; urgency=low
 
   [ Eric Cooper]
diff --git a/debian/control b/debian/control
index 117f3fc..c8d48eb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Eric Cooper <ecc at cmu.edu>, Ralf Treinen <treinen at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0), cdbs, ocaml-nox (>= 3.11), dh-ocaml, ocaml-findlib
+Build-Depends: debhelper (>= 7.0), cdbs, ocaml-nox (>= 3.11), dh-ocaml, ocamlmakefile, ocaml-findlib
 Standards-Version: 3.8.0
 Homepage: http://homepage.mac.com/letaris
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/syslog-ocaml.git

-- 
syslog-ocaml packaging