r10734 - in /desktop/unstable/gdm/debian: changelog rules

[samm-guest at users.alioth.debian.org]

Author: samm-guest
Date: Thu May  3 21:50:03 2007
New Revision: 10734

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10734
Log:
* Add support for DEB_BUILD_OPTIONS nostrip option.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/rules

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=10734&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Thu May  3 21:50:03 2007
@@ -1,3 +1,9 @@
+gdm (2.18.1-3) UNRELEASED; urgency=low
+
+  * Add support for DEB_BUILD_OPTIONS nostrip option.
+
+ -- Sam Morris <sam at robots.org.uk>  Thu, 03 May 2007 22:46:17 +0100
+
 gdm (2.18.1-2) unstable; urgency=low
 
   * Fix a packaging mistake introduced while refactoring the install which

Modified: desktop/unstable/gdm/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/rules?rev=10734&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/rules (original)
+++ desktop/unstable/gdm/debian/rules Thu May  3 21:50:03 2007
@@ -33,6 +33,13 @@
 
 PATCH_DIR := debian/patches
 
+CFLAGS := -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
 patch: patch-stamp
 patch-stamp:
 	dh_testdir
@@ -44,7 +51,7 @@
 configure: configure-stamp
 configure-stamp: patch-stamp
 	dh_testdir
-	./configure $(configure_flags)
+	./configure $(configure_flags) CFLAGS="$(CFLAGS)"
 	touch configure-stamp
 
 build: build-stamp