r15896 - in /desktop/unstable/gnome-python-desktop/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon May 12 09:49:23 2008
New Revision: 15896

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15896
Log:
Cleanup rules.

Modified:
    desktop/unstable/gnome-python-desktop/debian/changelog
    desktop/unstable/gnome-python-desktop/debian/rules

Modified: desktop/unstable/gnome-python-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/changelog?rev=15896&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/changelog (original)
+++ desktop/unstable/gnome-python-desktop/debian/changelog Mon May 12 09:49:23 2008
@@ -1,6 +1,7 @@
 gnome-python-desktop (2.22.0-2) UNRELEASED; urgency=low
 
   * Wrap deps and build-deps.
+  * Cleanup rules.
 
  -- Loic Minier <lool at dooz.org>  Mon, 12 May 2008 11:47:15 +0200
 

Modified: desktop/unstable/gnome-python-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-python-desktop/debian/rules?rev=15896&op=diff
==============================================================================
--- desktop/unstable/gnome-python-desktop/debian/rules (original)
+++ desktop/unstable/gnome-python-desktop/debian/rules Mon May 12 09:49:23 2008
@@ -1,24 +1,11 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-# generate control from control.in in clean::, for Uploaders: @GNOME_TEAM@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-# get-orig-source target
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-CFLAGS += -Wall -g
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-configure_flags := --prefix=/usr --enable-metacity
+configure_flags += --prefix=/usr --enable-metacity
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
@@ -26,7 +13,7 @@
 	configure_flags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
 
-PYVERS=$(shell pyversions -vr debian/control 2>/dev/null)
+PYVERS := $(shell pyversions -vr debian/control 2>/dev/null)
 
 build-%/configure-stamp: configure
 	dh_testdir
@@ -84,18 +71,18 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installchangelogs -a ChangeLog
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_pysupport -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_installdocs -s
+	dh_installexamples -s
+	dh_installchangelogs -s ChangeLog
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_pysupport -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-arch binary-indep
 .PHONY: build clean install binary-indep binary-arch binary