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

Author: timlinux

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
 

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 $@

images/flags/af.png

@@ -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>

images/flags/ar.png

@@ -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 )