Skip to content

Commit

Permalink
merge from trunk r11900:11950
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11969 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Nov 7, 2009
1 parent 97a84db commit be961f3
Show file tree
Hide file tree
Showing 85 changed files with 89,182 additions and 63,857 deletions.
2 changes: 2 additions & 0 deletions DONORS
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ Alexandre Leroux
Andreas Neumann
Associazione Monte Porzio Cultura
Carl Nelson
Christopher Kahler
D R Arbib
Dirk Pflugmacher
David Enns|http://www.mapitout.com/
Ecotrust|http://www.ecotrust.org/
Emanuele Zamprogno
Expand Down
10 changes: 5 additions & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
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: libqgis1.4.0-dev, qgis-dev
Build-Conflicts: libqgis-dev, qgis-dev
Standards-Version: 3.8.3
XS-Python-Version: current
Homepage: http://qgis.org/
Expand Down Expand Up @@ -50,7 +50,7 @@ Description: Quantum GIS - shared libraries
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.

Package: libqgis1.4.0-dev
Package: libqgis-dev
Architecture: any
Section: libdevel
Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
Expand All @@ -59,8 +59,8 @@ Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev,
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.
Expand All @@ -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, grass64
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5+39438
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5,263 changes: 2,711 additions & 2,552 deletions i18n/qgis_ar.ts

Large diffs are not rendered by default.

5,338 changes: 3,170 additions & 2,168 deletions i18n/qgis_cs_CZ.ts

Large diffs are not rendered by default.

1,694 changes: 957 additions & 737 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

Loading

0 comments on commit be961f3

Please sign in to comment.