From c72e8815955892fd1ee2be3a1c7edab701525aaa Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Wed, 16 Jul 2014 09:12:30 +0200 Subject: [PATCH] debian packaging update --- debian/changelog | 3 ++- debian/libqgis-core{QGIS_ABI}.lintian-overrides | 2 -- debian/libqgisgrass{QGIS_ABI}.lintian-overrides | 1 - debian/qgis-api-doc.links | 1 + debian/qgis-common.install | 1 - debian/qgis-plugin-globe-common.lintian-override | 1 - debian/qgis-providers-common.lintian-overrides | 2 -- debian/rules | 6 ++++-- 8 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 debian/libqgis-core{QGIS_ABI}.lintian-overrides delete mode 100644 debian/libqgisgrass{QGIS_ABI}.lintian-overrides create mode 100644 debian/qgis-api-doc.links delete mode 100644 debian/qgis-plugin-globe-common.lintian-override delete mode 100644 debian/qgis-providers-common.lintian-overrides diff --git a/debian/changelog b/debian/changelog index f6db4724cb3..c7aa3a028a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ qgis (2.5.0) UNRELEASED; urgency=medium * add libqscintilla2-dev as build dependency * add remove sqlanywhere plugin and provider * drop support for ubuntu quantal and raring and add utopic + * merge downstream debian changes - -- Jürgen E. Fischer Tue, 15 Jul 2014 09:09:52 +0200 + -- Jürgen E. Fischer Wed, 16 Jul 2014 09:09:57 +0200 qgis (2.4.0) unstable; urgency=medium diff --git a/debian/libqgis-core{QGIS_ABI}.lintian-overrides b/debian/libqgis-core{QGIS_ABI}.lintian-overrides deleted file mode 100644 index 1adba617fbe..00000000000 --- a/debian/libqgis-core{QGIS_ABI}.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libqgis-core{QGIS_ABI}: no-symbols-control-file -libqgis-core{QGIS_ABI}: shlib-calls-exit diff --git a/debian/libqgisgrass{QGIS_ABI}.lintian-overrides b/debian/libqgisgrass{QGIS_ABI}.lintian-overrides deleted file mode 100644 index 3f37c8ca1f7..00000000000 --- a/debian/libqgisgrass{QGIS_ABI}.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libqgisgrass{QGIS_ABI}: no-symbols-control-file diff --git a/debian/qgis-api-doc.links b/debian/qgis-api-doc.links new file mode 100644 index 00000000000..42d4aa1cec7 --- /dev/null +++ b/debian/qgis-api-doc.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/api/html/jquery.js diff --git a/debian/qgis-common.install b/debian/qgis-common.install index d59025e757d..a36c3e3a26a 100644 --- a/debian/qgis-common.install +++ b/debian/qgis-common.install @@ -5,7 +5,6 @@ usr/share/qgis/doc/CONTRIBUTORS usr/share/qgis/doc/DONORS usr/share/qgis/doc/INSTALL usr/share/qgis/doc/INSTALL.html -usr/share/qgis/doc/LICENSE usr/share/qgis/doc/SPONSORS usr/share/qgis/doc/TRANSLATORS usr/share/qgis/doc/favicon.ico diff --git a/debian/qgis-plugin-globe-common.lintian-override b/debian/qgis-plugin-globe-common.lintian-override deleted file mode 100644 index 6147c5316b9..00000000000 --- a/debian/qgis-plugin-globe-common.lintian-override +++ /dev/null @@ -1 +0,0 @@ -qgis-plugin-globe-common: package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif diff --git a/debian/qgis-providers-common.lintian-overrides b/debian/qgis-providers-common.lintian-overrides deleted file mode 100644 index 071c91098ac..00000000000 --- a/debian/qgis-providers-common.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -qgis-providers-common: privacy-breach-generic -qgis-providers-common: extra-license-file diff --git a/debian/rules b/debian/rules index 0ee0675322e..d9e1d56819c 100755 --- a/debian/rules +++ b/debian/rules @@ -226,13 +226,15 @@ override_dh_install: # remove unwanted files $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox - $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js # Don't include a copy of the world.tif also included in osgearth-data $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif # remove extra license files -find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENSE + $(RM) $(CURDIR)/debian/tmp/usr/share/qgis/python/plugins/db_manager/LICENSE # Man pages are installed by dh_installman $(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1 @@ -257,7 +259,7 @@ override_dh_compress: dh_compress --exclude=pdf override_dh_makeshlibs: - dh_makeshlibs -Xqgis-plugin-grass -- -c0 -v$(QGIS_VERSION) + dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets$(QGIS_ABI) -- -c0 -v$(QGIS_VERSION) override_dh_shlibdeps: dh_shlibdeps -l/usr/lib/$(GRASS)/lib