./hildon-fm/debian r369: Cleanup rules.

[Loïc Minier]

------------------------------------------------------------
revno: 369
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Sun 2008-08-24 20:46:10 +0200
message:
  Cleanup rules.
modified:
  debian/changelog
  debian/control
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-08-24 18:08:17 +0000
+++ b/debian/changelog	2008-08-24 18:46:10 +0000
@@ -9,6 +9,7 @@
     - Update copyright instructions to mention that the tarball is now
       autotoolized with "NOCONFIGURE=1 ./autogen.sh" with Debian's autogen.sh.
   * Bump up Standards-Version to 3.8.0.
+  * Cleanup rules.
 
  -- Loic Minier <lool at dooz.org>  Sun, 24 Aug 2008 19:32:37 +0200
 

=== modified file 'debian/control'
--- a/debian/control	2008-08-24 18:08:17 +0000
+++ b/debian/control	2008-08-24 18:46:10 +0000
@@ -7,7 +7,7 @@
            Riku Voipio <riku.voipio at iki.fi>
 Build-Depends: debhelper (>= 5.0.0),
                pkg-config,
-               libosso-dev (>= 0.9.1-1),
+               libosso-dev (>= 0.9.1-1~),
                libgtk2.0-dev (>= 2.10),
                libxi-dev,
                libxt-dev,

=== modified file 'debian/rules'
--- a/debian/rules	2008-01-03 19:53:34 +0000
+++ b/debian/rules	2008-08-24 18:46:10 +0000
@@ -1,23 +1,13 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# 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 -Werror -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 # Use soft-float and thumb mode if it is enabled.
 CFLAGS += $(if $(findstring thumb,$(DEB_BUILD_OPTIONS)),-mthumb)
 
-configure_flags := \
+configure_flags += \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
@@ -30,15 +20,13 @@
 endif
 
 config.status:
-	if [ ! -x configure ]; then ./autogen.sh; fi
+	[ -x configure ] || ./autogen.sh
 	dh_testdir
-	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 build: build-stamp
 build-stamp: config.status
 	dh_testdir
-	# Add here commands to compile the package.
 	$(MAKE)
 	touch $@
 
@@ -46,7 +34,6 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf debian/build
 	dh_clean
@@ -56,14 +43,10 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	# Add here commands to install the package into debian/build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/build
 
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
@@ -72,7 +55,7 @@
 	dh_install --sourcedir=debian/build -v
 	dh_installman
 	dh_link
-	dh_strip --dbg-package="libhildonfm2-dbg"
+	dh_strip --dbg-package=libhildonfm2-dbg
 	dh_compress -Xindex.sgml
 	dh_fixperms
 	dh_makeshlibs -V