./modest/debian r2: Misc cosmetic cleanups (whitespaces and such).

[Loïc Minier]

------------------------------------------------------------
revno: 2
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Thu 2008-08-14 16:16:01 +0200
message:
  Misc cosmetic cleanups (whitespaces and such).
modified:
  debian/changelog
  debian/control
  debian/copyright
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-07-04 13:23:38 +0000
+++ b/debian/changelog	2008-08-14 14:16:01 +0000
@@ -1,12 +1,13 @@
 modest (1.0+svn1091.debian-1) UNRELEASED; urgency=low
 
+  [ Jonny Lamb ]
   * Initial upload to Debian. (Closes: #465589)
   * debian/compat: Upped to 5.
   * debian/control:
     + Changed Maintainer to Debian Maemo Maintainers.
     + Added Loic, myself and Riku to Uploaders.
     + Wrapped and alphabetized deps and build-deps.
-    + Upped Standards-Version to 3.7.3. 
+    + Upped Standards-Version to 3.7.3.
     + Removed XB-Maemo-Icon.
     + Changed ${Source-Version} to ${binary:Version}.
     + Updated short and long descriptions.
@@ -20,6 +21,9 @@
     + Updated to include more docs.
   * debian/rules: Severely cleaned up.
 
+  [ Loic Minier ]
+  * Misc cosmetic cleanups (whitespaces and such).
+
  -- Jonny Lamb <jonnylamb at jonnylamb.com>  Fri, 27 Jun 2008 21:00:21 +0100
 
 modest (1.0-maemo36) feisty; urgency=low

=== modified file 'debian/control'
--- a/debian/control	2008-07-04 13:23:38 +0000
+++ b/debian/control	2008-08-14 14:16:01 +0000
@@ -5,7 +5,7 @@
 Uploaders: Loic Minier <lool at dooz.org>,
            Jonny Lamb <jonnylamb at jonnylamb.com>,
            Riku Voipio <riku.voipio at iki.fi>
-XSBC-Original-Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema at nokia.com> 
+XSBC-Original-Maintainer: Dirk-Jan C. Binnema <dirk-jan.binnema at nokia.com>
 Build-Depends: debhelper (>= 5.0.0),
                gtk-doc-tools,
                libdbus-1-dev,
@@ -32,7 +32,7 @@
                libwpeditor-plus-dev,
                quilt
 Standards-Version: 3.7.3
-Vcs-Bzr: http://bzr.debian.org/pkg-maemo/modest/debian/
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-maemo/modest/debian/
 
 Package: modest
 Architecture: any

=== modified file 'debian/copyright'
--- a/debian/copyright	2008-07-04 13:23:38 +0000
+++ b/debian/copyright	2008-08-14 14:16:01 +0000
@@ -1,4 +1,4 @@
-modest is an e-mail client for platforms with modest resources. 
+modest is an e-mail client for platforms with modest resources.
 
 It was downloaded from: http://modest.garage.maemo.org/
 

=== modified file 'debian/rules'
--- a/debian/rules	2008-07-04 13:23:38 +0000
+++ b/debian/rules	2008-08-14 14:16:01 +0000
@@ -5,7 +5,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-configure_flags := \
+configure_flags += \
 	--host=$(DEB_HOST_GNU_TYPE) \
 	--build=$(DEB_BUILD_GNU_TYPE) \
 	--prefix=/usr \
@@ -14,7 +14,7 @@
 	--infodir=\$${prefix}/share/info \
 	--with-platform=maemo
 
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g
 CFLAGS += -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)
@@ -29,30 +29,30 @@
 	dh_testdir
 	if [ ! -x configure ]; then NOCONFIGURE=1 ./autogen.sh; fi
 	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
-	touch configure-stamp
+	touch $@
 
 build: build-stamp
 
 build-stamp: configure
 	dh_testdir
 	$(MAKE)
-	touch build-stamp
+	touch $@
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f *-stamp 
+	rm -f *-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	-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 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
@@ -61,7 +61,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp