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

qgis · Sep 29, 2011 · 95a7117 · 95a7117
2 parents 7f3e956 + 3cac713
commit 95a7117
Show file tree

Hide file tree

Showing 27 changed files with 8,153 additions and 1,702 deletions.
diff --git a/CHANGELOG b/CHANGELOG
diff --git a/ChangeLog b/ChangeLog
diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -1,7 +1,7 @@
 usr/share/qgis/doc/CODING
 usr/share/qgis/doc/favicon.ico 
 usr/share/qgis/doc/index.html
-usr/share/qgis/doc/qgisdoc.css
+usr/share/qgis/doc/style.css
 usr/share/qgis/doc/AUTHORS
 usr/share/qgis/doc/SPONSORS
 usr/share/qgis/doc/CONTRIBUTORS

diff --git a/debian/rules b/debian/rules
@@ -147,7 +147,7 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs CHANGELOG
 	dh_installdocs
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -8,9 +8,9 @@ INCLUDE(Txt2Tags)
 FIND_TXT2TAGS()
 
 IF(TXT2TAGS_EXECUTABLE)
-  ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
+  ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t CODING.t2t changelog.t2t)
   IF(WITH_TXT2TAGS_PDF)
-    ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t CODING.t2t)
+    ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t CODING.t2t changelog.t2t)
   ENDIF(WITH_TXT2TAGS_PDF)
   ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES})
 ELSE(TXT2TAGS_EXECUTABLE)
@@ -20,7 +20,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
-SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html favicon.ico qgisdoc.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
+SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html changelog.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS)
 
 INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

diff --git a/doc/SPONSORS b/doc/SPONSORS
@@ -15,6 +15,9 @@
 Please consider sponsoring the development of QuantumGIS.
 See: http://qgis.org/en/sponsorship.html
 
+SILVER
+Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/
+
 BRONZE
 Studio Associato Gfosservices|http://www.gfosservices.com
 NEXTGIS|http://nextgis.org