debian/changelog

@@ -7,8 +7,9 @@ qgis (1.8.0) UNRELEASED; urgency=low
   * add ubuntu oneiric
   * include internal pyspatialite in python-qgis
   * update watch
+  * drop abi postfix from sqlanywhere plugin
 
- -- Jürgen E. Fischer <jef@norbit.de>  Wed, 07 Sep 2011 22:23:41 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Thu, 29 Sep 2011 21:44:50 +0000
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

debian/control.lenny

@@ -175,9 +175,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/control.lucid

@@ -176,9 +176,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/control.maverick

@@ -177,9 +177,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/control.natty

@@ -177,9 +177,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/control.oneiric

@@ -177,9 +177,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/control.sid

@@ -177,9 +177,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/control.squeeze

@@ -176,9 +176,10 @@ Description: Quantum GIS mapserver
  .
  This package contains the Quantum GIS mapserver.
 
-Package: qgis-sqlanywhere{QGIS_ABI}
+Package: qgis-sqlanywhere
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qgis-sqlanywhere1.7.0, qgis-sqlanywhere1.7.1, qgis-sqlanywhere1.8.0
 Description: Quantum GIS sql anywhere plugin and provider
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

debian/qgis-sqlanywhere.lintian-overrides

@@ -0,0 +1,2 @@
+qgis-sqlanywhere: package-name-doesnt-match-sonames
+qgis-sqlanywhere: no-symbols-control-file

scripts/astyle-all.sh

@@ -8,7 +8,7 @@ export elcr="$(tput el)$(tput cr)"
 
 find src -type f -print | while read f; do
 	case "$f" in
