Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
mhugent committed May 11, 2011
2 parents d05b140 + a48c4ac commit 3cc052d38bc0a1847af9fdfa5c29c214436a1bcc
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -39,6 +39,7 @@ Markus Neteler
Mathias Walker
Matt Amos
Maurizio Napolitano
Mayeul Kauffmann
Milena Nowotarska
Nathan Woodrow
Nikos Alexandris
@@ -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

0 comments on commit 3cc052d

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