[QGIS Commit] r10471 - in trunk/qgis: debian src/core src/gui src/python

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sun Apr 5 06:39:52 EDT 2009 

Author: jef
Date: 2009-04-05 06:39:51 -0400 (Sun, 05 Apr 2009)
New Revision: 10471

Added:
   trunk/qgis/debian/libqgis1.1.0-dev.README.Debian
   trunk/qgis/debian/libqgis1.1.0-dev.install
   trunk/qgis/debian/libqgis1.1.0.install
Removed:
   trunk/qgis/debian/libqgis1-dev.README.Debian
   trunk/qgis/debian/libqgis1-dev.install
   trunk/qgis/debian/libqgis1.install
Modified:
   trunk/qgis/debian/changelog
   trunk/qgis/debian/control
   trunk/qgis/debian/qgis.install
   trunk/qgis/debian/rules
   trunk/qgis/src/core/CMakeLists.txt
   trunk/qgis/src/gui/CMakeLists.txt
   trunk/qgis/src/python/CMakeLists.txt
Log:
update debian packaging

Modified: trunk/qgis/debian/changelog
===================================================================
--- trunk/qgis/debian/changelog	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/changelog	2009-04-05 10:39:51 UTC (rev 10471)
@@ -1,3 +1,9 @@
+qgis (1.1.0-2) UNRELEASED; urgency=low
+
+  * change package names to reflect ABI (changes SONAME)
+
+ -- Jürgen E. Fischer <jef at norbit.de>  Sun, 05 Apr 2009 12:34:38 +0200
+
 qgis (1.1.0-1) UNRELEASED; urgency=low
 
   * allow build with GRASS 6.4rc3

Modified: trunk/qgis/debian/control
===================================================================
--- trunk/qgis/debian/control	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/control	2009-04-05 10:39:51 UTC (rev 10471)
@@ -9,7 +9,7 @@
  libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
  libsm-dev
-Build-Conflicts: libqgis1-dev
+Build-Conflicts: libqgis1.1.0-dev
 Standards-Version: 3.8.0
 XS-Python-Version: current
 Homepage: http://qgis.org/
@@ -39,10 +39,10 @@
  This package contains architecture-independent supporting data files for use 
  with Quantum GIS.
 
-Package: libqgis1
+Package: libqgis1.1.0
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0
+Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1
 Description: Quantum GIS - shared libraries
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -50,17 +50,17 @@
  This package contains the shared core and gui library that provide an
  interface for plugins and stand-alone applications.
 
-Package: libqgis1-dev
+Package: libqgis1.1.0-dev
 Architecture: any
 Section: libdevel
-Depends: libqgis1 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
+Depends: libqgis1.1.0 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
  libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1), grass-dev,
  libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),
  libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),
  libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
  qt4-designer (>=4.2.0)
 Provides: libqgis-dev, qgis-dev
-Replaces: libqgis-dev, qgis-dev
+Replaces: libqgis-dev, qgis-dev, libqgis1-dev
 Description: Quantum GIS - development files
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

Deleted: trunk/qgis/debian/libqgis1-dev.README.Debian
===================================================================
--- trunk/qgis/debian/libqgis1-dev.README.Debian	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/libqgis1-dev.README.Debian	2009-04-05 10:39:51 UTC (rev 10471)
@@ -1,8 +0,0 @@
-QGIS for Debian
----------------
- 
-Before building a QGIS plugin you'll need to tell it where to look for Qt:
-
-  export QTDIR=/usr/share/qt3
- 
- -- Steve Halasz <debian at adkgis.org>  Thu, 14 Apr 2005 11:03:20 -0400

