[Pkg-maemo-commits] r41 ./hildon-theme-tools/debian: * Cleanup rules.

[Loïc Minier]

------------------------------------------------------------
revno: 41
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Wed 2007-08-01 13:32:42 +0200
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 17:02:27 +0000
+++ b/debian/changelog	2007-08-01 11:32:42 +0000
@@ -1,5 +1,6 @@
-hildon-theme-tools (0.5.1-1) UNRELEASED; urgency=low
+hildon-theme-tools (0.5.1-1-1) UNRELEASED; urgency=low
 
+  [ Jonny Lamb ]
   * Merged with trunk branch.
   * Set Maintainer to Debian Maemo Maintainers.
   * Added Loic and myself to Uploaders.
@@ -10,7 +11,10 @@
   * Remove commented dh_* calls in rules.
   * Added watch file.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Tue, 24 Jul 2007 18:02:15 +0100
+  [ Loic Minier ]
+  * Cleanup rules.
+
+ -- Loic Minier <lool at dooz.org>  Wed, 01 Aug 2007 13:32:23 +0200
 
 hildon-theme-tools (0.5.1-1) unstable; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-07-23 18:48:53 +0000
+++ b/debian/rules	2007-08-01 11:32:42 +0000
@@ -6,61 +6,50 @@
 # 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
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+configure_flags := \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--with-doc-dir=\$${prefix}/share/doc \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE)
 
 config.status:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./autogen.sh --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-doc-dir=\$${prefix}/share/doc
+	CFLAGS="$(CFLAGS)" ./autogen.sh $(configure_flags)
 
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
-
 	# Add here commands to compile the package.
 	$(MAKE)
-
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	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
-	
-	rm -rf debian/hildon-theme-tools
-
-	dh_clean 
-
-install: build
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
-
-	# Add here commands to install the package into debian/build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/hildon-theme-tools
-	
-	touch install-stamp
+	touch $@
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -70,17 +59,17 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -s ChangeLog
+	dh_installdocs -s
+	dh_link -s
+	dh_strip -s
+	dh_compress -s
+	dh_fixperms -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install