debian packaging update

qgis · Sep 16, 2013 · 6d01d7e · 6d01d7e
1 parent 6faa102
commit 6d01d7e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 172 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.0.1-1) UNRELEASED; urgency=low
+
+  * drop qgis_icon.xpm and use "upstream" version
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 15 Sep 2013 21:59:49 +0200
+
 qgis (2.0.1) UNRELEASED; urgency=low
 
   * branch of version 2.0

diff --git a/debian/qgis-icon.xpm b/debian/qgis-icon.xpm
diff --git a/debian/qgis.install b/debian/qgis.install
@@ -14,7 +14,7 @@ usr/lib/qgis/plugins/libzonalstatisticsplugin.so
 usr/lib/qgis/plugins/libheatmapplugin.so
 usr/lib/qgis/plugins/libtopolplugin.so
 usr/lib/qgis/qgis_help
-usr/share/pixmaps/qgis-icon.xpm
+usr/share/pixmaps/qgis-icon.png
 usr/share/pixmaps/qgis-mime-icon.png
 usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes
 ../qgis.desktop usr/share/applications

diff --git a/debian/rules b/debian/rules
@@ -208,7 +208,6 @@ install: build
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
 	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
-	install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps
 
 # Build architecture-independent files here.
 binary-indep: build install