Skip to content
Permalink
Browse files

merge from trunk r11700:11750

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11898 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent bf09b1d commit 26b12b681b9faf5b500de559ef94270d8c0e9303
Showing with 32,274 additions and 16,837 deletions.
  1. +3 −1 debian/changelog
  2. +1 −1 debian/control.sid
  3. +0 −3 debian/libqgis1.lintian-overrides
  4. +2 −2 debian/libqgis{QGIS_ABI}-dev.install
  5. +3 −3 debian/libqgis{QGIS_ABI}.install
  6. +2 −0 debian/libqgis{QGIS_ABI}.lintian-overrides
  7. +4,950 −0 debian/libqgis{QGIS_ABI}.symbols
  8. +1 −1 debian/{python-qgis.install → python-qgis.install.in}
  9. +0 −1 debian/{python-qgis.lintian-overrides → python-qgis.lintian-overrides.in}
  10. +47 −0 debian/python-qgis.symbols
  11. +1 −1 debian/{qgis-plugin-grass.install → qgis-plugin-grass.install.in}
  12. +178 −0 debian/qgis-plugin-grass.symbols
  13. +2 −3 debian/qgis.sh
  14. +6 −10 debian/rules
  15. +840 −616 i18n/qgis_ar.ts
  16. +878 −570 i18n/qgis_cs_CZ.ts
  17. +907 −535 i18n/qgis_de.ts
  18. +838 −628 i18n/qgis_el_GR.ts
  19. +904 −544 i18n/qgis_es.ts
  20. +904 −544 i18n/qgis_fr.ts
  21. +840 −630 i18n/qgis_he.ts
  22. +894 −538 i18n/qgis_hu.ts
  23. +846 −598 i18n/qgis_id.ts
  24. +906 −538 i18n/qgis_it.ts
  25. +848 −584 i18n/qgis_ja.ts
  26. +880 −564 i18n/qgis_ka_GE.ts
  27. +852 −584 i18n/qgis_lo.ts
  28. +839 −619 i18n/qgis_lt.ts
  29. +896 −564 i18n/qgis_lv.ts
  30. +852 −584 i18n/qgis_mn.ts
  31. +907 −535 i18n/qgis_nl.ts
  32. +941 −568 i18n/qgis_pl_PL.ts
  33. +881 −561 i18n/qgis_pt_BR.ts
  34. +864 −594 i18n/qgis_ro.ts
  35. +891 −559 i18n/qgis_ru.ts
  36. +879 −567 i18n/qgis_sk.ts
  37. +849 −581 i18n/qgis_sq_AL.ts
  38. +884 −556 i18n/qgis_sv.ts
  39. +849 −581 i18n/qgis_th.ts
  40. +877 −561 i18n/qgis_tr.ts
  41. +838 −530 i18n/qgis_uk.ts
  42. +319 −50 i18n/qgis_vi.ts
  43. +281 −115 i18n/qgis_xh.ts
  44. +294 −70 i18n/qgis_zh_CN.ts
  45. +319 −47 i18n/qgis_zh_TW.ts
  46. BIN images/themes/default/mActionCalculateField.png
  47. +26 −12 mac/xcode/Qgis.xcodeproj/project.pbxproj
  48. +34 −15 mac/xcode/ReadMe.rtf
  49. +11 −6 mac/xcode/qgis_settings.xcconfig
  50. +7 −6 mac/xcode/qgis_user-template.xcconfig
  51. +4 −0 python/core/qgsdatasourceuri.sip
  52. +1 −1 python/plugins/plugin_installer/__init__.py
  53. +3 −1 python/plugins/plugin_installer/installer_data.py
  54. +1 −2 python/plugins/plugin_installer/qgsplugininstallerbase.ui
  55. +0 −4 src/analysis/CMakeLists.txt
  56. +4 −2 src/app/CMakeLists.txt
  57. +46 −24 src/app/composer/qgscomposer.cpp
  58. +7 −0 src/app/composer/qgscomposer.h
  59. +37 −26 src/app/qgisapp.cpp
  60. +1 −1 src/app/qgscontinuouscolordialog.cpp
  61. +403 −0 src/app/qgsfieldcalculator.cpp
  62. +72 −0 src/app/qgsfieldcalculator.h
  63. +1 −1 src/app/qgsgraduatedsymboldialog.cpp
  64. +17 −15 src/app/qgsmeasuretool.cpp
  65. +7 −0 src/app/qgsmeasuretool.h
  66. +27 −19 src/app/{qgsgeomtypedialog.cpp → qgsnewvectorlayerdialog.cpp}
  67. +8 −8 src/app/{qgsgeomtypedialog.h → qgsnewvectorlayerdialog.h}
  68. +6 −6 src/app/qgsoptions.cpp
  69. +2 −2 src/app/qgsprojectproperties.cpp
  70. +13 −8 src/app/qgssearchquerybuilder.cpp
  71. +54 −41 src/app/qgsvectorlayerproperties.cpp
  72. +14 −0 src/app/qgsvectorlayerproperties.h
  73. +2 −2 src/core/composer/qgscomposeritem.cpp
  74. +0 −8 src/core/composer/qgscomposermap.cpp
  75. +0 −6 src/core/composer/qgscomposermap.h
  76. +3 −2 src/core/composer/qgscomposerpicture.cpp
  77. +5 −0 src/core/qgsdatasourceuri.cpp
  78. +4 −0 src/core/qgsdatasourceuri.h
  79. +33 −5 src/core/qgsmaplayer.cpp
  80. +5 −0 src/core/qgsproject.cpp
  81. +9 −1 src/core/qgssearchstringlexer.ll
  82. +7 −2 src/core/qgssearchstringparser.yy
  83. +40 −3 src/core/qgssearchtreenode.cpp
  84. +9 −2 src/core/qgssearchtreenode.h
  85. +3 −1 src/gui/qgscomposerview.cpp
  86. +4 −3 src/providers/ogr/qgsogrprovider.cpp
  87. +29 −11 src/providers/postgres/qgspostgresprovider.cpp
  88. +61 −17 src/providers/spatialite/qgsspatialiteprovider.cpp
  89. +11 −0 src/providers/spatialite/qgsspatialiteprovider.h
  90. +1 −4 src/python/CMakeLists.txt
  91. +2 −2 src/ui/qgsattributetabledialog.ui
  92. +25 −62 src/ui/qgscomposerbase.ui
  93. +12 −3 src/ui/qgscomposeritemwidgetbase.ui
  94. +6 −1 src/ui/qgscomposerlabelwidgetbase.ui
  95. +8 −5 src/ui/qgscomposerlegenditemdialogbase.ui
  96. +159 −138 src/ui/qgscomposerlegendwidgetbase.ui
  97. +172 −176 src/ui/qgscomposermapwidgetbase.ui
  98. +119 −107 src/ui/qgscomposerpicturewidgetbase.ui
  99. +46 −12 src/ui/qgscomposerscalebarwidgetbase.ui
  100. +299 −0 src/ui/qgsfieldcalculatorbase.ui
  101. +0 −251 src/ui/qgsgeomtypedialogbase.ui
  102. +320 −0 src/ui/qgsnewvectorlayerdialogbase.ui
  103. +15 −9 src/ui/qgsoptionsbase.ui
  104. +30 −6 src/ui/qgsprojectpropertiesbase.ui
  105. +36 −57 src/ui/qgsvectorlayerpropertiesbase.ui
