debian/changelog

@@ -1,8 +1,9 @@
 qgis (2.1.0) UNRELEASED; urgency=low
 
   * new development version 2.1 after branch of 2.0
+  * drop qgis_icon.xpm and use "upstream" version
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 27 Jul 2013 16:45:43 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 15 Sep 2013 21:59:49 +0200
 
 qgis (1.9.0) UNRELEASED; urgency=low
 

debian/qgis.install

@@ -14,8 +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-60x60.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

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

src/core/qgsapplication.cpp

@@ -178,25 +178,6 @@ void QgsApplication::init( QString customConfigPath )
   }
   ABISYM( mSystemEnvVars ) = systemEnvVarMap;
 
-  // set a working directory up for gdal to write .aux.xml files into
-  // for cases where the raster dir is read only to the user
-  // if the env var is already set it will be used preferentially
-  QString myPamPath = qgisSettingsDirPath() + QString( "gdal_pam/" );
-  QDir myDir( myPamPath );
-  if ( !myDir.exists() )
-  {
-    myDir.mkpath( myPamPath ); //fail silently
-  }
-
-
-#if defined(Q_WS_WIN32) || defined(WIN32)
-  CPLSetConfigOption( "GDAL_PAM_PROXY_DIR", myPamPath.toUtf8() );
-#else
-  //under other OS's we use an environment var so the user can
-  //override the path if he likes
-  int myChangeFlag = 0; //whether we want to force the env var to change
-  setenv( "GDAL_PAM_PROXY_DIR", myPamPath.toUtf8(), myChangeFlag );
-#endif
 }
 
 QgsApplication::~QgsApplication()
@@ -900,8 +881,27 @@ void QgsApplication::applyGdalSkippedDrivers()
   GDALAllRegister(); //to update driver list and skip missing ones
 }
 
-bool QgsApplication::createDB( QString* errorMessage )
+bool QgsApplication::createDB( QString *errorMessage )
 {
+  // set a working directory up for gdal to write .aux.xml files into
+  // for cases where the raster dir is read only to the user
+  // if the env var is already set it will be used preferentially
+  QString myPamPath = qgisSettingsDirPath() + QString( "gdal_pam/" );
+  QDir myDir( myPamPath );
+  if ( !myDir.exists() )
+  {
+    myDir.mkpath( myPamPath ); //fail silently
+  }
+
+#if defined(Q_WS_WIN32) || defined(WIN32)
+  CPLSetConfigOption( "GDAL_PAM_PROXY_DIR", myPamPath.toUtf8() );
+#else
+  //under other OS's we use an environment var so the user can
+  //override the path if he likes
+  int myChangeFlag = 0; //whether we want to force the env var to change
+  setenv( "GDAL_PAM_PROXY_DIR", myPamPath.toUtf8(), myChangeFlag );
+#endif
+
   // Check qgis.db and make private copy if necessary
   QFile qgisPrivateDbFile( QgsApplication::qgisUserDbFilePath() );