[Pkg-maemo-commits] r42 ./hildon-help/debian: * Cleanup rules.

[Jonny Lamb]

------------------------------------------------------------
revno: 42
committer: Jonny Lamb <jonnylamb at jonnylamb.com>
branch nick: hildon-help
timestamp: Mon 2007-07-23 03:56:34 +0100
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-23 02:39:51 +0000
+++ b/debian/changelog	2007-07-23 02:56:34 +0000
@@ -13,8 +13,9 @@
     signed ints, instead of unsigned.
   * Remove reference to Opera browser styles in libhildonhelp0.install as
     they are not getting installed.
+  * Cleanup rules.
 
- -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 03:39:11 +0100
+ -- Jonny Lamb <jonnylamb at jonnylamb.com>  Mon, 23 Jul 2007 03:56:07 +0100
 
 libhildonhelp (1.9.3-1) unstable; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-05-29 14:09:27 +0000
+++ b/debian/rules	2007-07-23 02:56:34 +0000
@@ -12,14 +12,9 @@
 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 -fPIC -DPIC
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -Wall -g -fPIC -DPIC
+CFLAGS += -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -52,15 +47,11 @@
 
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-	dh_clean 
+	-test -r /usr/share/misc/config.sub && test -r config.sub && \
+		cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && test -r config.guess && \
+		cp -f /usr/share/misc/config.guess config.guess
+	dh_clean
 
 install: build
 	dh_testdir
@@ -82,25 +73,13 @@
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
-#	dh_installexamples
 	dh_installdocs
 	dh_install --sourcedir=debian/tmp -v
-#	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=libhildonhelp0
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
 	dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps