Merge branch 'master' of github.com:qgis/Quantum-GIS

qgis · May 23, 2011 · 4d5455f
2 parents 7c0e900 + b610620
commit 4d5455f
Show file tree

Hide file tree

Showing 182 changed files with 6,332 additions and 5,583 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,9 @@
 qgis (1.8.0) UNRELEASED; urgency=low
 
   * new development version 1.8 after branch
+  * add qgis browser (qbrowser)
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 07 May 2011 00:47:20 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Mon, 23 May 2011 18:08:18 +0200
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.karmic b/debian/control.karmic
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.lenny b/debian/control.lenny
@@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.natty b/debian/control.natty
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.sid b/debian/control.sid
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/qgis-plugin-grass.postrm b/debian/qgis-plugin-grass.postrm
@@ -4,6 +4,7 @@ set -e
 
 if [ "$1" = "remove" ]; then
 	dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
+	dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
 fi
 
 #DEBHELPER#

diff --git a/debian/qgis-plugin-grass.preinst b/debian/qgis-plugin-grass.preinst
@@ -4,6 +4,7 @@ set -e
 
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
 	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
+	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
 fi
 
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
@@ -150,9 +150,11 @@ binary-arch: build install
 
 	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
 	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
+	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin
 
 	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
+	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
 
 	dh_pycentral
 	dh_installmenu

diff --git a/i18n/qgis_af.ts b/i18n/qgis_af.ts
@@ -19154,7 +19154,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -23931,7 +23931,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25390,7 +25390,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
@@ -19657,7 +19657,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -24415,7 +24415,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25929,7 +25929,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/i18n/qgis_bg.ts b/i18n/qgis_bg.ts
@@ -20797,7 +20797,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25574,7 +25574,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location fil