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

qgis · May 24, 2011 · a421ec2
2 parents a075104 + b610620
commit a421ec2
Show file tree

Hide file tree

Showing 297 changed files with 13,551 additions and 5,628 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,7 @@ ms-windows/untgz/
 scripts/astyle.exe
 # vim temporary files
 .*.swp
+*.aux
+*.out
+*.tex
+*.toc
diff --git a/cmake/Txt2Tags.cmake b/cmake/Txt2Tags.cmake
@@ -46,6 +46,14 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
       COMMENT "Building ${_out}.html from ${_in}"
       )
 
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${_out}.tex
+      COMMAND ${TXT2TAGS_EXECUTABLE}
+      ARGS -o${_out}.tex -t tex ${_in}
+      DEPENDS ${_in}
+      COMMENT "Building ${_out}.tex from ${_in}"
+      )
+
     SET(${_sources} ${${_sources}} ${_out} ${_out}.html)
   ENDFOREACH (_current_FILE)
 ENDMACRO(ADD_TXT2TAGS_FILES)
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.