[Pkg-maemo-commits] r104 ./sapwood/debian: * Cleanup rules.

[Loïc Minier]

------------------------------------------------------------
revno: 104
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Mon 2007-07-23 21:27:33 +0200
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-23 19:19:32 +0000
+++ b/debian/changelog	2007-07-23 19:27:33 +0000
@@ -16,8 +16,9 @@
 
   [ Loic Minier ]
   * Use ${binary:Version} instead of ${source:Version}.
+  * Cleanup rules.
 
- -- Loic Minier <lool at dooz.org>  Mon, 23 Jul 2007 21:19:15 +0200
+ -- Loic Minier <lool at dooz.org>  Mon, 23 Jul 2007 21:24:09 +0200
 
 sapwood (2.91.6-1) unstable; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-07-23 17:59:08 +0000
+++ b/debian/rules	2007-07-23 19:27:33 +0000
@@ -7,24 +7,12 @@
 
 gtk_binary_version=$(shell pkg-config --variable gtk_binary_version gtk+-2.0)
 
-# 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)
 
 configure:
 	NOCONFIGURE=1 ./autogen.sh
@@ -42,10 +30,8 @@
 clean:
 	dh_testdir
 	dh_testroot
-
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-
 	dh_clean build-stamp install-stamp
 
 install: install-stamp
@@ -54,14 +40,11 @@
 	dh_testroot
 	dh_clean
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
 	install -d -m755 debian/tmp/etc/osso-af-init
 	install -m755 debian/sapwood-server.sh debian/tmp/etc/osso-af-init
-
 	for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-		sed -e "s/@BINVER@/${gtk_binary_version}/g" $$f > $${f%.in}; \
+		sed -e "s/@BINVER@/$(gtk_binary_version)/g" $$f > $${f%.in}; \
 	done
-
 	touch $@
 
 # Build architecture-independent files here.
@@ -69,26 +52,22 @@
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install 
-	dh_testdir -a 
-	dh_testroot -a
-	dh_installdirs -a
-	dh_install -a --sourcedir=debian/tmp
-	dh_installdocs -a
-	dh_installchangelogs -a ChangeLog
-#	dh_installexamples -a
-	dh_strip -a --dbg-package=gtk2-engines-sapwood-dbg
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_makeshlibs -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdirs -s
+	dh_install -s --sourcedir=debian/tmp
+	dh_installdocs -s
+	dh_installchangelogs -s ChangeLog
+	dh_strip -s --dbg-package=gtk2-engines-sapwood-dbg
+	dh_compress -s
+	dh_fixperms -s
+	dh_installdeb -s
+	dh_shlibdeps -s
+	dh_gencontrol -s
+	dh_makeshlibs -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary