update debian packaging

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9600 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 8, 2008 · 31404c8 · 31404c8
1 parent 7dbd1a9
commit 31404c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (1.0preview16) experimental; urgency=low
+
+  * new upstream preview release (preview II).
+  * introduce conflict with uim-qt3 (fixes GUI issues on Ubuntu intrepid)
+
+ -- Jürgen E. Fischer <jef@norbit.de>  Sat, 08 Nov 2008 12:10:21 +0100
+
 qgis (1.0preview7) experimental; urgency=low
 
   * remove quickprint plugin

diff --git a/debian/control b/debian/control
@@ -18,6 +18,7 @@ Package: qgis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: qgis-plugin-grass, python-qgis
+Conflicts: uim-qt3
 Description: Geographic Information System (GIS)
  A Geographic Information System (GIS) manages, analyzes, and displays
  databases of geographic information. Quantum GIS (QGIS) supports shapefile
@@ -31,7 +32,7 @@ Package: libqgis-core1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1)
-Conflicts: libqgis1
+Conflicts: libqgis1, uim-qt3
 Description: Quantum GIS - shared core library
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -43,7 +44,7 @@ Package: libqgis-gui1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<=0.9.2rc1)
-Conflicts: libqgis1
+Conflicts: libqgis1, uim-qt3
 Description: Quantum GIS - shared gui library
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/rules b/debian/rules
@@ -31,6 +31,8 @@ endif
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTS=TRUE
+	CFLAGS += -DQGISDEBUG=1
+	MAKEFLAGS += VERBOSE=YES
 endif
 
 debian/build/CMakeCache.txt: CMakeLists.txt