revert some changes from r7926, which break building debian packages

git-svn-id: http://svn.osgeo.org/qgis/trunk@7942 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: jef

CMakeLists.txt

@@ -1,4 +1,4 @@
-PROJECT(qgis0.9.1-raster)
+PROJECT(qgis0.9.2)
 
 # TODO:
 # - install includes for libs

debian/changelog

@@ -1,11 +1,3 @@
-<<<<<<< .trabalho
-qgis (0.9.1raster+svn20071111) gutsy; urgency=low
-
-  * Initial test build for gutsy 
-
- -- Tim Sutton <tim@linfiniti.com>  Sun, 11 Nov 2007 13:20:54 -0200
-
-=======
 qgis (0.9.1) gutsy; urgency=low
 
   * This is a bug fix release
@@ -18,7 +10,6 @@ qgis (0.9.1) gutsy; urgency=low
 
  -- Tim Sutton <tim@linfiniti.com>  Fri, 07 Dec 2007 01:36:55 -0200
 
->>>>>>> .mesclagem-direita.r7786
 qgis (0.9.0) gutsy; urgency=low
 
   * Quantum GIS 0.9.0 'Ganymede' release 

debian/files

@@ -1,4 +1,4 @@
 
-#IF (PYTHON_FOUND)
-#  SUBDIRS (mapserver_export)
-#ENDIF (PYTHON_FOUND)
+IF (PYTHON_FOUND)
+  SUBDIRS (mapserver_export)
+ENDIF (PYTHON_FOUND)