diff --git a/debian/control.sid-oracle → debian/control.in b/debian/control.sid-oracle → debian/control.in
@@ -1,33 +1,42 @@
 Source: qgis
+Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
+Uploaders: Jürgen E. Fischer <jef@norbit.de>
 Section: science
 Priority: optional
-Maintainer: QGIS developers <qgis-developer@lists.osgeo.org>
 Build-Depends:
  bison,
  cmake (>= 2.8),
- debhelper (>= 9),
+#sid jessie wheezy quantal raring saucy sid-oracle trusty# debhelper (>= 9),
+#precise# debhelper (>= 7),
  flex,
  grass-dev,
  libexpat1-dev,
  libfcgi-dev,
- libgdal-dev (>= 1.10.1-0~),
+#sid jessie sid-oracle trusty# libgdal-dev (>= 1.10.1-0~),
+#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
+#quantal raring saucy# libgdal-dev (>= 1.9.0),
+#wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
  libpq-dev,
  libproj-dev,
  libqt4-dev (>= 4.7.0),
  libqt4-opengl-dev,
  libqtwebkit-dev,
- libqwt-dev,
+#sid jessie wheezy quantal sid-oracle# libqwt-dev,
+#precise raring saucy trusty# libqwt5-qt4-dev,
  libspatialite-dev,
  libsqlite3-dev,
  libspatialindex-dev,
  pkg-config,
  pyqt4-dev-tools,
- python-all (>= 2.6.6-3~),
- python-all-dev (>= 2.6.6-3~),
- python-qt4 (>= 4.1.0),
- python-qt4-dev,
+#precise quantal raring saucy wheezy# python,
+#precise raring saucy# python-central (>=0.5),
+#raring saucy wheezy# python-dev,
+#raring saucy# libpython2.7-dev,
+#quantal# python-dev (>= 2.6.6-3~),
+#sid jessie sid-oracle trusty# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
+#sid jessie wheezy precise quantal raring saucy sid-oracle trusty# python-qt4 (>= 4.1.0), python-qt4-dev,
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
  libosgearth-dev,
@@ -38,17 +47,29 @@ Build-Depends:
  txt2tags,
  xvfb, xauth,
  xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
- oracle-instantclient11.2-devel,
+#sid-oracle# oracle-instantclient11.2-devel,
  spawn-fcgi, lighttpd, poppler-utils
 Build-Conflicts: libqgis-dev, qgis-dev
-Standards-Version: 3.9.5
+#sid jessie sid-oracle#Standards-Version: 3.9.5
+#wheezy quantal#Standards-Version: 3.9.3
+#precise raring saucy trusty#Standards-Version: 3.8.4
+#sid jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
+#wheezy precise quantal raring saucy trusty#XS-Python-Version: current
+Vcs-Browser: https://github.com/qgis/QGIS/
+Vcs-Git: https://github.com/qgis/QGIS.git
 Homepage: http://qgis.org/
-X-Python-Version: >= 2.7, << 2.8
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
-Recommends: qgis-plugin-grass, python-qgis, qgis-plugin-globe
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+ qgis-providers (= ${binary:Version}),
+ qgis-common (= ${source:Version})
+Recommends:
+ qgis-plugin-grass,
+ qgis-plugin-globe,
+ python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
@@ -70,39 +91,128 @@ Description: QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with QGIS.
 
