r14313 - in packages/trunk/gamine/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2013-06-23 14:21:00 +0000 (Sun, 23 Jun 2013)
New Revision: 14313

Added:
   packages/trunk/gamine/debian/patches/makefile-flags.patch
Modified:
   packages/trunk/gamine/debian/changelog
   packages/trunk/gamine/debian/patches/series
   packages/trunk/gamine/debian/rules
Log:
Add patch to pass CFLAGS et al to Makefile.  Add as-needed in rules.

Modified: packages/trunk/gamine/debian/changelog
===================================================================
--- packages/trunk/gamine/debian/changelog	2013-06-23 12:30:57 UTC (rev 14312)
+++ packages/trunk/gamine/debian/changelog	2013-06-23 14:21:00 UTC (rev 14313)
@@ -2,6 +2,8 @@
 
   * Add myself to uploaders.
   * Add patch to explicitly link libm. (Closes: #713699).
+  * Add patch to allow CFLAGS, et al to be passed in to Makefile.
+  * Add --as-needed.
   * Make vcs tags canonical.
   * Bump debhelper build-dep and compat to 9.
   * Bump Standards Version to 3.9.4.

Added: packages/trunk/gamine/debian/patches/makefile-flags.patch
===================================================================
--- packages/trunk/gamine/debian/patches/makefile-flags.patch	                        (rev 0)
+++ packages/trunk/gamine/debian/patches/makefile-flags.patch	2013-06-23 14:21:00 UTC (rev 14313)
@@ -0,0 +1,21 @@
+Description: Modify Makefile to allow passing of CFLAGS, CPPFLAGS, LDFLAGS.
+Author: Barry deFreese <bdefreese at debian.org>
+Index: gamine-1.1/Makefile
+===================================================================
+--- gamine-1.1.orig/Makefile	2013-06-23 05:24:42.000000000 -0400
++++ gamine-1.1/Makefile	2013-06-23 05:27:37.000000000 -0400
+@@ -13,11 +13,11 @@
+ GCONF_SCHEMA_CONFIG_SOURCE = xml:merged:/etc/gconf/gconf.xml.defaults
+ GCONF_SCHEMA_FILE_DIR = $(SYSCONFDIR)/gconf/schemas
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = 0
+-CFLAGS = -Wall
++CFLAGS += -Wall
+ #CFLAGS = -Wall -g 
+-CPPFLAGS = $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
++CPPFLAGS += $(shell pkg-config --cflags gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0)  -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
+ LDLIBS = $(shell pkg-config --libs gtk+-2.0 cairo glib-2.0 gstreamer-0.10 gconf-2.0) -lX11 -lm -DDATADIR=\""$(PKGDATADIR)"\"  -DLOCALDIR=\""$(LOCALEDIR)"\"
+-LDFLAGS = -g 
++LDFLAGS += -g 
+ CC = gcc
+ target = gamine
+ objs = gamine.o

Modified: packages/trunk/gamine/debian/patches/series
===================================================================
--- packages/trunk/gamine/debian/patches/series	2013-06-23 12:30:57 UTC (rev 14312)
+++ packages/trunk/gamine/debian/patches/series	2013-06-23 14:21:00 UTC (rev 14313)
@@ -1,3 +1,4 @@
 makefile-DESTDIR.diff
 link-X11.diff
 link-libm.patch
+makefile-flags.patch

Modified: packages/trunk/gamine/debian/rules
===================================================================
--- packages/trunk/gamine/debian/rules	2013-06-23 12:30:57 UTC (rev 14312)
+++ packages/trunk/gamine/debian/rules	2013-06-23 14:21:00 UTC (rev 14313)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+LDFLAGS += "-Wl,--as-needed"
+
 %:
 	dh $@