[SCM] qgis branch, master, updated. upstream/2.0.1-13442-g4a15bef

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit b1eeffce11c3ee6885fe12ab5a98d4826a7fd1d2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 28 12:30:27 2013 +0200

    Fix man page installation.

diff --git a/debian/qgis.manpages b/debian/qgis.manpages
deleted file mode 100644
index f90fa84..0000000
--- a/debian/qgis.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/man/man1/qgis.1
-usr/man/man1/qbrowser.1
diff --git a/debian/rules b/debian/rules
index 2d959a7..1dfc923 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,6 +114,10 @@ override_dh_auto_install:
 	# remove extra license files
 	-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
 
+	# Man pages are installed by dh_installman
+	$(RM) -f $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
+	$(RM) -f $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
+
 	# Install menu pixmap
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.svg

-- 
The Quantum GIS in Debian project