[QGIS Commit] r10502 - in branches/Version-1_0: debian src/core
src/gui src/providers/grass src/python
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Apr 7 15:36:41 EDT 2009
Author: jef
Date: 2009-04-07 15:36:40 -0400 (Tue, 07 Apr 2009)
New Revision: 10502
Added:
branches/Version-1_0/debian/libqgis1.0.2-dev.install
branches/Version-1_0/debian/libqgis1.0.2.install
Removed:
branches/Version-1_0/debian/libqgis1-dev.install
branches/Version-1_0/debian/libqgis1.install
Modified:
branches/Version-1_0/debian/changelog
branches/Version-1_0/debian/control
branches/Version-1_0/debian/rules
branches/Version-1_0/src/core/CMakeLists.txt
branches/Version-1_0/src/gui/CMakeLists.txt
branches/Version-1_0/src/providers/grass/CMakeLists.txt
branches/Version-1_0/src/python/CMakeLists.txt
Log:
update debian packaging
Modified: branches/Version-1_0/debian/changelog
===================================================================
--- branches/Version-1_0/debian/changelog 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/debian/changelog 2009-04-07 19:36:40 UTC (rev 10502)
@@ -1,3 +1,9 @@
+qgis (1.0.2-1) experimental; urgency=low
+
+ * change package names to reflect ABI (changes SONAME)
+
+ -- Jürgen E. Fischer <jef at norbit.de> Tue, 07 Apr 2009 21:28:19 +0200
+
qgis (1.0.1-3) experimental; urgency=low
* add missing dependency for python-qgis to python-qgis-common
Modified: branches/Version-1_0/debian/control
===================================================================
--- branches/Version-1_0/debian/control 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/debian/control 2009-04-07 19:36:40 UTC (rev 10502)
@@ -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.0.2-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.0.2
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.0.2-dev
Architecture: any
Section: libdevel
-Depends: libqgis1 (= ${binary:Version}), libgdal1-dev | libgdal1-1.3.2-dev,
+Depends: libqgis1.0.2 (= ${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: branches/Version-1_0/debian/libqgis1-dev.install
===================================================================
--- branches/Version-1_0/debian/libqgis1-dev.install 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/debian/libqgis1-dev.install 2009-04-07 19:36:40 UTC (rev 10502)
@@ -1,3 +0,0 @@
-usr/include/qgis/*
-usr/lib/libqgis_gui.so
-usr/lib/libqgis_core.so
Copied: branches/Version-1_0/debian/libqgis1.0.2-dev.install (from rev 10414, branches/Version-1_0/debian/libqgis1-dev.install)
===================================================================
--- branches/Version-1_0/debian/libqgis1.0.2-dev.install (rev 0)
+++ branches/Version-1_0/debian/libqgis1.0.2-dev.install 2009-04-07 19:36:40 UTC (rev 10502)
@@ -0,0 +1,3 @@
+usr/include/qgis/*
+usr/lib/libqgis_gui.so
+usr/lib/libqgis_core.so
Copied: branches/Version-1_0/debian/libqgis1.0.2.install (from rev 10414, branches/Version-1_0/debian/libqgis1.install)
===================================================================
--- branches/Version-1_0/debian/libqgis1.0.2.install (rev 0)
+++ branches/Version-1_0/debian/libqgis1.0.2.install 2009-04-07 19:36:40 UTC (rev 10502)
@@ -0,0 +1,2 @@
+usr/lib/libqgis_core.so.*
+usr/lib/libqgis_gui.so.*
Deleted: branches/Version-1_0/debian/libqgis1.install
===================================================================
--- branches/Version-1_0/debian/libqgis1.install 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/debian/libqgis1.install 2009-04-07 19:36:40 UTC (rev 10502)
@@ -1,2 +0,0 @@
-usr/lib/libqgis_core.so.*
-usr/lib/libqgis_gui.so.*
Modified: branches/Version-1_0/debian/rules
===================================================================
--- branches/Version-1_0/debian/rules 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/debian/rules 2009-04-07 19:36:40 UTC (rev 10502)
@@ -16,6 +16,7 @@
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_SKIP_RPATH=TRUE \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
+ -D GRASS_PREFIX=/usr/lib/grass64 \
-D PEDANTIC=TRUE
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -110,7 +111,7 @@
dh_fixperms
dh_makeshlibs
dh_installdeb
- LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib dh_shlibdeps
+ LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass64/lib dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: branches/Version-1_0/src/core/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/core/CMakeLists.txt 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/src/core/CMakeLists.txt 2009-04-07 19:36:40 UTC (rev 10502)
@@ -191,7 +191,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: branches/Version-1_0/src/gui/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/gui/CMakeLists.txt 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/src/gui/CMakeLists.txt 2009-04-07 19:36:40 UTC (rev 10502)
@@ -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: branches/Version-1_0/src/providers/grass/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/providers/grass/CMakeLists.txt 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/src/providers/grass/CMakeLists.txt 2009-04-07 19:36:40 UTC (rev 10502)
@@ -34,7 +34,7 @@
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
- SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
+ SOVERSION ${COMPLETE_VERSION})
IF (WIN32)
SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
Modified: branches/Version-1_0/src/python/CMakeLists.txt
===================================================================
--- branches/Version-1_0/src/python/CMakeLists.txt 2009-04-07 19:35:04 UTC (rev 10501)
+++ branches/Version-1_0/src/python/CMakeLists.txt 2009-04-07 19:36:40 UTC (rev 10502)
@@ -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