-        src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
+        src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*|src/providers/sqlanywhere/sqlanyconnection/*)
                 echo $f skipped
                 continue
                 ;;

src/app/qgisapp.cpp

@@ -2287,7 +2287,7 @@ void QgisApp::addDatabaseLayers( QStringList const & layerPathList, QString cons
 
   mMapCanvas->freeze( true );
 
-  QApplication::setOverrideCursor(Qt::WaitCursor);
+  QApplication::setOverrideCursor( Qt::WaitCursor );
 
   foreach( QString layerPath, layerPathList )
   {

src/app/qgisapp.h

@@ -466,7 +466,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     //! Add a databaselayer to the map
     void addDatabaseLayer();
     //#endif
-	//! Add a list of database layers to the map
+    //! Add a list of database layers to the map
     void addDatabaseLayers( QStringList const & layerPathList, QString const & providerKey );
     //#ifdef HAVE_SPATIALITE
     //! Add a SpatiaLite layer to the map

src/app/qgsconfigureshortcutsdialog.cpp

@@ -49,26 +49,26 @@ QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget* parent )
 
 QgsConfigureShortcutsDialog::~QgsConfigureShortcutsDialog()
 {
-    saveState();
+  saveState();
 }
 
 /*!
  * Function to save dialog window state
  */
 void QgsConfigureShortcutsDialog::saveState()
 {
-    QSettings settings;
-    settings.setValue( "/Windows/ShortcutsDialog/geometry", saveGeometry() );
+  QSettings settings;
+  settings.setValue( "/Windows/ShortcutsDialog/geometry", saveGeometry() );
 }
 
 /*!
  * Function to restore dialog window state
  */
 void QgsConfigureShortcutsDialog::restoreState()
 {
-    QSettings settings;
-    restoreGeometry( settings.value( "/Windows/ShortcutsDialog/geometry" ).toByteArray() );
-}       
+  QSettings settings;
+  restoreGeometry( settings.value( "/Windows/ShortcutsDialog/geometry" ).toByteArray() );
+}
 
 void QgsConfigureShortcutsDialog::populateActions()
 {

src/app/qgsconfigureshortcutsdialog.h

@@ -27,7 +27,7 @@ class QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsConfigureShor
   public:
     QgsConfigureShortcutsDialog( QWidget* parent = NULL );
     ~QgsConfigureShortcutsDialog();
-    
+
     void populateActions();
 
   protected:
@@ -58,7 +58,7 @@ class QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsConfigureShor
      * Function to save dialog window state
      */
     void saveState();
-    
+
     /*!
      * Function to restore dialog window state
      */

src/app/qgsdecorationcopyright.cpp

@@ -42,7 +42,7 @@ email                : tim@linfiniti.com
 
 
 QgsDecorationCopyright::QgsDecorationCopyright( QObject* parent )
-  : QObject(parent)
+    : QObject( parent )
 {
   mPlacementLabels << tr( "Bottom Left" ) << tr( "Top Left" )
   << tr( "Top Right" ) << tr( "Bottom Right" );
@@ -77,7 +77,7 @@ void QgsDecorationCopyright::run()
 {
   QgsDecorationCopyrightDialog dlg( *this, QgisApp::instance() );
 
-  if (dlg.exec())
+  if ( dlg.exec() )
   {
     saveToProject();
     QgisApp::instance()->mapCanvas()->refresh();

src/app/qgsdecorationcopyright.h

@@ -29,8 +29,8 @@ class QgsDecorationCopyrightDialog;
 
 class QgsDecorationCopyright : public QObject
 {
-  Q_OBJECT
-public:
+    Q_OBJECT
+  public:
 
     //! Constructor
     QgsDecorationCopyright( QObject* parent = NULL );

src/app/qgsmaptoolidentify.cpp

@@ -245,9 +245,9 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
   QgsDistanceArea calc;
   if ( !featureList.count() == 0 )
   {
-      calc.setProjectionsEnabled( mCanvas->hasCrsTransformEnabled() ); // project?
-      calc.setEllipsoid( ellipsoid );
-      calc.setSourceCrs( layer->crs().srsid() );
+    calc.setProjectionsEnabled( mCanvas->hasCrsTransformEnabled() ); // project?
+    calc.setEllipsoid( ellipsoid );
+    calc.setSourceCrs( layer->crs().srsid() );
   }
   QgsFeatureList::iterator f_it = featureList.begin();
 

src/app/qgsoptions.cpp

@@ -1040,7 +1040,7 @@ void QgsOptions::loadGdalDriverList()
     myGdalDriverDescription = GDALGetDescription( myGdalDriver );
     myDrivers << myGdalDriverDescription;
   }
-  // add the skipped drivers to the list too in case their drivers are 
+  // add the skipped drivers to the list too in case their drivers are
   // already unloaded...may result in false positive if underlying
   // sys config has changed and that driver no longer exists...
   myDrivers.append( mySkippedDrivers );
@@ -1049,7 +1049,7 @@ void QgsOptions::loadGdalDriverList()
 
   QStringListIterator myIterator( myDrivers );
 
-  while (myIterator.hasNext())
+  while ( myIterator.hasNext() )
   {
     QString myName = myIterator.next();
     QListWidgetItem * mypItem = new QListWidgetItem( myName );
@@ -1067,7 +1067,7 @@ void QgsOptions::loadGdalDriverList()
 
 void QgsOptions::saveGdalDriverList()
 {
-  for ( int i=0; i < lstGdalDrivers->count(); i++ )
+  for ( int i = 0; i < lstGdalDrivers->count(); i++ )
   {
     QListWidgetItem * mypItem = lstGdalDrivers->item( i );
     if ( mypItem->checkState() == Qt::Unchecked )
@@ -1080,5 +1080,5 @@ void QgsOptions::saveGdalDriverList()
     }
   }
   QSettings mySettings;
-  mySettings.setValue( "gdal/skipList", QgsApplication::skippedGdalDrivers().join(" ") );
+  mySettings.setValue( "gdal/skipList", QgsApplication::skippedGdalDrivers().join( " " ) );
 }

src/app/qgsoptions.h

@@ -129,7 +129,7 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
      * @note added in 2.0
      */
     void saveGdalDriverList();
-   
+
   protected:
     //! Populates combo box with ellipsoids
     void getEllipsoidList();

src/core/qgsapplication.cpp

@@ -129,12 +129,12 @@ void QgsApplication::init( QString customConfigPath )
   {
     myDir.mkpath( myPamPath ); //fail silently
   }
-  
-  
+
+
 #if defined(Q_WS_WIN32) || defined(WIN32)
-  CPLSetConfigOption("GDAL_PAM_PROXY_DIR", myPamPath.toUtf8());
+  CPLSetConfigOption( "GDAL_PAM_PROXY_DIR", myPamPath.toUtf8() );
 #else
-  //under other OS's we use an environment var so the user can 
+  //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 );
@@ -741,9 +741,9 @@ void QgsApplication::restoreGdalDriver( QString theDriver )
 void QgsApplication::applyGdalSkippedDrivers()
 {
   mGdalSkipList.removeDuplicates();
-  QString myDriverList = mGdalSkipList.join(" ");
+  QString myDriverList = mGdalSkipList.join( " " );
   QgsDebugMsg( "Gdal Skipped driver list set to:" );
   QgsDebugMsg( myDriverList );
-  CPLSetConfigOption("GDAL_SKIP", myDriverList.toUtf8());
+  CPLSetConfigOption( "GDAL_SKIP", myDriverList.toUtf8() );
   GetGDALDriverManager()->AutoSkipDrivers();
 }

src/core/qgsapplication.h

@@ -224,25 +224,25 @@ class CORE_EXPORT QgsApplication: public QApplication
         @note added in 2.0 */
     static QString buildOutputPath() { return mBuildOutputPath; }
 
-    /** Sets the GDAL_SKIP environment variable to include the specified driver 
+    /** Sets the GDAL_SKIP environment variable to include the specified driver
      * and then calls GDALDriverManager::AutoSkipDrivers() to unregister it. The
      * driver name should be the short format of the Gdal driver name e.g. GTIFF.
      * @note added in 2.0
      */
     static void skipGdalDriver( QString theDriver );
 
-    /** Sets the GDAL_SKIP environment variable to exclude the specified driver 
+    /** Sets the GDAL_SKIP environment variable to exclude the specified driver
      * and then calls GDALDriverManager::AutoSkipDrivers() to unregister it. The
      * driver name should be the short format of the Gdal driver name e.g. GTIFF.
      * @note added in 2.0
      */
     static void restoreGdalDriver( QString theDriver );
 
     /** Returns the list of gdal drivers that should be skipped (based on
-     * GDAL_SKIP environment variable) 
+     * GDAL_SKIP environment variable)
      * @note added in 2.0
      */
-    static QStringList skippedGdalDrivers( ){ return mGdalSkipList; };
+    static QStringList skippedGdalDrivers( ) { return mGdalSkipList; };
 
     /** Apply the skipped drivers list to gdal
      * @see skipGdalDriver
@@ -274,8 +274,8 @@ class CORE_EXPORT QgsApplication: public QApplication
     static QString mBuildSourcePath;
     /** path to the output directory of the build. valid only when running from build directory */
     static QString mBuildOutputPath;
-    /** List of gdal drivers to be skipped. Uses GDAL_SKIP to exclude them. 
-     * @see skipGdalDriver, restoreGdalDriver 
+    /** List of gdal drivers to be skipped. Uses GDAL_SKIP to exclude them.
+     * @see skipGdalDriver, restoreGdalDriver
      * @note added in 2.0 */
     static QStringList mGdalSkipList;
 };

src/core/qgsrasterdataprovider.h

@@ -327,7 +327,7 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider
 
     /** read block of data using give extent and size */
     virtual void readBlock( int bandNo, QgsRectangle  const & viewExtent, int width, int height, QgsCoordinateReferenceSystem theSrcCRS, QgsCoordinateReferenceSystem theDestCRS, void *data );
-    
+
     /* Read a value from a data block at a given index. */
     virtual double readValue( void *data, int type, int index );