-Package: libqgis{QGIS_ABI}
+Package: libqgis-core{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared core library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared core library.
+
+Package: libqgis-gui{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces:
+ libqgis{QGIS_ABI}
+Description: QGIS - shared gui library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared gui library.
+
+Package: libqgis-analysis{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared analysis library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared analysis library.
+
+Package: libqgis-networkanalysis{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared network analysis library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared network analysis library.
+
+Package: libqgisgrass{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared grass library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared grass library.
+
+Package: libqgispython{QGIS_ABI}
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
-Conflicts: libqgis-core{QGIS_ABI}, libqgis-gui{QGIS_ABI}
-Description: QGIS - shared libraries
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared python library
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
- This package contains the shared core and gui library that provide an
- interface for plugins and stand-alone applications.
+ This package contains the shared python library.
+
+Package: libqgissqlanyconnection{QGIS_ABI}
+Architecture: any
+Section: libs
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: libqgis{QGIS_ABI}
+Description: QGIS - shared sqlanywhere connection library
+ QGIS is a Geographic Information System (GIS) which manages, analyzes and
+ display databases of geographic information.
+ .
+ This package contains the shared sqlanywhere connection library.
 
 Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends:
  grass-dev,
  libexpat1-dev,
- libgdal-dev (>= 1.10.1-0~),
+#sid jessie sid-oracle trusty# libgdal-dev (>= 1.10.1-0~),
+#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
+#quantal raring saucy# libgdal-dev (>= 1.9.0),
+#wheezy# libgdal1-dev,
  libgeos-dev (>= 3.0.0),
  libgsl0-dev,
  libpq-dev,
  libproj-dev,
- libqgis{QGIS_ABI} (= ${binary:Version}),
+ libqgis-core{QGIS_ABI} (= ${binary:Version}),
+ libqgis-gui{QGIS_ABI} (= ${binary:Version}),
+ libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
+ libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
+ libqgisgrass{QGIS_ABI} (= ${binary:Version}),
+ libqgispython{QGIS_ABI} (= ${binary:Version}),
+ libqgissqlanyconnection{QGIS_ABI} (= ${binary:Version}),
  libqt4-dev (>=4.6.0),
  libsqlite3-dev,
  python-qt4 (>=4.1.0),
  python-qt4-dev (>=4.1.0),
- qt4-designer (>= 4.8.0),
+ qt4-designer,
  ${misc:Depends}
 Provides: qgis-dev
-Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
+Replaces:
+ libqgis1-dev
 Description: QGIS - development files
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -112,7 +222,12 @@ Description: QGIS - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass{GRASS_ABI}
+Depends:
+ qgis (= ${binary:Version}),
+ qgis-plugin-grass-common (= ${source:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+ grass{GRASS_ABI}
 Description: GRASS plugin for QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -121,7 +236,11 @@ Description: GRASS plugin for QGIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: python2.7, ${python:Depends}, ${misc:Depends}
+Depends:
+#sid jessie saucy sid-oracle trusty# python2.7,
+#wheezy precise# python,
+ ${python:Depends},
+ ${misc:Depends}
 Replaces: qgis-common (<< 1.5)
 Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for QGIS - architecture-independent data
@@ -132,29 +251,31 @@ Description: GRASS plugin for QGIS - architecture-independent data
  with the QGIS GRASS plugin.
 
 Package: python-qgis
-Section: python
 Architecture: any
+Section: python
 Depends:
  python-qt4,
  python-sip,
  python-qgis-common (= ${source:Version}),
  python-psycopg2,
  python-qscintilla2,
- python-pyspatialite,
+#sid jessie quantal sid-oracle# python-pyspatialite,
+ libqgispython{QGIS_ABI},
  ${shlibs:Depends},
  ${python:Depends},
  ${misc:Depends},
  ${sip:Depends}
 Provides: ${python:Provides}
+#wheezy precise quantal raring#XB-Python-Version: ${python:Versions}
 Description: Python bindings to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
  This package contains the files for the Python support.
 
 Package: python-qgis-common
-Section: python
 Architecture: all
+Section: python
 Provides: ${python:Provides}
 Depends:
  gdal-bin,
@@ -163,6 +284,7 @@ Depends:
  ${python:Depends},
  ${misc:Depends},
  ${sip:Depends}
+XB-Python-Version: ${python:Versions}
 Description: Python bindings to QGIS - architecture-independent files
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -172,13 +294,14 @@ Description: Python bindings to QGIS - architecture-independent files
 
 Package: qgis-providers
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends:
  qgis-providers-common (= ${source:Version}),
  libqt4-sql-sqlite,
  ${shlibs:Depends},
  ${misc:Depends}
-Replaces: qgis (<= 1.6)
 Breaks: qgis (<= 1.6)
+Replaces: qgis (<= 1.6)
 Description: collection of data providers to QGIS
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -187,9 +310,9 @@ Description: collection of data providers to QGIS
 
 Package: qgis-providers-common
 Architecture: all
+Depends: ${misc:Depends}
 Replaces: qgis-common (<= 1.6)
 Breaks: qgis-common (<= 1.6)
-Depends: ${misc:Depends}
 Description: collection of data providers to QGIS - architecture-independent files
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -210,8 +333,13 @@ Description: QGIS mapserver
 
 Package: qgis-sqlanywhere
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts:
+ qgis-sqlanywhere1.7.0,
+ qgis-sqlanywhere1.7.1,
+ qgis-sqlanywhere1.8.0
 Description: QGIS sql anywhere plugin and provider
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -221,7 +349,9 @@ Description: QGIS sql anywhere plugin and provider
 Package: qgis-api-doc
 Architecture: all
 Section: doc
-Depends: libjs-jquery
+Depends:
+ libjs-jquery,
+ ${misc:Depends}
 Description: QGIS API documentation
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
@@ -243,20 +373,23 @@ Description: OSG globe plugin for QGIS
 
 Package: qgis-plugin-globe-common
 Architecture: all
-Description: OSG GLOBE plugin for QGIS - architecture-independent data
+Depends:
+ osgearth-data,
+ ${misc:Depends}
+Description: OSG globe plugin for QGIS - architecture-independent data
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
  .
  This package contains architecture-independent supporting data files for use
  with the QGIS GLOBE plugin.
 
-Package: qgis-oracle-provider
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Section: contrib/databases
-Description: QGIS oracle provider
- QGIS is a Geographic Information System (GIS) which manages, analyzes and
- display databases of geographic information.
- .
- This package contains the QGIS oracle provider.
-
+#sid-oracle#Package: qgis-oracle-provider
+#sid-oracle#Architecture: any
+#sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
+#sid-oracle#Section: contrib/databases
+#sid-oracle#Description: QGIS oracle provider
+#sid-oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
+#sid-oracle# display databases of geographic information.
+#sid-oracle# .
+#sid-oracle# This package contains the QGIS oracle provider.
+#sid-oracle#
diff --git a/debian/control.jessie b/debian/control.jessie
diff --git a/debian/control.precise b/debian/control.precise
diff --git a/debian/control.quantal b/debian/control.quantal
diff --git a/debian/control.raring b/debian/control.raring
diff --git a/debian/control.saucy b/debian/control.saucy
diff --git a/debian/control.sid b/debian/control.sid
diff --git a/debian/control.trusty b/debian/control.trusty
diff --git a/debian/control.wheezy b/debian/control.wheezy
diff --git a/debian/libqgis-analysis{QGIS_ABI}.install b/debian/libqgis-analysis{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgis_analysis.so.{QGIS_ABI}
diff --git a/debian/libqgis-core{QGIS_ABI}.install b/debian/libqgis-core{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgis_core.so.{QGIS_ABI}
diff --git a/debian/libqgis-gui{QGIS_ABI}.install b/debian/libqgis-gui{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgis_gui.so.{QGIS_ABI}
diff --git a/debian/libqgis-networkanalysis{QGIS_ABI}.install b/debian/libqgis-networkanalysis{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgis_networkanalysis.so.{QGIS_ABI}
diff --git a/debian/libqgisgrass{QGIS_ABI}.install b/debian/libqgisgrass{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgisgrass.so.{QGIS_ABI}
diff --git a/debian/libqgissqlanyconnection{QGIS_ABI}.install b/debian/libqgissqlanyconnection{QGIS_ABI}.install
@@ -0,0 +1 @@
+usr/lib/libqgissqlanyconnection.so.{QGIS_ABI}
diff --git a/debian/libqgis{QGIS_ABI}.install b/debian/libqgis{QGIS_ABI}.install
diff --git a/debian/mime/application/x-esri-crs.desktop b/debian/mime/application/x-esri-crs.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-esri-crs
 Hidden=false
 Comment=ESRI coordinate reference system
 Comment[de]=ESRI-Koordinatenbezugssystem
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.prj;
diff --git a/debian/mime/application/x-esri-shape.desktop b/debian/mime/application/x-esri-shape.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-esri-shape
 Hidden=false
 Comment=ESRI shape file
 Comment[de]=ESRI-Shapedatei
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.shp;*.shx;
diff --git a/debian/mime/application/x-mapinfo-mif.desktop b/debian/mime/application/x-mapinfo-mif.desktop
@@ -5,5 +5,5 @@ Hidden=false
 Comment=MapInfo file
 Comment[de]=MapInfo-Datei
 Patterns=*.mif;
-Icon=qgis-mime-icon
+Icon=qgis-mime
 X-KDE-PatternsAccuracy=60
diff --git a/debian/mime/application/x-qgis-layer-settings.desktop b/debian/mime/application/x-qgis-layer-settings.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-qgis-layer-settings
 Hidden=false
 Comment=QGIS layer settings
 Comment[de]=QGIS Layer Einstellungen
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.qml;
diff --git a/debian/mime/application/x-qgis-project.desktop b/debian/mime/application/x-qgis-project.desktop
@@ -5,5 +5,5 @@ Hidden=false
 Comment=QGIS Project
 Comment[de]=QGIS-Projekt
 Patterns=*.qgs;
-Icon=qgis-mime-icon
+Icon=qgis-mime
 X-KDE-IsAlso=application/x-qgis
diff --git a/debian/mime/application/x-raster-aig.desktop b/debian/mime/application/x-raster-aig.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-raster-aig
 Hidden=false
 Comment=AIG raster data
 Comment[de]=AIG-Rasterdaten
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.aig;
diff --git a/debian/mime/application/x-raster-ecw.desktop b/debian/mime/application/x-raster-ecw.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-raster-ecw
 Hidden=false
 Comment=ECW raster data
 Comment[de]=ECW-Rasterdaten
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.ecw;
diff --git a/debian/mime/application/x-raster-mrsid.desktop b/debian/mime/application/x-raster-mrsid.desktop
@@ -4,5 +4,5 @@ MimeType=application/x-raster-mrsid
 Hidden=false
 Comment=MrSID raster data
 Comment[de]=MrSID-Rasterdaten
-Icon=qgis-mime-icon
+Icon=qgis-mime
 Patterns=*.sid;
diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in
@@ -0,0 +1,5 @@
+usr/lib/python*/*-packages/qgis/*.py
+usr/lib/python*/*-packages/qgis/*.so
+#wheezy saucy trusty#usr/lib/python*/*-packages/pyspatialite/*.py
+#wheezy saucy trusty#usr/lib/python*/*-packages/pyspatialite/*.so
+usr/lib/libqgispython.so.{QGIS_ABI}
diff --git a/debian/python-qgis.install.jessie b/debian/python-qgis.install.jessie
diff --git a/debian/python-qgis.install.precise b/debian/python-qgis.install.precise
diff --git a/debian/python-qgis.install.quantal b/debian/python-qgis.install.quantal
diff --git a/debian/python-qgis.install.raring b/debian/python-qgis.install.raring
diff --git a/debian/python-qgis.install.saucy b/debian/python-qgis.install.saucy
diff --git a/debian/python-qgis.install.sid b/debian/python-qgis.install.sid
diff --git a/debian/python-qgis.install.trusty b/debian/python-qgis.install.trusty
diff --git a/debian/python-qgis.install.wheezy b/debian/python-qgis.install.wheezy
diff --git a/debian/qbrowser.desktop b/debian/qbrowser.desktop
@@ -47,9 +47,10 @@ GenericName[th]=ระบบสารสนเทศภูมิศาสตร
 GenericName[tr]=Coğrafi bilgi sistemi
 GenericName[uk]=Геоінформаційна система
 GenericName[uz]=Geografik axborot tizimi
-Icon=qgis-icon
+Icon=qgis
 TryExec=/usr/bin/qbrowser
 Exec=/usr/bin/qbrowser %F
 Terminal=false
 StartupNotify=false
 Categories=Qt;Education;Science;Geography;
+Keywords=map;globe;postgis;wms;wfs;ogc;osgeo
diff --git a/debian/qgis-icon.xpm b/debian/qgis-icon.xpm
@@ -0,0 +1,170 @@
+/* XPM */
+static char *qgis_icon[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 132 2",
+"   c #070C05",
+".  c #0B2605",
+"X  c #072E01",
+"o  c #0A2F04",
+"O  c #063300",
+"+  c #083602",
+"@  c #1F3E11",
+"#  c #203115",
+"$  c #0A4301",
+"%  c #094A00",
+"&  c #1A4A0D",
+"*  c #095100",
+"=  c #0A5B00",
+"-  c #1C550D",
+";  c #1E4810",
+":  c #31431F",
+">  c #0B6300",
+",  c #0C6A00",
+"<  c #156707",
+"1  c #1C660B",
+"2  c #1A6A09",
+"3  c #0E7400",
+"4  c #0F7B00",
+"5  c #147605",
+"6  c #147A04",
+"7  c #187D07",
+"8  c #20720F",
+"9  c #266614",
+"0  c #267B11",
+"q  c #327A1A",
+"w  c #364E21",
+"e  c #44472C",
+"r  c #505334",
+"t  c #555837",
+"y  c #5C5F3C",
+"u  c #426E26",
+"i  c #427F26",
+"p  c #47722B",
+"a  c #646740",
+"s  c #6C6F48",
+"d  c #717549",
+"f  c #74794A",
+"g  c #797E4E",
+"h  c #7B7E51",
+"j  c #7C7E5B",
+"k  c #0F8001",
+"l  c #118401",
+"z  c #118A01",
+"x  c #1A8C07",
+"c  c #1C8109",
+"v  c #1C8B09",
+"b  c #2D8E15",
+"n  c #2F9315",
+"m  c #549431",
+"M  c #67903F",
+"N  c #53A62F",
+"B  c #60A738",
+"V  c #6A8F41",
+"C  c #728D47",
+"Z  c #78914F",
+"A  c #7E8251",
+"S  c #7DAD57",
+"D  c #7CB255",
+"F  c #808352",
+"G  c #858A56",
+"H  c #91975E",
+"J  c #959D5F",
+"K  c #83AD51",
+"L  c #90A75C",
+"P  c #94A85E",
+"I  c #969A60",
+"U  c #9EA266",
+"Y  c #95A866",
+"T  c #9BAC62",
+"R  c #A2AA69",
+"E  c #A1B866",
+"W  c #A6B36A",
+"Q  c #ACB26F",
+"!  c #A9AD73",
+"~  c #ACB672",
+"^  c #B1B477",
+"/  c #B7BE77",
+"(  c #B8BE76",
+")  c #B9BF79",
+"_  c #B9C476",
+"`  c #BCC47A",
+"'  c #BCCD79",
+"]  c #C3CB7D",
+"[  c #BCBF86",
+"{  c #B9C887",
+"}  c #BEC98B",
+"|  c #C1C483",
+" . c #C7CE80",
+".. c #C8CF80",
+"X. c #C4CA8D",
+"o. c #CCD383",
+"O. c #C7DC80",
+"+. c #D0D786",
+"@. c #D2DB87",
+"#. c #D2D788",
+"$. c #D4DC88",
+"%. c #C6C792",
+"&. c #D1D396",
+"*. c #D9DE93",
+"=. c #DCDE9B",
+"-. c #DCE38D",
+";. c #DEE491",
+":. c #DEE19B",
+">. c #E4EC93",
+",. c #E4E69D",
+"<. c #E7E89E",
+"1. c #E8E99C",
+"2. c #EAF296",
+"3. c #EDF599",
+"4. c #F1F69D",
+"5. c #F5F99F",
+"6. c #D5D6A0",
+"7. c #DADBA2",
+"8. c #ECEEA1",
+"9. c #E2E4AD",
+"0. c #EEF2A3",
+"q. c #F2F7A3",
+"w. c #F5F9A3",
+"e. c #FAFCA4",
+"r. c #F2F5AB",
+"t. c #F7FBAA",
+"y. c #F9FAAC",
+"u. c #F9FCB1",
+"i. c #F3F4BA",
+"p. c #FAFBBB",
+"a. c #FCFCC4",
+"s. c None",
+/* pixels */
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.l s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.z z 4 s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.z z z 3 s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.4 z z z 4 3 = s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.< , 4 3 , * s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.9.6.%.&.=.:.Z 9 = 3 , > % s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.a.p.u.! h s.s.` ;.O.N l 4 > * O s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.a.u.0.;.s s.s.s.s.' B n l 1 $ X s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.p.p.w.>.o.e s.s.s.s.K n v c u w s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.a.p.w.3.$.Q s.s.s.s.s.5 z 7 q J H s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.u.t.3.2.o.H s.s.s.s.l l l i C o.o.` s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.p.y.w.3.2.o.G s.s.s.s.l l 0 M T >.-. .s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.p.w.4.3.2...g s.s.s.4 l x p T o.3.>.+.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.u.4.3.3.2...d s.s.3 z 3 2 U o.>.3.2.@.A s.s.s.s.s.s.",
+"s.s.s.s.s.s.y.4.3.3.2...d s.s.k l , - | ;.3.3.2.@.G s.s.s.s.s.s.",
+"s.s.s.s.s.s.e.4.3.3.2...d s.6 z 4 * # 1.3.3.3.2.$.G s.s.s.s.s.s.",
+"s.s.s.s.s.s.w.3.3.3.2.] f 5 l x + s.s.y.4.3.3.2.o.d s.s.s.s.s.s.",
+"s.s.s.s.s.s.4.3.3.3.2.@.R S D D Y ~ s.y.4.3.3.>...y s.s.s.s.s.s.",
+"s.s.s.s.s.s.2.2.3.3.2.-.` { } X.,.<.8.y.q.3.3.-.` e s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.>.3.3.3.@.W & o   I #.5.w.3.3.2.] U s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.-.>.2.2.-._ @ . s.s.>.5.3.3.2.-.U f s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.] @.>.2.-.o.: s.s.s.4.w.3.2.>.o.A s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.L o.>.>.>.A s.s.s.w.w.3.>.o.g s.s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.z x b m E ] -.] / s.s.q.w.3.o.~ s.s.s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.4 4 6 8 V P ] ] ) s.7.8.w.3.o.Q s.s.s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.$ $ % = % ; t G U ^ [ *.4.3.-.] s.s.s.i.j s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.= $ s.s.s.s.s.s.-.3.3.>.>.3.r.:.! s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.> $ s.s.s.s.s.s.+.-.>.>.>.3.*.| h s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.> s.s.s.s.s.s.s.s.( $.-.-.$.R F s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.a a r s.s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.",
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s."
+};
diff --git a/debian/qgis-icon128x128.png b/debian/qgis-icon128x128.png
diff --git a/debian/qgis-icon16x16.png b/debian/qgis-icon16x16.png
diff --git a/debian/qgis-icon192x192.png b/debian/qgis-icon192x192.png
diff --git a/debian/qgis-icon22x22.png b/debian/qgis-icon22x22.png
diff --git a/debian/qgis-icon24x24.png b/debian/qgis-icon24x24.png
diff --git a/debian/qgis-icon256x256.png b/debian/qgis-icon256x256.png
diff --git a/debian/qgis-icon32x32.png b/debian/qgis-icon32x32.png
diff --git a/debian/qgis-icon36x36.png b/debian/qgis-icon36x36.png
diff --git a/debian/qgis-icon42x42.png b/debian/qgis-icon42x42.png
diff --git a/debian/qgis-icon48x48.png b/debian/qgis-icon48x48.png
diff --git a/debian/qgis-icon512x512.png b/debian/qgis-icon512x512.png
diff --git a/debian/qgis-icon64x64.png b/debian/qgis-icon64x64.png
diff --git a/debian/qgis-icon72x72.png b/debian/qgis-icon72x72.png
diff --git a/debian/qgis-icon80x80.png b/debian/qgis-icon80x80.png
diff --git a/debian/qgis-icon8x8.png b/debian/qgis-icon8x8.png
diff --git a/debian/qgis-icon96x96.png b/debian/qgis-icon96x96.png
diff --git a/debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install.in
@@ -4,4 +4,3 @@ usr/lib/qgis/grass/bin/qgis.g.browser
 usr/lib/qgis/plugins/libgrassplugin.so
 usr/lib/qgis/plugins/libgrassprovider.so
 usr/lib/qgis/plugins/libgrassrasterprovider.so
-usr/lib/libqgisgrass.so.{QGIS_ABI}
diff --git a/debian/qgis-providers-common.postinst b/debian/qgis-providers-common.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ] && [ -x /usr/lib/qgis/crssync ]; then
+	cp /usr/share/qgis/resources/srs-template.db /usr/share/qgis/resources/srs.db
+	dpkg-trigger qgis-crssync
+fi
+
+#DEBHELPER#
diff --git a/debian/qgis-providers-common.prerm b/debian/qgis-providers-common.prerm
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "remove" ] ; then
-	rm /usr/share/qgis/resources/srs.db
+if [ "$1" = "remove" ] && [ -e /usr/share/qgis/resources/srs.db ]; then
+	rm -f /usr/share/qgis/resources/srs.db || true
 fi
 
 #DEBHELPER#
diff --git a/debian/qgis-providers.postinst b/debian/qgis-providers.postinst
@@ -1,9 +1,10 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "configure" ] && [ -x /usr/lib/qgis/crssync ]; then
-	cp /usr/share/qgis/resources/srs-template.db /usr/share/qgis/resources/srs.db
-	/usr/lib/qgis/crssync
+if [ "$1" = "triggered" ] || [ "$1" = "configure" ]; then
+	if [ -w /usr/share/qgis/resources/srs.db ] && [ -x /usr/lib/qgis/crssync ]; then
+		/usr/lib/qgis/crssync
+	fi
 fi
 
 #DEBHELPER#
diff --git a/debian/qgis-providers.triggers b/debian/qgis-providers.triggers
@@ -0,0 +1 @@
+interest qgis-crssync
diff --git a/debian/qgis-sqlanywhere.install.in b/debian/qgis-sqlanywhere.install.in
@@ -1,3 +1,2 @@
 usr/lib/qgis/plugins/libsqlanywhereplugin.so
 usr/lib/qgis/plugins/libsqlanywhereprovider.so
-usr/lib/libqgissqlanyconnection.so.{QGIS_ABI}
diff --git a/debian/qgis.desktop b/debian/qgis.desktop
@@ -47,10 +47,11 @@ GenericName[th]=ระบบสารสนเทศภูมิศาสตร
 GenericName[tr]=Coğrafi bilgi sistemi
 GenericName[uk]=Геоінформаційна система
 GenericName[uz]=Geografik axborot tizimi
-Icon=qgis-icon
+Icon=qgis
 TryExec=/usr/bin/qgis
 Exec=/usr/bin/qgis %F
 Terminal=false
 StartupNotify=false
 Categories=Qt;Education;Science;Geography;
 MimeType=application/x-qgis-project;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape;
+Keywords=map;globe;postgis;wms;wfs;ogc;osgeo
diff --git a/debian/qgis.install b/debian/qgis.install
@@ -14,18 +14,8 @@ 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.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
-../qbrowser.desktop usr/share/applications
-../qgis.xml usr/share/mime/packages
-../mime/application/x-esri-shape.desktop usr/share/mimelnk/application
-../mime/application/x-mapinfo-mif.desktop usr/share/mimelnk/application
-../mime/application/x-esri-crs.desktop usr/share/mimelnk/application
-../mime/application/x-raster-ecw.desktop usr/share/mimelnk/application
-../mime/application/x-adobe-mif.desktop usr/share/mimelnk/application
-../mime/application/x-raster-aig.desktop usr/share/mimelnk/application
-../mime/application/x-qgis-project.desktop usr/share/mimelnk/application
-../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application
-../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application
+usr/share/pixmaps/
+usr/share/applications/
+usr/share/mime/packages/
+usr/share/mimelnk/
+usr/share/icons/hicolor/
diff --git a/debian/qgis.lintian-overrides b/debian/qgis.lintian-overrides
@@ -0,0 +1,4 @@
+# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
+#  Fortify Source functions: no, only unprotected functions found!
+#         unprotected: fgets
+qgis: hardening-no-fortify-functions usr/lib/qgis/qgis_help
diff --git a/debian/qgis.menu b/debian/qgis.menu
@@ -1,3 +1,3 @@
 ?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
-  icon="/usr/share/pixmaps/qgis-icon-60x60.png" title="QGIS"\
+  icon="/usr/share/pixmaps/qgis.xpm" title="QGIS"\
   command="/usr/bin/qgis"
diff --git a/debian/qgis.xml b/debian/qgis.xml
@@ -6,7 +6,7 @@
     <comment xml:lang="de">QGIS-Projekt</comment>
     <sub-class-of type="application/xml"/>
     <alias type="application/x-qgis"/>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -19,7 +19,7 @@
     <comment>QGIS layer settings</comment>
     <comment xml:lang="de">QGIS Layer Einstellungen</comment>
     <sub-class-of type="application/xml"/>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis version"/>
@@ -31,7 +31,7 @@
   <mime-type type="application/x-esri-shape">
     <comment>ESRI shape file</comment>
     <comment xml:lang="de">ESRI-Shapedatei</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="100">
       <match type="big32" offset="0" value="9994">
         <match type="big32" offset="4" value="0">
@@ -54,7 +54,7 @@
   <mime-type type="application/x-esri-crs">
     <comment>ESRI coordinate reference system</comment>
     <comment xml:lang="de">ESRI-Koordinatenreferenzsystem</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic>
       <match type="string" offset="0" value="GEOGCS["/>
       <match type="string" offset="0" value="PROJCS["/>
@@ -66,7 +66,7 @@
   <mime-type type="image/tiff">
     <comment>TIFF raster data</comment>
     <comment xml:lang="de">TIFF-Rasterdaten</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
       <match type="string" offset="0" value="MM">
         <match type="little16" offset="2" value="42"/>
@@ -82,7 +82,7 @@
   <mime-type type="image/jpeg">
     <comment>JPEG raster data</comment>
     <comment xml:lang="de">JPEG-Rasterdaten</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
        <match type="big16" offset="0" value="65496"/>
     </magic>
@@ -93,7 +93,7 @@
   <mime-type type="image/jp2">
     <comment>JPEG2000 raster data</comment>
     <comment xml:lang="de">JPEG2000-Rasterdaten</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="50">
       <match type="little32" offset="0" value="12">
         <match type="string" offset="8" value="jP">
@@ -118,28 +118,28 @@
   <mime-type type="application/x-raster-aig">
     <comment>AIG raster data</comment>
     <comment xml:lang="de">AIG-Rasterdaten</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <glob pattern="*.aig"/>
   </mime-type>
 
   <mime-type type="application/x-raster-ecw">
     <comment>ECW raster data</comment>
     <comment xml:lang="de">ECW-Rasterdaten</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <glob pattern="*.ecw"/>
   </mime-type>
 
   <mime-type type="application/x-raster-mrsid">
     <comment>MrSID raster data</comment>
     <comment xml:lang="de">MrSID-Rasterdaten</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <glob pattern="*.sid"/>
   </mime-type>
 
   <mime-type type="application/x-mapinfo-mif">
     <comment>MapInfo file</comment>
     <comment xml:lang="de">MapInfo-Datei</comment>
-    <icon name="qgis-mime-icon.png"/>
+    <icon name="qgis-mime.png"/>
     <magic priority="51">
       <match type="string" offset="0" value="VERSION">
         <match type="string" offset="0:512" value="COLUMNS"/>