[QGIS Commit] r11854 - trunk/qgis/debian

svn_qgis at osgeo.org svn_qgis at osgeo.org
Mon Oct 26 15:51:21 EDT 2009


Author: jef
Date: 2009-10-26 15:51:21 -0400 (Mon, 26 Oct 2009)
New Revision: 11854

Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control.hardy
   trunk/qgis/debian/control.intrepid
   trunk/qgis/debian/control.jaunty
   trunk/qgis/debian/control.karmic
   trunk/qgis/debian/control.lenny
   trunk/qgis/debian/control.sid
   trunk/qgis/debian/libqgis{QGIS_ABI}.symbols
   trunk/qgis/debian/rules
Log:
debian packaging update

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/changelog	2009-10-26 19:51:21 UTC (rev 11854)
@@ -3,7 +3,7 @@
   * new development version after 1.3 branch
   * use templates for configuration for ABIs and distributions
   * policy updated to 3.8.3
-  * remove README.Debian from libqgis{QGIS_ABI}-dev
+  * remove README.Debian from libqgis-dev
   * add symbol files for shared libraries
   * shorten qgis.sh
 

Modified: trunk/qgis/debian/control.hardy
===================================================================
--- trunk/qgis/debian/control.hardy	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/control.hardy	2009-10-26 19:51:21 UTC (rev 11854)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
+Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -50,7 +50,7 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis{QGIS_ABI}-dev
+Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
-Provides: libqgis-dev, qgis-dev
-Replaces: libqgis-dev, qgis-dev, libqgis1-dev
+Provides: qgis-dev
+Replaces: qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.intrepid
===================================================================
--- trunk/qgis/debian/control.intrepid	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/control.intrepid	2009-10-26 19:51:21 UTC (rev 11854)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
+Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -50,7 +50,7 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis{QGIS_ABI}-dev
+Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,7 +59,7 @@
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
-Provides: libqgis-dev, qgis-dev
+Provides: qgis-dev
 Replaces: libqgis-dev, qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

Modified: trunk/qgis/debian/control.jaunty
===================================================================
--- trunk/qgis/debian/control.jaunty	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/control.jaunty	2009-10-26 19:51:21 UTC (rev 11854)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
+Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -50,7 +50,7 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis{QGIS_ABI}-dev
+Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
-Provides: libqgis-dev, qgis-dev
-Replaces: libqgis-dev, qgis-dev, libqgis1-dev
+Provides: qgis-dev
+Replaces: qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.karmic
===================================================================
--- trunk/qgis/debian/control.karmic	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/control.karmic	2009-10-26 19:51:21 UTC (rev 11854)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
+Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -50,7 +50,7 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis{QGIS_ABI}-dev
+Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
-Provides: libqgis-dev, qgis-dev
-Replaces: libqgis-dev, qgis-dev, libqgis1-dev
+Provides: qgis-dev
+Replaces: qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.lenny
===================================================================
--- trunk/qgis/debian/control.lenny	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/control.lenny	2009-10-26 19:51:21 UTC (rev 11854)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
+Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -50,7 +50,7 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis{QGIS_ABI}-dev
+Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
-Provides: libqgis-dev, qgis-dev
-Replaces: libqgis-dev, qgis-dev, libqgis1-dev
+Provides: qgis-dev
+Replaces: qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/control.sid
===================================================================
--- trunk/qgis/debian/control.sid	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/control.sid	2009-10-26 19:51:21 UTC (rev 11854)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev, pyqt4-dev-tools
-Build-Conflicts: libqgis{QGIS_ABI}-dev, qgis-dev
+Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.3
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -50,7 +50,7 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis{QGIS_ABI}-dev
+Package: libqgis-dev
 Architecture: any
 Section: libdevel
 Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev,
@@ -59,8 +59,8 @@
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
-Provides: libqgis-dev, qgis-dev
-Replaces: libqgis-dev, qgis-dev, libqgis1-dev
+Provides: qgis-dev
+Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -70,7 +70,7 @@
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass{GRASS_ABI}
 Description: GRASS plugin for Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Modified: trunk/qgis/debian/libqgis{QGIS_ABI}.symbols
