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

qgis · Apr 14, 2012 · c6e9291 · c6e9291
2 parents a3fea94 + 5148d5f
commit c6e9291
Show file tree

Hide file tree

Showing 50 changed files with 57 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -12,8 +12,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
   * add mssqlprovider plugin
   * copyright & policy update (synced from debiangis)
   * run crssync in postinst
+  * switch from test with check target instead of test
 
- -- Jürgen E. Fischer <jef@norbit.de>  Tue, 03 Apr 2012 00:20:18 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 14 Apr 2012 10:39:28 +0200
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/rules b/debian/rules
@@ -104,7 +104,9 @@ build-stamp: debian/build/CMakeCache.txt
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Code to run the package test suite - and ignore the outcome for now
-	LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build test || true
+	LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build check || true
+else
+	echo Skipping tests.
 endif
 
 	touch $@

diff --git a/images/flags/af.png b/images/flags/af.png
diff --git a/images/flags/ar.png b/images/flags/ar.png
diff --git a/images/flags/bg.png b/images/flags/bg.png
diff --git a/images/flags/ca_ES.png b/images/flags/ca_ES.png
diff --git a/images/flags/cs_CZ.png b/images/flags/cs_CZ.png
diff --git a/images/flags/de.png b/images/flags/de.png
diff --git a/images/flags/el_GR.png b/images/flags/el_GR.png
diff --git a/images/flags/es.png b/images/flags/es.png
diff --git a/images/flags/et.png b/images/flags/et.png
diff --git a/images/flags/fa.png b/images/flags/fa.png
diff --git a/images/flags/fi.png b/images/flags/fi.png
diff --git a/images/flags/fr.png b/images/flags/fr.png
diff --git a/images/flags/gl_ES.png b/images/flags/gl_ES.png
diff --git a/images/flags/he.png b/images/flags/he.png
diff --git a/images/flags/hr_HR.png b/images/flags/hr_HR.png
diff --git a/images/flags/hu.png b/images/flags/hu.png
diff --git a/images/flags/id.png b/images/flags/id.png
diff --git a/images/flags/is.png b/images/flags/is.png
diff --git a/images/flags/it.png b/images/flags/it.png
diff --git a/images/flags/ja.png b/images/flags/ja.png
diff --git a/images/flags/ka_GE.png b/images/flags/ka_GE.png
diff --git a/images/flags/ko_KR.png b/images/flags/ko_KR.png
diff --git a/images/flags/lo.png b/images/flags/lo.png
diff --git a/images/flags/lt.png b/images/flags/lt.png
diff --git a/images/flags/lv.png b/images/flags/lv.png
diff --git a/images/flags/mn.png b/images/flags/mn.png
diff --git a/images/flags/nl.png b/images/flags/nl.png
diff --git a/images/flags/no.png b/images/flags/no.png
diff --git a/images/flags/pl_PL.png b/images/flags/pl_PL.png
diff --git a/images/flags/pt_BR.png b/images/flags/pt_BR.png
diff --git a/images/flags/pt_PT.png b/images/flags/pt_PT.png
diff --git a/images/flags/ro.png b/images/flags/ro.png
diff --git a/images/flags/ru.png b/images/flags/ru.png
diff --git a/images/flags/sk.png b/images/flags/sk.png
diff --git a/images/flags/sl_SI.png b/images/flags/sl_SI.png
diff --git a/images/flags/sq_AL.png b/images/flags/sq_AL.png
diff --git a/images/flags/sr_CS-Latn.png b/images/flags/sr_CS-Latn.png
diff --git a/images/flags/sv.png b/images/flags/sv.png
diff --git a/images/flags/ta.png b/images/flags/ta.png
diff --git a/images/flags/th.png b/images/flags/th.png
diff --git a/images/flags/tr.png b/images/flags/tr.png
diff --git a/images/flags/uk.png b/images/flags/uk.png
diff --git a/images/flags/vi.png b/images/flags/vi.png
diff --git a/images/flags/xh.png b/images/flags/xh.png
diff --git a/images/flags/zh_CN.png b/images/flags/zh_CN.png
diff --git a/images/flags/zh_TW.png b/images/flags/zh_TW.png
diff --git a/images/images.qrc b/images/images.qrc
@@ -378,6 +378,52 @@
         <file>themes/default/mActionAddMssqlLayer.png</file>
         <file>themes/default/mActionTouch.png</file>
         <file>themes/classic/mActionTouch.png</file>
+        <file>flags/af.png</file>
+        <file>flags/ar.png</file>
+        <file>flags/bg.png</file>
+        <file>flags/ca_ES.png</file>
+        <file>flags/cs_CZ.png</file>
+        <file>flags/de.png</file>
+        <file>flags/el_GR.png</file>
+        <file>flags/es.png</file>
+        <file>flags/et.png</file>
+        <file>flags/fa.png</file>
+        <file>flags/fi.png</file>
+        <file>flags/fr.png</file>
+        <file>flags/gl_ES.png</file>
+        <file>flags/he.png</file>
+        <file>flags/hr_HR.png</file>
+        <file>flags/hu.png</file>
+        <file>flags/id.png</file>
+        <file>flags/is.png</file>
+        <file>flags/it.png</file>
+        <file>flags/ja.png</file>
+        <file>flags/ka_GE.png</file>
+        <file>flags/ko_KR.png</file>
+        <file>flags/lo.png</file>
+        <file>flags/lt.png</file>
+        <file>flags/lv.png</file>
+        <file>flags/mn.png</file>
+        <file>flags/nl.png</file>
+        <file>flags/no.png</file>
+        <file>flags/pl_PL.png</file>
+        <file>flags/pt_BR.png</file>
+        <file>flags/pt_PT.png</file>
+        <file>flags/ro.png</file>
+        <file>flags/ru.png</file>
+        <file>flags/sk.png</file>
+        <file>flags/sl_SI.png</file>
+        <file>flags/sq_AL.png</file>
+        <file>flags/sr_CS-Latn.png</file>
+        <file>flags/sv.png</file>
+        <file>flags/ta.png</file>
+        <file>flags/th.png</file>
+        <file>flags/tr.png</file>
+        <file>flags/uk.png</file>
+        <file>flags/vi.png</file>
+        <file>flags/xh.png</file>
+        <file>flags/zh_CN.png</file>
+        <file>flags/zh_TW.png</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -24,6 +24,9 @@ Email                : sherman at mrcc dot com
 #include <qgscoordinatereferencesystem.h>
 #include <qgis.h>
 
+#include <proj_api.h>
+#include <gdal.h>
+
 class TestQgsCoordinateReferenceSystem: public QObject
 {
     Q_OBJECT
@@ -296,6 +299,9 @@ void TestQgsCoordinateReferenceSystem::debugPrint(
   {
     QgsDebugMsg( "* Units : degrees" );
   }
+
+  QgsDebugMsg( QString( "** GDAL version: %1" ).arg( GDAL_RELEASE_NAME ) );
+  QgsDebugMsg( QString( "** PROJ.4 version: %1" ).arg( PJ_VERSION ) );
 }
 
 QTEST_MAIN( TestQgsCoordinateReferenceSystem )