[Pkg-osm-commits] [SCM] osm-gps-map branch, master, updated. debian/0.7.3-3-17-g7e2991c

[David Paleino]

The following commit has been merged in the master branch:
commit 20a4817de9125d87779c696561e9909d15f83fb0
Author: David Paleino <dapal at debian.org>
Date:   Sat Dec 14 23:45:49 2013 +0100

    Simplified debian/rules :)

diff --git a/debian/changelog b/debian/changelog
index 1b13e40..8679610 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osm-gps-map (1.0.1-1) UNRELEASED; urgency=medium
   * Bump GTK build-dep to >= 3.0
   * New package gir1.2-osmgpsmap-1.0, new SONAME osmgpsmap-1.0
   * Patches dropped, no more needed
+  * Simplified debian/rules :)
 
- -- David Paleino <dapal at debian.org>  Sat, 14 Dec 2013 23:43:51 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 14 Dec 2013 23:45:41 +0100
 
 osm-gps-map (0.7.3-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 2c1173f..186f115 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,44 +7,24 @@
 export CFLAGS+=-UGDK_DISABLE_DEPRECATED
 export DEB_BUILD_HARDENING=1
 
-# This is a bit hacky.
 override_dh_auto_configure:
 	NOCONFIGURE=y ./autogen.sh
 	dh_auto_configure -- \
 		--enable-maintainer-mode \
-		--disable-introspection \
 		--enable-gtk-doc \
 		--enable-gtk-doc-html \
 		--enable-gtk-doc-pdf
 
 override_dh_auto_install:
-	for py in $(shell pyversions -r); do \
-		PYTHON=$$py dh_auto_configure -Dpython/; \
-		dh_auto_build -Dpython/; \
-		dh_auto_install -Dpython/; \
-		dh_auto_clean -Dpython/; \
-		find $(CURDIR)/debian/tmp/usr/lib/$$py \( -name "*.a" -o -name "*.la" \) -delete ; \
-	done
 	dh_auto_install
-	rm -rf $(CURDIR)/debian/python-osmgpsmap/usr/share/pyshared/gtk-2.0/
+	dh_girepository
 
 override_dh_auto_clean:
 	dh_auto_clean
-	find . \( -name "*.o" -o -name "*.lo" -o -name "*.la" \) -delete
-	find . \( -name "*.in" -a -not -name "osmgpsmap.pc.in" -a -not -name "version.xml.in" \) -delete
-	find . \( -name ".deps" -o -name ".libs" -o -name "autom4te.cache" \) -type d | xargs rm -rf
-
-	find . -name "Makefile" -delete
-	find . \( -name "config.guess" -o -name "config.h" -o -name "config.log" \
-		-o -name "config.sub" -o -name "config.status" -o -name "configure" \) -delete
-	find . \( -name "install-sh" -o -name "libtool" -o -name "ltmain.sh" \
-		-o -name "missing" -o -name "INSTALL" \
-		-o -name "aclocal.m4" -o -name "depcomp" \) -delete
 	rm -rf docs/reference/tmpl/
 
 override_dh_strip:
 	dh_strip --keep-debug --dbg-package=libosmgpsmap-1.0-dbg
 
 %:
-	dh $@ \
-		--with python2
+	dh $@

-- 
GTK+ library to embed OpenStreetMap maps