===================================================================
--- trunk/qgis/debian/libqgis{QGIS_ABI}.symbols	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/libqgis{QGIS_ABI}.symbols	2009-10-26 19:51:21 UTC (rev 11854)
@@ -177,6 +177,7 @@
  _ZN7Point3DaSERKS_ at Base 1.4.0
  _ZN7Point3DeqERKS_ at Base 1.4.0
  _ZN7Point3DneERKS_ at Base 1.4.0
+ _ZN7QStringC1EPKc at Base 1.4.0
  _ZN7QStringD1Ev at Base 1.4.0
  _ZN7QVectorI10vertexDataE7reallocEii at Base 1.4.0
  _ZN7QVectorI10vertexDataED1Ev at Base 1.4.0
@@ -491,6 +492,7 @@
  _ZN11QgsMapLayer12minimumScaleEv at Base 1.4.0
  _ZN11QgsMapLayer12setLayerNameERK7QString at Base 1.4.0
  _ZN11QgsMapLayer13connectNotifyEPKc at Base 1.4.0
+ _ZN11QgsMapLayer13setCacheImageEP6QImage at Base 1.4.0
  _ZN11QgsMapLayer13setLayerOrderE11QStringList at Base 1.4.0
  _ZN11QgsMapLayer13statusChangedE7QString at Base 1.4.0
  _ZN11QgsMapLayer14lastErrorTitleEv at Base 1.4.0
@@ -841,6 +843,7 @@
  _ZN14QgsApplication8exitQgisEv at Base 1.4.0
  _ZN14QgsApplication8i18nPathEv at Base 1.4.0
  _ZN14QgsApplication8initQgisEv at Base 1.4.0
+ _ZN14QgsApplication8svgPathsEv at Base 1.4.0
  _ZN14QgsApplication9iconsPathEv at Base 1.4.0
  _ZN14QgsApplication9themeNameEv at Base 1.4.0
  _ZN14QgsApplicationC1ERiPPcb at Base 1.4.0
@@ -857,18 +860,26 @@
  _ZN14QgsComposerMap12setSceneRectERK6QRectF at Base 1.4.0
  _ZN14QgsComposerMap12syncLayerSetEv at Base 1.4.0
  _ZN14QgsComposerMap13extentChangedEv at Base 1.4.0
+ _ZN14QgsComposerMap14drawAnnotationEP8QPainterRK7QPointFiRK7QString at Base 1.4.0
  _ZN14QgsComposerMap15setCacheUpdatedEb at Base 1.4.0
+ _ZN14QgsComposerMap15setGridPenColorERK6QColor at Base 1.4.0
+ _ZN14QgsComposerMap15setGridPenWidthEd at Base 1.4.0
  _ZN14QgsComposerMap16staticMetaObjectE at Base 1.4.0
  _ZN14QgsComposerMap17connectUpdateSlotEv at Base 1.4.0
  _ZN14QgsComposerMap17updateCachedImageEv at Base 1.4.0
  _ZN14QgsComposerMap18mCurrentComposerIdE at Base 1.4.0
+ _ZN14QgsComposerMap18updateBoundingRectEv at Base 1.4.0
+ _ZN14QgsComposerMap19drawGridAnnotationsEP8QPainterRK5QListI5QPairId6QLineFEES8_ at Base 1.4.0
  _ZN14QgsComposerMap20storeCurrentLayerSetEv at Base 1.4.0
+ _ZN14QgsComposerMap24drawCoordinateAnnotationEP8QPainterRK7QPointF7QString at Base 1.4.0
+ _ZN14QgsComposerMap25drawCoordinateAnnotationsEP8QPainterRK5QListI5QPairId6QLineFEES8_ at Base 1.4.0
  _ZN14QgsComposerMap27renderModeUpdateCachedImageEv at Base 1.4.0
  _ZN14QgsComposerMap4drawEP8QPainterRK12QgsRectangleRK5QSizei at Base 1.4.0
  _ZN14QgsComposerMap5cacheEv at Base 1.4.0
  _ZN14QgsComposerMap5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget at Base 1.4.0
  _ZN14QgsComposerMap6resizeEdd at Base 1.4.0
  _ZN14QgsComposerMap7readXMLERK11QDomElementRK12QDomDocument at Base 1.4.0
