diff --git a/debian/control b/debian/control index 222588880ce..4c73f8205ce 100644 --- a/debian/control +++ b/debian/control @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS Package: qgis-plugin-grass-common Architecture: all -Depends: qgis-plugin-grass (>= ${source:Version}) +Depends: qgis-plugin-grass (>= ${source:Version}), python Description: GRASS plugin for Quantum GIS - architecture-independent data Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/libqgis1.2.0.install b/debian/libqgis1.2.0.install index be2e0d822ae..e44eb5af2b5 100644 --- a/debian/libqgis1.2.0.install +++ b/debian/libqgis1.2.0.install @@ -1,2 +1,2 @@ -usr/lib/libqgis_core.so.* -usr/lib/libqgis_gui.so.* +usr/lib/libqgis_core.so.*.*.* +usr/lib/libqgis_gui.so.*.*.* diff --git a/debian/libqgis1.lintian-overrides b/debian/libqgis1.lintian-overrides index 8f4b3462cfb..e7a4866537d 100644 --- a/debian/libqgis1.lintian-overrides +++ b/debian/libqgis1.lintian-overrides @@ -1,4 +1,3 @@ libqgis1: shlib-calls-exit -libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.1 -libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.1 -libqgis1: package-name-doesnt-match-sonames libqgis-core1.1 libqgis-gui1.1 +libqgis1: no-symbols-control-file usr/lib/libqgis_gui.so.1.2.0 +libqgis1: no-symbols-control-file usr/lib/libqgis_core.so.1.2.0 diff --git a/debian/python-qgis.lintian-overrides b/debian/python-qgis.lintian-overrides index a2030b2f3d6..e74d2dd04cd 100644 --- a/debian/python-qgis.lintian-overrides +++ b/debian/python-qgis.lintian-overrides @@ -1,3 +1,2 @@ python-qgis: package-name-doesnt-match-sonames python-qgis: non-dev-pkg-with-shlib-symlink -python-qgis: no-symbols-control-file usr/lib/libqgispython.so.1.1 diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install index baa951c7114..f708a825513 100644 --- a/debian/qgis-plugin-grass.install +++ b/debian/qgis-plugin-grass.install @@ -1,3 +1,3 @@ usr/lib/qgis/libgrassplugin.so usr/lib/qgis/libgrassprovider.so -usr/lib/libqgisgrass.so.* +usr/lib/libqgisgrass.so.*.*.* diff --git a/debian/qgis-plugin-grass.lintian-overrides b/debian/qgis-plugin-grass.lintian-overrides index 4bb94d0455c..d4e73d684f0 100644 --- a/debian/qgis-plugin-grass.lintian-overrides +++ b/debian/qgis-plugin-grass.lintian-overrides @@ -1,3 +1,2 @@ qgis-plugin-grass: binary-without-manpage qgis-plugin-grass: package-name-doesnt-match-sonames -qgis-plugin-grass: no-symbols-control-file usr/lib/libqgisgrass.so.1.1 diff --git a/debian/rules b/debian/rules index 732eacea187..3954848a954 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,8 @@ CMAKE_OPTS = \ -D WITH_SPATIALITE=TRUE \ -D WITH_INTERNAL_SPATIALITE=TRUE +LDFLAGS += -Wl,--as-needed -Wl,--no-undefined + ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else