Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jef committed Jan 12, 2008
1 parent fc3e4a5 commit df926fa
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 17 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
@@ -1,4 +1,4 @@
PROJECT(qgis0.9.1-raster)
PROJECT(qgis0.9.2)

# TODO:
# - install includes for libs
Expand Down
9 changes: 0 additions & 9 deletions 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
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions debian/files

This file was deleted.

6 changes: 3 additions & 3 deletions tools/CMakeLists.txt
@@ -1,4 +1,4 @@

#IF (PYTHON_FOUND)
# SUBDIRS (mapserver_export)
#ENDIF (PYTHON_FOUND)
IF (PYTHON_FOUND)
SUBDIRS (mapserver_export)
ENDIF (PYTHON_FOUND)

0 comments on commit df926fa

Please sign in to comment.