+ _ZN14QgsComposerMap8drawGridEP8QPainter at Base 1.4.0
  _ZN14QgsComposerMap9setOffsetEdd at Base 1.4.0
  _ZN14QgsComposerMapC1EP14QgsComposition at Base 1.4.0
  _ZN14QgsComposerMapC1EP14QgsCompositioniiii at Base 1.4.0
@@ -878,6 +889,8 @@
  _ZN14QgsComposerMapD1Ev at Base 1.4.0
  _ZN14QgsComposerMapD2Ev at Base 1.4.0
  _ZN14QgsComposition10setGridPenERK4QPen at Base 1.4.0
+ _ZN14QgsComposition11qt_metacallEN11QMetaObject4CallEiPPv at Base 1.4.0
+ _ZN14QgsComposition11qt_metacastEPKc at Base 1.4.0
  _ZN14QgsComposition12setGridStyleENS_9GridStyleE at Base 1.4.0
  _ZN14QgsComposition12setPaperSizeEdd at Base 1.4.0
  _ZN14QgsComposition13moveItemToTopEP15QgsComposerItem at Base 1.4.0
@@ -885,7 +898,9 @@
  _ZN14QgsComposition14addItemToZListEP15QgsComposerItem at Base 1.4.0
  _ZN14QgsComposition14composerItemAtERK7QPointF at Base 1.4.0
  _ZN14QgsComposition16moveItemToBottomEP15QgsComposerItem at Base 1.4.0
+ _ZN14QgsComposition16paperSizeChangedEv at Base 1.4.0
  _ZN14QgsComposition16setPrintAsRasterEb at Base 1.4.0
+ _ZN14QgsComposition16staticMetaObjectE at Base 1.4.0
  _ZN14QgsComposition18lowerSelectedItemsEv at Base 1.4.0
  _ZN14QgsComposition18raiseSelectedItemsEv at Base 1.4.0
  _ZN14QgsComposition18setSnapGridOffsetXEd at Base 1.4.0
@@ -1350,6 +1365,7 @@
  _ZN16QgsComposerLabelD2Ev at Base 1.4.0
  _ZN16QgsDataSourceURI10skipBlanksERK7QStringRi at Base 1.4.0
  _ZN16QgsDataSourceURI11clearSchemaEv at Base 1.4.0
+ _ZN16QgsDataSourceURI11setDatabaseERK7QString at Base 1.4.0
  _ZN16QgsDataSourceURI12setKeyColumnE7QString at Base 1.4.0
  _ZN16QgsDataSourceURI13setConnectionERK7QStringS2_S2_S2_S2_NS_7SSLmodeE at Base 1.4.0
  _ZN16QgsDataSourceURI13setDataSourceERK7QStringS2_S2_S2_S2_ at Base 1.4.0
@@ -1360,6 +1376,7 @@
  _ZN16QgsDataSourceURIC1Ev at Base 1.4.0
  _ZN16QgsDataSourceURIC2E7QString at Base 1.4.0
  _ZN16QgsDataSourceURIC2Ev at Base 1.4.0
+ _ZN16QgsDataSourceURID1Ev at Base 1.4.0
  _ZN16QgsMessageOutput19createMessageOutputEv at Base 1.4.0
  _ZN16QgsMessageOutput21mMessageOutputCreatorE at Base 1.4.0
  _ZN16QgsMessageOutput23setMessageOutputCreatorEPFPS_vE at Base 1.4.0
@@ -1619,6 +1636,7 @@
  _ZN19QgsMapLayerRegistry16staticMetaObjectE at Base 1.4.0
  _ZN19QgsMapLayerRegistry18layerWillBeRemovedE7QString at Base 1.4.0
  _ZN19QgsMapLayerRegistry18removeAllMapLayersEv at Base 1.4.0
