[Pkg-maemo-commits] r294 ./hildon-desktop/debian: * Cleanup rules.

[Jonny Lamb]

------------------------------------------------------------
revno: 294
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-desktop
timestamp: Tue 2007-07-24 17:50:44 +0100
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 16:43:02 +0000
+++ b/debian/changelog	2007-07-24 16:50:44 +0000
@@ -8,8 +8,9 @@
     inequality if necessary.
   * Bumped debhelper compat to 5.
   * Bumped Standards-Version to 3.7.2.
+  * Cleanup rules.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Tue, 24 Jul 2007 17:42:35 +0100
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Tue, 24 Jul 2007 17:50:25 +0100
 
 hildon-desktop (1:0.0.24-1) sardine; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-07-19 18:00:15 +0000
+++ b/debian/rules	2007-07-24 16:50:44 +0000
@@ -3,17 +3,12 @@
 # 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
+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)
 
 ifneq (,$(findstring maemo-launcher,$(DEB_BUILD_OPTIONS)))
    LAUNCHER = yes
@@ -29,12 +24,6 @@
 	CFLAGS += -mthumb -fPIC
 endif
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -43,11 +32,19 @@
 	CFLAGS += -ggdb -DDEBUG
 endif
 
+configure_flags := \
+				--host=$(DEB_HOST_GNU_TYPE) \
+				--build=$(DEB_BUILD_GNU_TYPE) \
+				--prefix=/usr \
+				--sysconfdir=/etc \
+				--mandir=\$${prefix}/share/man \
+				--infodir=\$${prefix}/share/info \
+				--disable-dependency-tracking
+
 config.status: configure
 	dh_testdir
 # Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-dependency-tracking
-
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 build: build-stamp
 build-stamp:  config.status
@@ -61,11 +58,8 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
-
 # Add here commands to clean up after the build process.
-	-$(MAKE) distclean
-
-
+	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean 
 
 install: build
@@ -73,7 +67,6 @@
 	dh_testroot
 #	dh_clean -k 
 	dh_installdirs
-
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 ifeq "$(strip $(LAUNCHER))" "yes"
 	mv debian/tmp/usr/bin/hildon-desktop debian/tmp/usr/bin/hildon-desktop.launch
@@ -93,27 +86,15 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
-#	dh_installexamples
 	dh_installdocs
 	dh_install --sourcedir=debian/tmp
 	install -m0755 debian/start-hildon debian/hildon-desktop/usr/bin/start-hildon
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
 	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip --dbg-package="hildon-desktop" --dbg-package="libhildondesktop0" --dbg-package="libhildonwm0"
+	dh_strip --dbg-package="hildon-desktop" --dbg-package="libhildondesktop0" --dbg-package="libhildonwm0-dbg"
 	dh_compress
 	dh_fixperms
-#	dh_installinit -- start 51 2 3 4 . stop 20 0 1 5 6 .
-#	dh_perl
-#	dh_python
 	dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps