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

[Loïc Minier]

------------------------------------------------------------
revno: 50
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Tue 2007-07-24 17:36:38 +0200
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 15:28:48 +0000
+++ b/debian/changelog	2007-07-24 15:36:38 +0000
@@ -26,8 +26,9 @@
   * Add Debian revision to version.
   * Don't ignore distclean errors.
   * Loosen the libhildonhelp-dev -> libhildonhelp0 dep to permit bin NMUs.
+  * Cleanup rules.
 
- -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 17:28:27 +0200
+ -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 17:36:34 +0200
 
 libhildonhelp (1.9.3-1) unstable; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-07-24 15:27:50 +0000
+++ b/debian/rules	2007-07-24 15:36:38 +0000
@@ -6,7 +6,6 @@
 # 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)
@@ -15,14 +14,20 @@
 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
+configure_flags := \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--with-doc-dir=\$${prefix}/share/doc \
+		--disable-dependency-tracking \
+		--disable-gtk-doc \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE)
 
 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 --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-doc-dir=\$${prefix}/share/doc --disable-dependency-tracking --disable-gtk-doc
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 configure:
 	libtoolize --copy --automake
@@ -32,19 +37,16 @@
 	automake --copy --add-missing --foreign
 
 build: build-stamp
-build-stamp:  config.status
+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
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 	-test -r /usr/share/misc/config.sub && test -r config.sub && \
@@ -56,14 +58,12 @@
 install: build
 	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/tmp
 	rm -f $(CURDIR)/debian/tmp/usr/lib/outo/*.*a
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -72,20 +72,20 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_install --sourcedir=debian/tmp -v
-	dh_installman
-	dh_link
-	dh_strip --dbg-package=libhildonhelp0-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -s
+	dh_installdocs -s
+	dh_install -s --sourcedir=debian/tmp -v
+	dh_installman -s
+	dh_link -s
+	dh_strip -s --dbg-package=libhildonhelp0-dbg
+	dh_compress -s
+	dh_fixperms -s
+	dh_makeshlibs -s -V
+	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