+ _ZN19QgsMapLayerRegistry19clearAllLayerCachesEv at Base 1.4.0
  _ZN19QgsMapLayerRegistry5countEv at Base 1.4.0
  _ZN19QgsMapLayerRegistry8instanceEv at Base 1.4.0
  _ZN19QgsMapLayerRegistry8mapLayerE7QString at Base 1.4.0
@@ -1705,6 +1723,7 @@
  _ZN21QgsVectorDataProvider12maximumValueEi at Base 1.4.0
  _ZN21QgsVectorDataProvider12minimumValueEi at Base 1.4.0
  _ZN21QgsVectorDataProvider12uniqueValuesEiR5QListI8QVariantE at Base 1.4.0
+ _ZN21QgsVectorDataProvider12uniqueValuesEiR5QListI8QVariantEi at Base 1.4.0
  _ZN21QgsVectorDataProvider13addAttributesERK4QMapI7QStringS1_E at Base 1.4.0
  _ZN21QgsVectorDataProvider13addAttributesERK5QListI8QgsFieldE at Base 1.4.0
  _ZN21QgsVectorDataProvider14deleteFeaturesERK4QSetIiE at Base 1.4.0
@@ -2435,15 +2454,24 @@
  _ZN5QListI18QgsRasterBandStatsEixEi at Base 1.4.0
  _ZN5QListI22QgsContrastEnhancementE4freeEPN9QListData4DataE at Base 1.4.0
  _ZN5QListI22QgsContrastEnhancementED1Ev at Base 1.4.0
+ _ZN5QListI5QPairId6QLineFEE13detach_helperEv at Base 1.4.0
+ _ZN5QListI5QPairId6QLineFEE4freeEPN9QListData4DataE at Base 1.4.0
+ _ZN5QListI5QPairId6QLineFEE5clearEv at Base 1.4.0
+ _ZN5QListI5QPairId6QLineFEED1Ev at Base 1.4.0
  _ZN5QListI5QPairIddEE13detach_helperEv at Base 1.4.0
  _ZN5QListI5QPairIddEE4freeEPN9QListData4DataE at Base 1.4.0
  _ZN5QListI5QPairIddEE5clearEv at Base 1.4.0
  _ZN5QListI5QPairIddEED1Ev at Base 1.4.0
+ _ZN5QListI7QPointFE13detach_helperEv at Base 1.4.0
+ _ZN5QListI7QPointFE4freeEPN9QListData4DataE at Base 1.4.0
+ _ZN5QListI7QPointFE5clearEv at Base 1.4.0
+ _ZN5QListI7QPointFED1Ev at Base 1.4.0
  _ZN5QListI7QStringE13detach_helperEv at Base 1.4.0
  _ZN5QListI7QStringE4freeEPN9QListData4DataE at Base 1.4.0
  _ZN5QListI7QStringE5clearEv at Base 1.4.0
  _ZN5QListI7QStringE5eraseENS1_8iteratorE at Base 1.4.0
  _ZN5QListI7QStringE6appendERKS0_ at Base 1.4.0
+ _ZN5QListI7QStringE6detachEv at Base 1.4.0
  _ZN5QListI7QStringE6insertEiRKS0_ at Base 1.4.0
  _ZN5QListI7QStringE9removeAllERKS0_ at Base 1.4.0
  _ZN5QListI7QStringEixEi at Base 1.4.0
@@ -2709,6 +2737,8 @@
  _ZN7QStringD1Ev at Base 1.4.0
  _ZN7QStringaSEPKc at Base 1.4.0
  _ZN7QStringpLEPKc at Base 1.4.0
+ _ZN7QVectorI6QLineFE7reallocEii at Base 1.4.0
+ _ZN7QVectorI6QLineFED1Ev at Base 1.4.0
  _ZN7QVectorI6QPointE7reallocEii at Base 1.4.0
  _ZN7QVectorI7QPointFE7reallocEii at Base 1.4.0
  _ZN7QVectorI7QPointFElsERKS0_ at Base 1.4.0
