[DebianGIS-dev] r1732 - packages/gpsdrive/trunk/debian

[nd-guest at alioth.debian.org]

Author: nd-guest
Date: 2008-07-19 16:17:18 +0000 (Sat, 19 Jul 2008)
New Revision: 1732

Modified:
   packages/gpsdrive/trunk/debian/changelog
   packages/gpsdrive/trunk/debian/rules
Log:
remove cruft, prepare for release


Modified: packages/gpsdrive/trunk/debian/changelog
===================================================================
--- packages/gpsdrive/trunk/debian/changelog	2008-07-19 16:08:21 UTC (rev 1731)
+++ packages/gpsdrive/trunk/debian/changelog	2008-07-19 16:17:18 UTC (rev 1732)
@@ -1,4 +1,4 @@
-gpsdrive (2.10~pre4-4) UNRELEASED; urgency=low
+gpsdrive (2.10~pre4-4) unstable; urgency=low
 
   * No longer create openstreetmap-map-icons-* binary packages.
     They are build from the openstreetmap-map-icons source package
@@ -15,7 +15,7 @@
     in gpsdrive works again. Already fixed upstream.
     (Closes: #480234).
 
- -- Andreas Putzo <andreas at putzo.net>  Tue, 15 Jul 2008 19:49:07 +0000
+ -- Andreas Putzo <andreas at putzo.net>  Sat, 19 Jul 2008 16:16:51 +0000
 
 gpsdrive (2.10~pre4-3) unstable; urgency=low
 

Modified: packages/gpsdrive/trunk/debian/rules
===================================================================
--- packages/gpsdrive/trunk/debian/rules	2008-07-19 16:08:21 UTC (rev 1731)
+++ packages/gpsdrive/trunk/debian/rules	2008-07-19 16:17:18 UTC (rev 1732)
@@ -18,7 +18,7 @@
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
-else	
+else
 	CFLAGS += -O2
 endif
 
@@ -32,7 +32,7 @@
 	tar xzf ../tarballs/gpsdrive-${UPSTREAM_VERSION}.tar.gz -C ../tarballs/
 	@echo Removing upstream debian/ dir
 	rm -rf ../tarballs/gpsdrive-${UPSTREAM_VERSION}/debian/
-	@echo Remove gpsfetchmap.pl script. 
+	@echo Remove gpsfetchmap.pl script.
 	rm -f ../tarballs/gpsdrive-${UPSTREAM_VERSION}/scripts/gpsfetchmap.pl
 	@echo Removing icons.
 	rm -rf ../tarballs/gpsdrive-${UPSTREAM_VERSION}/data/map-icons/japan/
@@ -54,7 +54,6 @@
 				--enable-dbus \
 				CFLAGS="$(CFLAGS)"
 
-				
 build: build-arch build-indep
 
 build-arch: config.status build-arch-stamp
@@ -67,7 +66,7 @@
 build-indep-stamp:
 	touch $@
 	
-clean: clean-patched unpatch	
+clean: clean-patched unpatch
 
 clean-patched:
 	dh_testdir
@@ -83,11 +82,11 @@
 	dh_clean
 
 install: install-arch install-indep
+	dh_clean -k
 
 install-arch: build-arch
 	dh_testdir
 	dh_testroot
-	dh_clean -k
 	dh_installdirs -a
 	$(MAKE) -C data/ \
 			install-appsDATA \
@@ -96,17 +95,16 @@
 			install-poiDATA \
 			install-mapsDATA \
 			DESTDIR=$(DESTDIR)
-	install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik			
+	install -d $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik
 	install -m 644 $(CURDIR)/scripts/mapnik/osm.xml $(CURDIR)/debian/tmp/usr/share/gpsdrive/mapnik/osm.xml
 	install -d $(CURDIR)/debian/tmp/usr/share/map-icons
 	install -m 644 $(CURDIR)/data/map-icons/icons.xml $(CURDIR)/debian/tmp/usr/share/map-icons/icons.xml
 	$(MAKE) -C scripts/mapnik/ install DESTDIR=$(DESTDIR)
-	$(MAKE) -C src/ install DESTDIR=$(DESTDIR)			
+	$(MAKE) -C src/ install DESTDIR=$(DESTDIR)
 			
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k
 	dh_installdirs -i
 	$(MAKE) -C scripts/ install DESTDIR=$(DESTDIR)
 	$(MAKE) -C data/map-icons/ install DESTDIR=$(DESTDIR)
@@ -147,9 +145,9 @@
 	dh_testroot
 	dh_installchangelogs -a ChangeLog
 	dh_installdocs -a -Xdebian/TODO
-	dh_installman  -a --language=C 
-	dh_installman  -a --language=de -pgpsdrive man/de/gpsdrive.1 
-	dh_installman  -a --language=es -pgpsdrive man/es/gpsdrive.1 
+	dh_installman  -a --language=C
+	dh_installman  -a --language=de -pgpsdrive man/de/gpsdrive.1
+	dh_installman  -a --language=es -pgpsdrive man/es/gpsdrive.1
 	dh_installexamples -a
 	dh_install -a --sourcedir=$(DESTDIR)
 	dh_strip -a
@@ -158,7 +156,7 @@
 	dh_makeshlibs -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_gencontrol -a 
+	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a