[Pkg-maemo-commits] r101 ./hildon-theme-plankton/debian: * Cleanup rules.

[Jonny Lamb]

------------------------------------------------------------
revno: 101
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-theme-plankton
timestamp: Mon 2007-07-23 23:32:13 +0100
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-23 22:27:52 +0000
+++ b/debian/changelog	2007-07-23 22:32:13 +0000
@@ -8,8 +8,9 @@
   * Bumped Standards-Version to 3.7.2.
   * Bumped debhelper compat up to 5.
   * Updated package descriptions.
+  * Cleanup rules.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 23:27:29 +0100
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 23:31:57 +0100
 
 hildon-theme-plankton (4.10.0-1) unstable; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-01-30 09:17:27 +0000
+++ b/debian/rules	2007-07-23 22:32:13 +0000
@@ -3,26 +3,13 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-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
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+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 -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 config.status:
 	dh_testdir
@@ -32,10 +19,8 @@
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
-
 	# Add here commands to compile the package.
 	$(MAKE)
-
 	touch build-stamp
 
 clean:
@@ -44,12 +29,9 @@
 	rm -f build-stamp 
 	rm -f install-stamp
 	rm -f debian/files
-
 	# Add here commands to clean up after the build process.
-	-$(MAKE) maintainer-clean
-
+	[ ! -f Makefile ] || $(MAKE) maintainer-clean
 	rm -rf debian/hildon-theme-plankton
-
 	dh_clean 
 
 install: build
@@ -57,7 +39,6 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
 	# Add here commands to install the package into debian/build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/hildon-theme-plankton