@@ -2782,6 +2812,8 @@
  _ZN9QgsLogger5debugERK7QStringdiPKcS4_i at Base 1.4.0
  _ZN9QgsLogger5debugERK7QStringiPKcS4_i at Base 1.4.0
  _ZN9QgsLogger5debugERK7QStringiiPKcS4_i at Base 1.4.0
+ _ZN9QgsLogger5debugIdEEvRK7QStringT_PKcS6_ii at Base 1.4.0
+ _ZN9QgsLogger5debugIiEEvRK7QStringT_PKcS6_ii at Base 1.4.0
  _ZN9QgsLogger5fatalERK7QString at Base 1.4.0
  _ZN9QgsLogger7warningERK7QString at Base 1.4.0
  _ZN9QgsLogger8criticalERK7QString at Base 1.4.0
@@ -2906,10 +2938,29 @@
  _ZNK13QgsMapToPixel9transformEdd at Base 1.4.0
  _ZNK13QgsRunProcess10metaObjectEv at Base 1.4.0
  _ZNK14QgsApplication10metaObjectEv at Base 1.4.0
+ _ZNK14QgsComposerMap10mapPolygonER9QPolygonF at Base 1.4.0
  _ZNK14QgsComposerMap10metaObjectEv at Base 1.4.0
+ _ZNK14QgsComposerMap10xGridLinesER5QListI5QPairId6QLineFEE at Base 1.4.0
+ _ZNK14QgsComposerMap10yGridLinesER5QListI5QPairId6QLineFEE at Base 1.4.0
+ _ZNK14QgsComposerMap12boundingRectEv at Base 1.4.0
+ _ZNK14QgsComposerMap12mapUnitsToMMEv at Base 1.4.0
+ _ZNK14QgsComposerMap12maxExtensionEv at Base 1.4.0
+ _ZNK14QgsComposerMap14transformShiftERdS0_ at Base 1.4.0
+ _ZNK14QgsComposerMap15mapToItemCoordsERK7QPointF at Base 1.4.0
+ _ZNK14QgsComposerMap15requestedExtentER12QgsRectangle at Base 1.4.0
  _ZNK14QgsComposerMap16containsWMSLayerEv at Base 1.4.0
+ _ZNK14QgsComposerMap17transformedExtentEv at Base 1.4.0
+ _ZNK14QgsComposerMap17verticalGridLinesER5QListI5QPairId6QLineFEE at Base 1.4.0
+ _ZNK14QgsComposerMap18borderForLineCoordERK7QPointF at Base 1.4.0
+ _ZNK14QgsComposerMap19horizontalGridLinesER5QListI5QPairId6QLineFEE at Base 1.4.0
+ _ZNK14QgsComposerMap21transformedMapPolygonEv at Base 1.4.0
+ _ZNK14QgsComposerMap22maxExtensionXDirectionEv at Base 1.4.0
+ _ZNK14QgsComposerMap22maxExtensionYDirectionEv at Base 1.4.0
+ _ZNK14QgsComposerMap23pointOnLineWithDistanceERK7QPointFS2_d at Base 1.4.0
  _ZNK14QgsComposerMap5scaleEv at Base 1.4.0
+ _ZNK14QgsComposerMap6rotateEdRdS0_ at Base 1.4.0
  _ZNK14QgsComposerMap8writeXMLER11QDomElementR12QDomDocument at Base 1.4.0
+ _ZNK14QgsComposition10metaObjectEv at Base 1.4.0
  _ZNK14QgsComposition10paperWidthEv at Base 1.4.0
  _ZNK14QgsComposition11paperHeightEv at Base 1.4.0
  _ZNK14QgsComposition13pixelFontSizeEd at Base 1.4.0
@@ -2971,6 +3022,7 @@
  _ZNK15QgsComposerItem25horizontalViewScaleFactorEv at Base 1.4.0
  _ZNK15QgsComposerItem26rectHandlerBorderToleranceEv at Base 1.4.0
  _ZNK15QgsComposerItem8drawTextEP8QPainterRK6QRectFRK7QStringRK5QFont at Base 1.4.0
