merge from trunk r11950:11971... in sync again!

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11972 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 7, 2009 · 0e6aa15 · 0e6aa15
1 parent be961f3
commit 0e6aa15
Show file tree

Hide file tree

Showing 97 changed files with 38,372 additions and 29,814 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -6,8 +6,9 @@ qgis (1.4.0) UNRELEASED; urgency=low
   * remove README.Debian from libqgis-dev
   * add symbol files for shared libraries
   * shorten qgis.sh
+  * add all python files in qgis' site-packages
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sun, 27 Sep 2009 02:34:35 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 07 Nov 2009 16:19:33 +0100
 
 qgis (1.3.0) UNRELEASED; urgency=low
 

diff --git a/debian/libqgis{QGIS_ABI}.symbols b/debian/libqgis{QGIS_ABI}.symbols
diff --git a/debian/python-qgis.install.in b/debian/python-qgis.install.in
@@ -1,4 +1,3 @@
-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/*.py
 usr/lib/python*/{dist,site}-packages/qgis/*.so
 usr/lib/libqgispython.so.{QGIS_ABI}
diff --git a/debian/python-qgis.symbols b/debian/python-qgis.symbols
@@ -43,5 +43,6 @@ libqgispython.so.1.4.0 python-qgis #MINVER#
  _ZTS18QgsPythonUtilsImpl@Base 1.4.0
  _ZTV14QgsPythonUtils@Base 1.4.0
  _ZTV18QgsPythonUtilsImpl@Base 1.4.0
+ _ZplPKcRK7QString@Base 1.4.0
  _ZplRK7QStringPKc@Base 1.4.0
  instance@Base 1.4.0
diff --git a/debian/qgis-plugin-grass.symbols b/debian/qgis-plugin-grass.symbols
@@ -7,6 +7,7 @@ libqgisgrass.so.1.4.0 qgis-plugin-grass #MINVER#
  _ZN15QgsDataProvider13updateExtentsEv@Base 1.4.0
  _ZN15QgsDataProvider15setSubsetStringE7QString@Base 1.4.0
  _ZN15QgsDataProvider16setDataSourceUriERK7QString@Base 1.4.0
+ _ZN15QgsDataProvider20supportsSubsetStringEv@Base 1.4.0
  _ZN15QgsDataProvider21setSubLayerVisibilityE7QStringb@Base 1.4.0
  _ZN16QgsGrassProvider10attributesEii@Base 1.4.0
  _ZN16QgsGrassProvider10closeLayerEi@Base 1.4.0

diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/i18n/qgis_el_GR.ts b/i18n/qgis_el_GR.ts
diff --git a/i18n/qgis_es.ts b/i18n/qgis_es.ts
diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts
diff --git a/i18n/qgis_he.ts b/i18n/qgis_he.ts
diff --git a/i18n/qgis_hu.ts b/i18n/qgis_hu.ts
diff --git a/i18n/qgis_id.ts b/i18n/qgis_id.ts
diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts
diff --git a/i18n/qgis_ja.ts b/i18n/qgis_ja.ts
diff --git a/i18n/qgis_ka_GE.ts b/i18n/qgis_ka_GE.ts
diff --git a/i18n/qgis_lo.ts b/i18n/qgis_lo.ts
diff --git a/i18n/qgis_lt.ts b/i18n/qgis_lt.ts
diff --git a/i18n/qgis_lv.ts b/i18n/qgis_lv.ts
diff --git a/i18n/qgis_mn.ts b/i18n/qgis_mn.ts
diff --git a/i18n/qgis_nl.ts b/i18n/qgis_nl.ts
diff --git a/i18n/qgis_pl_PL.ts b/i18n/qgis_pl_PL.ts
diff --git a/i18n/qgis_pt_BR.ts b/i18n/qgis_pt_BR.ts
diff --git a/i18n/qgis_ro.ts b/i18n/qgis_ro.ts
diff --git a/i18n/qgis_ru.ts b/i18n/qgis_ru.ts
diff --git a/i18n/qgis_sk.ts b/i18n/qgis_sk.ts
diff --git a/i18n/qgis_sq_AL.ts b/i18n/qgis_sq_AL.ts
diff --git a/i18n/qgis_sv.ts b/i18n/qgis_sv.ts
diff --git a/i18n/qgis_th.ts b/i18n/qgis_th.ts
diff --git a/i18n/qgis_tr.ts b/i18n/qgis_tr.ts
diff --git a/i18n/qgis_uk.ts b/i18n/qgis_uk.ts