@@ -4,8 +4,10 @@ qgis (1.4.0) UNRELEASED; urgency=low
* use templates for configuration for ABIs and distributions
* policy updated to 3.8.3
* remove README.Debian from libqgis{QGIS_ABI}-dev
* add symbol files for shared libraries
* shorten qgis.sh

-- Jürgen E. Fischer <jef@norbit.de> Fri, 18 Sep 2009 18:50:02 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sun, 27 Sep 2009 02:34:35 +0200

qgis (1.3.0) UNRELEASED; urgency=low

@@ -70,7 +70,7 @@ Description: Quantum GIS - development files

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, grass{GRASS_ABI}
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.

This file was deleted.

@@ -1,3 +1,3 @@
usr/include/qgis/*
usr/lib/libqgis_gui.so.*.*.*
usr/lib/libqgis_core.so.*.*.*
usr/lib/libqgis_gui.so
usr/lib/libqgis_core.so
@@ -1,3 +1,3 @@
usr/lib/libqgis_core.so.*.*.*
usr/lib/libqgis_gui.so.*.*.*
usr/lib/libqgis_analysis.so.*.*.*
usr/lib/libqgis_core.so.{QGIS_ABI}
usr/lib/libqgis_gui.so.{QGIS_ABI}
usr/lib/libqgis_analysis.so.{QGIS_ABI}
@@ -0,0 +1,2 @@
libqgis{QGIS_ABI}: shlib-calls-exit
libqgis{QGIS_ABI}: package-name-doesnt-match-sonames

Large diffs are not rendered by default.

@@ -1,4 +1,4 @@
usr/lib/python*/{dist,site}-packages/qgis/__init__.py
usr/lib/python*/{dist,site}-packages/qgis/qgisconfig.py
usr/lib/python*/{dist,site}-packages/qgis/*.so
usr/lib/libqgispython.so*
usr/lib/libqgispython.so.{QGIS_ABI}
@@ -1,2 +1 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: non-dev-pkg-with-shlib-symlink
@@ -0,0 +1,47 @@
libqgispython.so.1.4.0 python-qgis #MINVER#
_ZN10QByteArrayD1Ev@Base 1.4.0
_ZN14QgsPythonUtilsD0Ev@Base 1.4.0
_ZN14QgsPythonUtilsD1Ev@Base 1.4.0
_ZN18QgsPythonUtilsImpl10evalStringERK7QStringRS0_@Base 1.4.0
_ZN18QgsPythonUtilsImpl10exitPythonEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl10initPythonEP13QgisInterface@Base 1.4.0
_ZN18QgsPythonUtilsImpl10loadPluginE7QString@Base 1.4.0
_ZN18QgsPythonUtilsImpl10pluginListEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl10pythonPathEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl11pluginsPathEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl11startPluginE7QString@Base 1.4.0
_ZN18QgsPythonUtilsImpl12getTracebackEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl12unloadPluginE7QString@Base 1.4.0
_ZN18QgsPythonUtilsImpl15getTypeAsStringEP7_object@Base 1.4.0
_ZN18QgsPythonUtilsImpl15homePluginsPathEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl15runStringUnsafeERK7QStringb@Base 1.4.0
_ZN18QgsPythonUtilsImpl16installErrorHookEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl17PyObjectToQStringEP7_object@Base 1.4.0
_ZN18QgsPythonUtilsImpl17getPluginMetadataE7QStringS0_@Base 1.4.0
_ZN18QgsPythonUtilsImpl18uninstallErrorHookEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl19getVariableFromMainE7QString@Base 1.4.0
_ZN18QgsPythonUtilsImpl19installConsoleHooksEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl21uninstallConsoleHooksEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl8getErrorER7QStringS1_@Base 1.4.0
_ZN18QgsPythonUtilsImpl9getResultEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl9isEnabledEv@Base 1.4.0
_ZN18QgsPythonUtilsImpl9runStringERK7QStringS0_@Base 1.4.0
_ZN18QgsPythonUtilsImplC1Ev@Base 1.4.0
_ZN18QgsPythonUtilsImplC2Ev@Base 1.4.0
_ZN18QgsPythonUtilsImplD0Ev@Base 1.4.0
_ZN18QgsPythonUtilsImplD1Ev@Base 1.4.0
_ZN18QgsPythonUtilsImplD2Ev@Base 1.4.0
_ZN5QListI7QStringE4freeEPN9QListData4DataE@Base 1.4.0
_ZN5QListI7QStringE6appendERKS0_@Base 1.4.0
_ZN7QStringC1EPKc@Base 1.4.0
_ZN7QStringC1ERKS_@Base 1.4.0
_ZN7QStringD1Ev@Base 1.4.0
_ZN7QStringaSEPKc@Base 1.4.0
_ZTI14QgsPythonUtils@Base 1.4.0
_ZTI18QgsPythonUtilsImpl@Base 1.4.0
_ZTS14QgsPythonUtils@Base 1.4.0
_ZTS18QgsPythonUtilsImpl@Base 1.4.0
_ZTV14QgsPythonUtils@Base 1.4.0
_ZTV18QgsPythonUtilsImpl@Base 1.4.0
_ZplRK7QStringPKc@Base 1.4.0
instance@Base 1.4.0
@@ -1,3 +1,3 @@
usr/lib/qgis/libgrassplugin.so
usr/lib/qgis/libgrassprovider.so
usr/lib/libqgisgrass.so.*.*.*
usr/lib/libqgisgrass.so.{QGIS_ABI}
@@ -0,0 +1,178 @@
libqgisgrass.so.1.4.0 qgis-plugin-grass #MINVER#
_ZN10QByteArray4dataEv@Base 1.4.0
_ZN10QByteArrayD1Ev@Base 1.4.0
_ZN11QStringListD1Ev@Base 1.4.0
_ZN15QgsDataProvider12subsetStringEv@Base 1.4.0
_ZN15QgsDataProvider13setLayerOrderE11QStringList@Base 1.4.0
_ZN15QgsDataProvider13updateExtentsEv@Base 1.4.0
_ZN15QgsDataProvider15setSubsetStringE7QString@Base 1.4.0
_ZN15QgsDataProvider16setDataSourceUriERK7QString@Base 1.4.0
_ZN15QgsDataProvider21setSubLayerVisibilityE7QStringb@Base 1.4.0
_ZN16QgsGrassProvider10attributesEii@Base 1.4.0
_ZN16QgsGrassProvider10closeLayerEi@Base 1.4.0
_ZN16QgsGrassProvider10deleteLineEi@Base 1.4.0
_ZN16QgsGrassProvider10executeSqlEiRK7QString@Base 1.4.0
_ZN16QgsGrassProvider10grassLayerE7QString@Base 1.4.0
_ZN16QgsGrassProvider10grassLayerEv@Base 1.4.0
_ZN16QgsGrassProvider10nodeNLinesEi@Base 1.4.0
_ZN16QgsGrassProvider10numDbLinksEv@Base 1.4.0
_ZN16QgsGrassProvider11createTableEiRK7QStringS2_@Base 1.4.0
_ZN16QgsGrassProvider11dbLinkFieldEi@Base 1.4.0
_ZN16QgsGrassProvider11mapOutdatedEi@Base 1.4.0
_ZN16QgsGrassProvider11nextFeatureER10QgsFeature@Base 1.4.0
_ZN16QgsGrassProvider11rewriteLineEiiP9line_pntsP9line_cats@Base 1.4.0
_ZN16QgsGrassProvider11updatedLineEi@Base 1.4.0
_ZN16QgsGrassProvider11updatedNodeEi@Base 1.4.0
_ZN16QgsGrassProvider12centroidAreaEi@Base 1.4.0
_ZN16QgsGrassProvider12minimumValueEi@Base 1.4.0
_ZN16QgsGrassProvider13cidxGetMaxCatEi@Base 1.4.0
_ZN16QgsGrassProvider14grassLayerTypeE7QString@Base 1.4.0
_ZN16QgsGrassProvider14loadAttributesER6GLAYER@Base 1.4.0
_ZN16QgsGrassProvider14resetSelectionEb@Base 1.4.0
_ZN16QgsGrassProvider15isGrassEditableEv@Base 1.4.0
_ZN16QgsGrassProvider15numUpdatedLinesEv@Base 1.4.0
_ZN16QgsGrassProvider15numUpdatedNodesEv@Base 1.4.0
_ZN16QgsGrassProvider16cidxGetNumFieldsEv@Base 1.4.0
_ZN16QgsGrassProvider16deleteAttributesEii@Base 1.4.0
_ZN16QgsGrassProvider16insertAttributesEii@Base 1.4.0
_ZN16QgsGrassProvider16updateAttributesEiiRK7QString@Base 1.4.0
_ZN16QgsGrassProvider17allocateSelectionEP8Map_infoPPc@Base 1.4.0
_ZN16QgsGrassProvider18attributesOutdatedEi@Base 1.4.0
_ZN16QgsGrassProvider18cidxGetFieldNumberEi@Base 1.4.0
_ZN16QgsGrassProvider20setFeatureAttributesEiiP10QgsFeature@Base 1.4.0
_ZN16QgsGrassProvider20setFeatureAttributesEiiP10QgsFeatureRK5QListIiE@Base 1.4.0
_ZN16QgsGrassProvider23loadLayerSourcesFromMapER6GLAYER@Base 1.4.0
_ZN16QgsGrassProvider3crsEv@Base 1.4.0
_ZN16QgsGrassProvider3keyEi@Base 1.4.0
_ZN16QgsGrassProvider4thawEv@Base 1.4.0
_ZN16QgsGrassProvider5mMapsE@Base 1.4.0
_ZN16QgsGrassProvider6extentEv@Base 1.4.0
_ZN16QgsGrassProvider6freezeEv@Base 1.4.0
_ZN16QgsGrassProvider6rewindEv@Base 1.4.0
_ZN16QgsGrassProvider6selectE5QListIiE12QgsRectanglebb@Base 1.4.0
_ZN16QgsGrassProvider6updateEv@Base 1.4.0
_ZN16QgsGrassProvider7columnsEi@Base 1.4.0
_ZN16QgsGrassProvider7isValidEv@Base 1.4.0
_ZN16QgsGrassProvider7mLayersE@Base 1.4.0
_ZN16QgsGrassProvider7openMapE7QStringS0_S0_S0_@Base 1.4.0
_ZN16QgsGrassProvider8closeMapEi@Base 1.4.0
_ZN16QgsGrassProvider8findLineEddid@Base 1.4.0
_ZN16QgsGrassProvider8findNodeEddd@Base 1.4.0
_ZN16QgsGrassProvider8isEditedEv@Base 1.4.0
_ZN16QgsGrassProvider8isFrozenEv@Base 1.4.0
_ZN16QgsGrassProvider8isOrphanEiiPi@Base 1.4.0
_ZN16QgsGrassProvider8keyFieldEv@Base 1.4.0
_ZN16QgsGrassProvider8layerMapEi@Base 1.4.0
_ZN16QgsGrassProvider8maxValueEi@Base 1.4.0
_ZN16QgsGrassProvider8nodeCoorEiPdS0_@Base 1.4.0
_ZN16QgsGrassProvider8nodeLineEii@Base 1.4.0
_ZN16QgsGrassProvider8numLinesEv@Base 1.4.0
_ZN16QgsGrassProvider8numNodesEv@Base 1.4.0
_ZN16QgsGrassProvider8readLineEP9line_pntsP9line_catsi@Base 1.4.0
_ZN16QgsGrassProvider9addColumnEiRK7QString@Base 1.4.0
_ZN16QgsGrassProvider9closeEditEb@Base 1.4.0
_ZN16QgsGrassProvider9lineAliveEi@Base 1.4.0
_ZN16QgsGrassProvider9lineAreasEiPiS0_@Base 1.4.0
_ZN16QgsGrassProvider9lineNodesEiPiS0_@Base 1.4.0
_ZN16QgsGrassProvider9nodeAliveEi@Base 1.4.0
_ZN16QgsGrassProvider9openLayerE7QStringS0_S0_S0_i@Base 1.4.0
_ZN16QgsGrassProvider9reopenMapEv@Base 1.4.0
_ZN16QgsGrassProvider9startEditEv@Base 1.4.0
_ZN16QgsGrassProvider9updateMapEi@Base 1.4.0
_ZN16QgsGrassProvider9writeLineEiP9line_pntsP9line_cats@Base 1.4.0
_ZN16QgsGrassProviderC1E7QString@Base 1.4.0
_ZN16QgsGrassProviderC2E7QString@Base 1.4.0
_ZN16QgsGrassProviderD0Ev@Base 1.4.0
_ZN16QgsGrassProviderD1Ev@Base 1.4.0
_ZN16QgsGrassProviderD2Ev@Base 1.4.0
_ZN21QgsVectorDataProvider10enumValuesEiR11QStringList@Base 1.4.0
_ZN4GMAPC1ERKS_@Base 1.4.0
_ZN4GMAPD1Ev@Base 1.4.0
_ZN4QMapIi8QgsFieldE11node_createEP8QMapDataPPNS2_4NodeERKiRKS0_@Base 1.4.0
_ZN4QMapIi8QgsFieldE13detach_helperEv@Base 1.4.0
_ZN4QMapIi8QgsFieldE5clearEv@Base 1.4.0
_ZN4QMapIi8QgsFieldE8freeDataEP8QMapData@Base 1.4.0
_ZN5QListI7QStringE4freeEPN9QListData4DataE@Base 1.4.0
_ZN5QListI7QStringE5clearEv@Base 1.4.0
_ZN5QListI7QStringE6appendERKS0_@Base 1.4.0
_ZN6GLAYERD1Ev@Base 1.4.0
_ZN7QObject2trEPKcS1_@Base 1.4.0
_ZN7QStringC1EPKc@Base 1.4.0
_ZN7QStringC1ERKS_@Base 1.4.0
_ZN7QStringD1Ev@Base 1.4.0
_ZN8QgsGrass10activeModeEv@Base 1.4.0
_ZN8QgsGrass10openMapsetE7QStringS0_S0_@Base 1.4.0
_ZN8QgsGrass10resetErrorEv@Base 1.4.0
_ZN8QgsGrass11closeMapsetEv@Base 1.4.0
_ZN8QgsGrass11initializedE@Base 1.4.0
_ZN8QgsGrass11mMapsetLockE@Base 1.4.0
_ZN8QgsGrass11setLocationE7QStringS0_@Base 1.4.0
_ZN8QgsGrass11writeRegionE7QStringS0_S0_P9Cell_head@Base 1.4.0
_ZN8QgsGrass12errorMessageEv@Base 1.4.0
_ZN8QgsGrass12extendRegionEP9Cell_headS1_@Base 1.4.0
_ZN8QgsGrass12lockFilePathEv@Base 1.4.0
_ZN8QgsGrass12regionStringEP9Cell_head@Base 1.4.0
_ZN8QgsGrass12versionMajorEv@Base 1.4.0
_ZN8QgsGrass12versionMinorEv@Base 1.4.0
_ZN8QgsGrass13defaultMapsetE@Base 1.4.0
_ZN8QgsGrass13error_messageE@Base 1.4.0
_ZN8QgsGrass13error_routineEPKci@Base 1.4.0
_ZN8QgsGrass13error_routineEPci@Base 1.4.0
_ZN8QgsGrass13versionStringEv@Base 1.4.0
_ZN8QgsGrass14versionReleaseEv@Base 1.4.0
_ZN8QgsGrass15defaultGisdbaseE@Base 1.4.0
_ZN8QgsGrass15defaultLocationE@Base 1.4.0
_ZN8QgsGrass16copyRegionExtentEP9Cell_headS1_@Base 1.4.0
_ZN8QgsGrass16getDefaultMapsetEv@Base 1.4.0
_ZN8QgsGrass18getDefaultGisdbaseEv@Base 1.4.0
_ZN8QgsGrass18getDefaultLocationEv@Base 1.4.0
_ZN8QgsGrass19isValidGrassBaseDirE7QString@Base 1.4.0
_ZN8QgsGrass20copyRegionResolutionEP9Cell_headS1_@Base 1.4.0
_ZN8QgsGrass4initEv@Base 1.4.0
_ZN8QgsGrass4mTmpE@Base 1.4.0
_ZN8QgsGrass5errorEv@Base 1.4.0
_ZN8QgsGrass6activeE@Base 1.4.0
_ZN8QgsGrass6mGisrcE@Base 1.4.0
_ZN8QgsGrass6regionE7QStringS0_S0_P9Cell_head@Base 1.4.0
_ZN8QgsGrass7mapsetsE7QString@Base 1.4.0
_ZN8QgsGrass7mapsetsE7QStringS0_@Base 1.4.0
_ZN8QgsGrass7rastersE7QString@Base 1.4.0
_ZN8QgsGrass7rastersE7QStringS0_S0_@Base 1.4.0
_ZN8QgsGrass7vectorsE7QString@Base 1.4.0
_ZN8QgsGrass7vectorsE7QStringS0_S0_@Base 1.4.0
_ZN8QgsGrass8elementsE7QStringS0_@Base 1.4.0
_ZN8QgsGrass8elementsE7QStringS0_S0_S0_@Base 1.4.0
_ZN8QgsGrass8isMapsetE7QString@Base 1.4.0
_ZN8QgsGrass9ExceptionD0Ev@Base 1.4.0
_ZN8QgsGrass9ExceptionD1Ev@Base 1.4.0
_ZN8QgsGrass9lastErrorE@Base 1.4.0
_ZN8QgsGrass9locationsE7QString@Base 1.4.0
_ZN8QgsGrass9mapRegionEi7QStringS0_S0_S0_P9Cell_head@Base 1.4.0
_ZN8QgsGrass9setMapsetE7QStringS0_S0_@Base 1.4.0
_ZNK15QgsDataProvider13dataSourceUriEv@Base 1.4.0
_ZNK15QgsDataProvider13subLayerCountEv@Base 1.4.0
_ZNK15QgsDataProvider14subLayerStylesEv@Base 1.4.0
_ZNK15QgsDataProvider17fileRasterFiltersEv@Base 1.4.0
_ZNK15QgsDataProvider17fileVectorFiltersEv@Base 1.4.0
_ZNK15QgsDataProvider9subLayersEv@Base 1.4.0
_ZNK16QgsGrassProvider10fieldCountEv@Base 1.4.0
_ZNK16QgsGrassProvider11descriptionEv@Base 1.4.0
_ZNK16QgsGrassProvider11storageTypeEv@Base 1.4.0
_ZNK16QgsGrassProvider12featureCountEv@Base 1.4.0
_ZNK16QgsGrassProvider12geometryTypeEv@Base 1.4.0
_ZNK16QgsGrassProvider4nameEv@Base 1.4.0
_ZNK16QgsGrassProvider6fieldsEv@Base 1.4.0
_ZNSt6vectorI4GMAPSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.4.0
_ZNSt6vectorI4GMAPSaIS0_EED1Ev@Base 1.4.0
_ZNSt6vectorI6GLAYERSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.4.0
_ZNSt6vectorI6GLAYERSaIS0_EED1Ev@Base 1.4.0
_ZNSt6vectorI8QgsFieldSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.4.0
_ZTI16QgsGrassProvider@Base 1.4.0
_ZTIN8QgsGrass9ExceptionE@Base 1.4.0
_ZTS16QgsGrassProvider@Base 1.4.0
_ZTSN8QgsGrass9ExceptionE@Base 1.4.0
_ZTV16QgsGrassProvider@Base 1.4.0
_ZTVN8QgsGrass9ExceptionE@Base 1.4.0
_ZplPKcRK7QString@Base 1.4.0
_ZplRK7QStringPKc@Base 1.4.0
_ZplRK7QStringS1_@Base 1.4.0
@@ -1,12 +1,11 @@
#!/bin/sh

LD_LIBRARY_PATH=/usr/lib/grass/lib
export LD_LIBRARY_PATH

if [ "$LD_LIBRARY_PATH" = "" ]; then
LD_LIBRARY_PATH=/usr/lib/grass/lib:/usr/lib/grass64/lib
else
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib:/usr/lib/grass64/lib
fi

export LD_LIBRARY_PATH

exec $0.bin "$@"
@@ -58,18 +58,14 @@ endif
define gentemplate
$(2): $(1)
sed \
-e "s/{QGIS_ABI}/$(QGIS_ABI)/" \
-e "s/{GRASS_ABI}/$(GRASS_ABI)/" $$^ >$$@
-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@
endef

TEMPLATES := $(patsubst %.$(DISTRIBUTION),%,$(wildcard debian/*.$(DISTRIBUTION)))
TEMPLATES += $(patsubst %.in,%,$(wildcard debian/*.in))
TEMPLATES := $(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(basename $(t)))
TEMPLATES += $(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))

templates: $(TEMPLATES)

$(eval $(call gentemplate,debian/%.$(DISTRIBUTION),debian/%))
$(eval $(call gentemplate,debian/%.in,debian/%))
$(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(eval $(call gentemplate,$(t),$(basename $(t)))))
$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))

debian/build/CMakeCache.txt: CMakeLists.txt
@@ -89,7 +85,7 @@ build-stamp: debian/build/CMakeCache.txt

touch $@

clean: templates
clean: $(TEMPLATES)
dh_testdir
dh_testroot
rm -f build-stamp
@@ -157,4 +153,4 @@ endif
dh_builddeb

binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install templates
.PHONY: build clean binary-indep binary-arch binary install debian/control

0 comments on commit 26b12b6

Please sign in to comment.
You can’t perform that action at this time.