+ _ZNK15QgsComposerItem8drawTextEP8QPainterddRK7QStringRK5QFont at Base 1.4.0
  _ZNK15QgsComposerItem8drawTextEP8QPainteriiRK7QStringRK5QFont at Base 1.4.0
  _ZNK15QgsComposerItem9_writeXMLER11QDomElementR12QDomDocument at Base 1.4.0
  _ZNK15QgsDataProvider10metaObjectEv at Base 1.4.0
@@ -2992,6 +3044,7 @@
  _ZNK16QgsDataSourceURI4hostEv at Base 1.4.0
  _ZNK16QgsDataSourceURI4portEv at Base 1.4.0
  _ZNK16QgsDataSourceURI5tableEv at Base 1.4.0
+ _ZNK16QgsDataSourceURI6escapeERK7QString at Base 1.4.0
  _ZNK16QgsDataSourceURI6schemaEv at Base 1.4.0
  _ZNK16QgsDataSourceURI7sslModeEv at Base 1.4.0
  _ZNK16QgsDataSourceURI8databaseEv at Base 1.4.0
@@ -3236,6 +3289,7 @@
  _ZNK5Tools8Interval18intersectsIntervalERKNS_9IIntervalE at Base 1.4.0
  _ZNK5Tools8IntervaleqERKS0_ at Base 1.4.0
  _ZNK5Tools8IntervalneERKS0_ at Base 1.4.0
+ _ZNK7QString3argEiiiRK5QChar at Base 1.4.0
  _ZNK7QString8containsERKS_N2Qt15CaseSensitivityE at Base 1.4.0
  _ZNK7QStringeqEPKc at Base 1.4.0
  _ZNK8QgsField4nameEv at Base 1.4.0
@@ -3252,6 +3306,7 @@
  _ZNK8QgsLabel8minScaleEv at Base 1.4.0
  _ZNK8QgsLabel8writeXMLER8QDomNodeR12QDomDocument at Base 1.4.0
  _ZNK8QgsPoint13wellKnownTextEv at Base 1.4.0
+ _ZNK8QgsPoint23toDegreesMinutesSecondsEi at Base 1.4.0
  _ZNK8QgsPoint7sqrDistERKS_ at Base 1.4.0
  _ZNK8QgsPoint7sqrDistEdd at Base 1.4.0
  _ZNK8QgsPoint8toStringEi at Base 1.4.0
@@ -3803,6 +3858,7 @@
  _ZThn16_N23QgsMessageOutputConsole8setTitleERK7QString at Base 1.4.0
  _ZThn16_N23QgsMessageOutputConsoleD0Ev at Base 1.4.0
  _ZThn16_N23QgsMessageOutputConsoleD1Ev at Base 1.4.0
+ _ZThn16_NK14QgsComposerMap12boundingRectEv at Base 1.4.0
  _ZThn16_NK14QgsComposerMap8writeXMLER11QDomElementR12QDomDocument at Base 1.4.0
  _ZThn16_NK17QgsComposerLegend8writeXMLER11QDomElementR12QDomDocument at Base 1.4.0
  _ZThn16_NK18QgsComposerPicture8writeXMLER11QDomElementR12QDomDocument at Base 1.4.0
@@ -3872,6 +3928,7 @@
  _ZplRK7QString5QChar at Base 1.4.0
  _ZplRK7QStringPKc at Base 1.4.0
  _ZplRK7QStringS1_ at Base 1.4.0
+ _ZplRK7QStringc at Base 1.4.0
  gParserErrorMsg at Base 1.4.0
  gTmpNodes at Base 1.4.0
  gaiaAddDbfField at Base 1.4.0

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2009-10-26 19:50:08 UTC (rev 11853)
+++ trunk/qgis/debian/rules	2009-10-26 19:51:21 UTC (rev 11854)
@@ -18,7 +18,7 @@
 QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
 QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt)
 QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
-GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2))
+GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "s/RC/-/"))
 
 CMAKE_OPTS = \
 	-Wno-dev \



More information about the QGIS-commit mailing list