Merge remote branch 'pb/master'

qgis · May 11, 2011 · 5b1a9f9 · 5b1a9f9
2 parents c914c14 + a48c4ac
commit 5b1a9f9
Show file tree

Hide file tree

Showing 26 changed files with 4,185 additions and 3,802 deletions.
diff --git a/debian/control b/debian/control
@@ -24,7 +24,7 @@ Build-Depends:
  python-dev,
  python-qt4-dev (>=4.1.0),
  python-sip-dev (>= 4.5.0) | python-sip4-dev (>= 4.5.0) | sip4 (>= 4.5),
- subversion,
+ git,
  txt2tags,
  doxygen
 Build-Conflicts: libqgis-dev, qgis-dev

diff --git a/debian/control.hardy b/debian/control.hardy
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  python-sip4 (>= 4.5.0), python-central (>=0.5), python, sip4 (>= 4.5),
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, fcgi-dev, subversion
+ python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, fcgi-dev, git
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.karmic b/debian/control.karmic
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=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), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev,
- subversion, doxygen, graphviz, txt2tags
+ git, doxygen, graphviz, txt2tags
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current

diff --git a/debian/control.lenny b/debian/control.lenny
@@ -27,7 +27,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0),
  sip4 (>= 4.5),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -28,7 +28,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

diff --git a/debian/control.natty b/debian/control.natty
@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

diff --git a/debian/control.sid b/debian/control.sid
@@ -29,7 +29,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -28,7 +28,7 @@ Build-Depends:
  python-qt4-dev (>=4.1.0),
  python-sip (>= 4.5.0),
  python-sip-dev (>= 4.5.0),
- subversion,
+ git,
  doxygen,
  graphviz,
  txt2tags 

diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -39,6 +39,7 @@ Markus Neteler
 Mathias Walker
 Matt Amos
 Maurizio Napolitano
+Mayeul Kauffmann
 Milena Nowotarska
 Nathan Woodrow
 Nikos Alexandris

diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
@@ -18,7 +18,7 @@ Croatian|Zoran Jankovic
 Czech|Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant
 Danish|Henriette Roued
 Dutch|Richard Duivenvoorde, Raymond Nijssen
-French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M
+French|Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann
 Georgian|Shota Murtskhvaladze, George Machitidze
 German|Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
 Greek|Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
@@ -38,7 +38,7 @@ Romanian|Lonut Losifescu-Enescu
 Russian|Artem Popov
 Slovak|Lubos Balazovic
 Slovenian|Jože Detečnik, Dejan Gregor
-Spanish|Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado
+Spanish|Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann
 Swedish|Lars Luthman, Magnus Homann
 Thai|Man Chao
 Turkish|Osman Yilmaz