Deleted: trunk/qgis/debian/libqgis1-dev.install
===================================================================
--- trunk/qgis/debian/libqgis1-dev.install	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/libqgis1-dev.install	2009-04-05 10:39:51 UTC (rev 10471)
@@ -1,3 +0,0 @@
-usr/include/qgis/*
-usr/lib/libqgis_gui.so
-usr/lib/libqgis_core.so

Copied: trunk/qgis/debian/libqgis1.1.0-dev.README.Debian (from rev 10431, trunk/qgis/debian/libqgis1-dev.README.Debian)
===================================================================
--- trunk/qgis/debian/libqgis1.1.0-dev.README.Debian	                        (rev 0)
+++ trunk/qgis/debian/libqgis1.1.0-dev.README.Debian	2009-04-05 10:39:51 UTC (rev 10471)
@@ -0,0 +1,8 @@
+QGIS for Debian
+---------------
+ 
+Before building a QGIS plugin you'll need to tell it where to look for Qt:
+
+  export QTDIR=/usr/share/qt3
+ 
+ -- Steve Halasz <debian at adkgis.org>  Thu, 14 Apr 2005 11:03:20 -0400

Copied: trunk/qgis/debian/libqgis1.1.0-dev.install (from rev 10431, trunk/qgis/debian/libqgis1-dev.install)
===================================================================
--- trunk/qgis/debian/libqgis1.1.0-dev.install	                        (rev 0)
+++ trunk/qgis/debian/libqgis1.1.0-dev.install	2009-04-05 10:39:51 UTC (rev 10471)
@@ -0,0 +1,3 @@
+usr/include/qgis/*
+usr/lib/libqgis_gui.so
+usr/lib/libqgis_core.so

Copied: trunk/qgis/debian/libqgis1.1.0.install (from rev 10431, trunk/qgis/debian/libqgis1.install)
===================================================================
--- trunk/qgis/debian/libqgis1.1.0.install	                        (rev 0)
+++ trunk/qgis/debian/libqgis1.1.0.install	2009-04-05 10:39:51 UTC (rev 10471)
@@ -0,0 +1,2 @@
+usr/lib/libqgis_core.so.*
+usr/lib/libqgis_gui.so.*

Deleted: trunk/qgis/debian/libqgis1.install
===================================================================
--- trunk/qgis/debian/libqgis1.install	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/libqgis1.install	2009-04-05 10:39:51 UTC (rev 10471)
@@ -1,2 +0,0 @@
-usr/lib/libqgis_core.so.*
-usr/lib/libqgis_gui.so.*

Modified: trunk/qgis/debian/qgis.install
===================================================================
--- trunk/qgis/debian/qgis.install	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/qgis.install	2009-04-05 10:39:51 UTC (rev 10471)
@@ -19,6 +19,7 @@
 usr/lib/qgis/libinterpolationplugin.so 
 usr/lib/qgis/libogrconverterplugin.so
 usr/lib/qgis/libcoordinatecaptureplugin.so
+usr/lib/qgis/libspatialiteprovider.so
 usr/share/pixmaps/qgis-icon.xpm
 usr/share/pixmaps/qgis-mime-icon.png
 usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/debian/rules	2009-04-05 10:39:51 UTC (rev 10471)
@@ -17,7 +17,9 @@
 	-D CMAKE_INSTALL_PREFIX=/usr \
 	-D CMAKE_SKIP_RPATH=TRUE \
 	-D BINDINGS_GLOBAL_INSTALL=TRUE \
-	-D PEDANTIC=TRUE
+	-D PEDANTIC=TRUE \
+	-D WITH_SPATIALITE=TRUE \
+	-D WITH_INTERNAL_SPATIALITE=TRUE
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0

Modified: trunk/qgis/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/src/core/CMakeLists.txt	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/src/core/CMakeLists.txt	2009-04-05 10:39:51 UTC (rev 10471)
@@ -193,7 +193,7 @@
 
 SET_TARGET_PROPERTIES(qgis_core PROPERTIES
 			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
-			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
+			SOVERSION ${COMPLETE_VERSION})
 
 # make sure to create qgssvnversion.h before compiling
 ADD_DEPENDENCIES(qgis_core svnversion)

Modified: trunk/qgis/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/gui/CMakeLists.txt	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/src/gui/CMakeLists.txt	2009-04-05 10:39:51 UTC (rev 10471)
@@ -74,7 +74,7 @@
 
 SET_TARGET_PROPERTIES(qgis_gui PROPERTIES 
 			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
-			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
+			SOVERSION ${COMPLETE_VERSION})
 
 # make sure that UI files will be processed first
 ADD_DEPENDENCIES(qgis_gui ui)

Modified: trunk/qgis/src/python/CMakeLists.txt
===================================================================
--- trunk/qgis/src/python/CMakeLists.txt	2009-04-05 10:33:34 UTC (rev 10470)
+++ trunk/qgis/src/python/CMakeLists.txt	2009-04-05 10:39:51 UTC (rev 10471)
@@ -23,7 +23,7 @@
 
 SET_TARGET_PROPERTIES(qgispython PROPERTIES 
 			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
-			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
+			SOVERSION ${COMPLETE_VERSION})
 
 
 TARGET_LINK_LIBRARIES(qgispython

More information about the QGIS-commit mailing list