[maemo-commits] [maemo-commits] r11412 - projects/haf/trunk/clipboard-manager/debian

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-05-03 15:11:22 +0300 (Thu, 03 May 2007)
New Revision: 11412

Modified:
   projects/haf/trunk/clipboard-manager/debian/changelog
   projects/haf/trunk/clipboard-manager/debian/rules
Log:
clipboard-manager (0.6.4) unstable; urgency=low

  * debian/rules:
    - build with -Wall -g unconditionally
    - always pass DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE to configure
  * Fixes: NB#51731


Modified: projects/haf/trunk/clipboard-manager/debian/changelog
===================================================================
--- projects/haf/trunk/clipboard-manager/debian/changelog	2007-05-03 12:10:12 UTC (rev 11411)
+++ projects/haf/trunk/clipboard-manager/debian/changelog	2007-05-03 12:11:22 UTC (rev 11412)
@@ -1,3 +1,12 @@
+clipboard-manager (0.6.4) unstable; urgency=low
+
+  * debian/rules:
+    - build with -Wall -g unconditionally
+    - always pass DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE to configure
+  * Fixes: NB#51731
+
+ -- Tommi Komulainen <tommi.komulainen at nokia.com>  Thu,  3 May 2007 15:10:51 +0300
+
 clipboard-manager (0.6.3) unstable; urgency=low
 
   * Check for NULL display.

Modified: projects/haf/trunk/clipboard-manager/debian/rules
===================================================================
--- projects/haf/trunk/clipboard-manager/debian/rules	2007-05-03 12:10:12 UTC (rev 11411)
+++ projects/haf/trunk/clipboard-manager/debian/rules	2007-05-03 12:11:22 UTC (rev 11412)
@@ -3,20 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
-else
-  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -q DEB_BUILD_GNU_TYPE)
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -g
-endif
+CFLAGS = -Wall -g
 
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        INSTALL_PROGRAM += -s
-endif
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -29,7 +20,9 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	./configure $(confflags) \
+	env CFLAGS="$(CFLAGS)" ./configure \
+		--host="$(DEB_HOST_GNU_TYPE)" \
+		--build="$(DEB_BUILD_GNU_TYPE)" \
 		--prefix=/usr --sysconfdir=/etc 
 	touch configure-stamp