[Pkg-ocaml-maint-commits] [SCM] gdo packaging branch, master, updated. debian/1.0_alpha5-1-2-g940b43c

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 940b43c9b865a1b5212eccd66aac113f3164ac83
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue Oct 11 19:07:32 2011 +0200

    Prepared new upload.

diff --git a/debian/changelog b/debian/changelog
index 29c2b52..636ddc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gd4o (1.0~alpha5-2) unstable; urgency=low
+
+  * Patched Makefile to pass -fPIC to CFLAGS. 
+  * Added patch to support flags given through make
+    invocation.
+  * Added explicit build-deps on libs referenced in Makefile.
+
+ -- Romain Beauxis <toots at rastageeks.org>  Tue, 11 Oct 2011 18:51:33 +0200
+
 gd4o (1.0~alpha5-1) unstable; urgency=low
 
   * Initial upload to sid (Closes: #644824)
diff --git a/debian/control b/debian/control
index 369e038..0e0e6b7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,17 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
 Build-Depends: 
-  cdbs (>= 0.4.72~),
+ cdbs (>= 0.4.72~),
  debhelper,
  dh-buildinfo,
  ocaml-nox,
  dh-ocaml (>= 0.9), 
-  libgd2-noxpm-dev,
-  ocaml-findlib (>= 1.2.4), 
-  pkg-config
+ libgd2-noxpm-dev,
+ libjpeg8-dev,
+ libfreetype6-dev,
+ libpng12-dev, 
+ ocaml-findlib (>= 1.2.4), 
+ pkg-config
 Standards-Version: 3.9.2
 Homepage: http://matt.gushee.net/software/gd4o/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/gd4o.git
diff --git a/debian/control.in b/debian/control.in
index b4be829..d1d3887 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,10 +4,13 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Romain Beauxis <toots at rastageeks.org>
 Build-Depends: 
-  @cdbs@, 
-  libgd2-noxpm-dev,
-  ocaml-findlib (>= 1.2.4), 
-  pkg-config
+ @cdbs@, 
+ libgd2-noxpm-dev,
+ libjpeg8-dev,
+ libfreetype6-dev,
+ libpng12-dev, 
+ ocaml-findlib (>= 1.2.4), 
+ pkg-config
 Standards-Version: 3.9.2
 Homepage: http://matt.gushee.net/software/gd4o/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/gd4o.git
diff --git a/debian/patches/add_fpic_to_cflags.patch b/debian/patches/add_fpic_to_cflags.patch
new file mode 100644
index 0000000..04cd682
--- /dev/null
+++ b/debian/patches/add_fpic_to_cflags.patch
@@ -0,0 +1,13 @@
+Index: gdo/Makefile
+===================================================================
+--- gdo.orig/Makefile	2011-10-09 15:50:53.760602651 +0200
++++ gdo/Makefile	2011-10-11 18:47:57.013045759 +0200
+@@ -26,7 +26,7 @@
+ ifdef FT2_LIB
+ FT2_FLAG = -DHAVE_FREETYPE
+ endif
+-CFLAGS = $(CINCLUDES) -W -Wall -Wno-unused \
++CFLAGS = $(CINCLUDES) -fPIC -W -Wall -Wno-unused \
+ 	$(JPEG_FLAG) $(FT2_FLAG) $(SAFETY_FLAG)
+ 
+ OCAMLCFLAGS=-labels -unsafe
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b0738b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+add_fpic_to_cflags.patch
+support_custom_cflags.patch
diff --git a/debian/patches/support_custom_cflags.patch b/debian/patches/support_custom_cflags.patch
new file mode 100644
index 0000000..92df800
--- /dev/null
+++ b/debian/patches/support_custom_cflags.patch
@@ -0,0 +1,15 @@
+Index: gdo/Makefile
+===================================================================
+--- gdo.orig/Makefile	2011-10-11 18:47:57.013045759 +0200
++++ gdo/Makefile	2011-10-11 18:56:41.173056205 +0200
+@@ -26,8 +26,8 @@
+ ifdef FT2_LIB
+ FT2_FLAG = -DHAVE_FREETYPE
+ endif
+-CFLAGS = $(CINCLUDES) -fPIC -W -Wall -Wno-unused \
+-	$(JPEG_FLAG) $(FT2_FLAG) $(SAFETY_FLAG)
++override CFLAGS += $(CINCLUDES) -fPIC -W -Wall -Wno-unused \
++		   $(JPEG_FLAG) $(FT2_FLAG) $(SAFETY_FLAG)
+ 
+ OCAMLCFLAGS=-labels -unsafe
+ OCAMLOPTFLAGS=-labels -inline 2

-- 
gdo packaging