update debian packaging

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10471 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 5, 2009 · a595721 · a595721
1 parent cfa8159
commit a595721
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 10 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -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@norbit.de>  Sun, 05 Apr 2009 12:34:38 +0200
+
 qgis (1.1.0-1) UNRELEASED; urgency=low
 
   * allow build with GRASS 6.4rc3

diff --git a/debian/control b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
  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,28 +39,28 @@ Description: Quantum GIS - architecture-independent data
  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.
  .
  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.

diff --git a/debian/libqgis1-dev.README.Debian → debian/libqgis1.1.0-dev.README.Debian b/debian/libqgis1-dev.README.Debian → debian/libqgis1.1.0-dev.README.Debian
diff --git a/debian/libqgis1-dev.install → debian/libqgis1.1.0-dev.install b/debian/libqgis1-dev.install → debian/libqgis1.1.0-dev.install
diff --git a/debian/libqgis1.install → debian/libqgis1.1.0.install b/debian/libqgis1.install → debian/libqgis1.1.0.install
diff --git a/debian/qgis.install b/debian/qgis.install
@@ -19,6 +19,7 @@ usr/lib/qgis/libdxf2shpconverterplugin.so
 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

diff --git a/debian/rules b/debian/rules
@@ -17,7 +17,9 @@ CMAKE_OPTS = \
 	-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

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -193,7 +193,7 @@ ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC
 
 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)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -74,7 +74,7 @@ ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS})
 
 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)

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
@@ -23,7 +23,7 @@ ADD_LIBRARY (qgispython SHARED ${QGISPYTHON_SRCS})
 
 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