r11507 - in /desktop/experimental/gtk+2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Jun 13 15:04:35 2007
New Revision: 11507

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11507
Log:
* Clean up CFLAGS.
* Prepare passing -z defs via LDFLAGS in the future.

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=11507&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Wed Jun 13 15:04:35 2007
@@ -27,8 +27,10 @@
     007_implicit_pointer_conversion_gdkdrawable_directfb; refresh
     relibtoolizing patch.
   * Add cross-refs to patch headers.
-
- -- Loic Minier <lool at dooz.org>  Wed, 13 Jun 2007 16:35:43 +0200
+  * Clean up CFLAGS.
+  * Prepare passing -z defs via LDFLAGS in the future.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 13 Jun 2007 16:57:47 +0200
 
 gtk+2.0 (2.10.13-1) unstable; urgency=low
 

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=11507&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Wed Jun 13 15:04:35 2007
@@ -30,13 +30,11 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS += -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+# used to fail in directfb code -- but this might be fixed -- currently fails
+# in the cups gtkprint backend
+#LDFLAGS += -Wl,-z,defs
 
 DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')