The following commit has been merged in the master branch: commit 06cbe993e58a014ba59d9d4c8b01affde355147a Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Sep 27 08:18:58 2013 +0200
Use pkgkde-gensymbols & pkgkde-symbolshelper to handle C++ symbols. diff --git a/debian/changelog b/debian/changelog index a1b8166..a14b389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ qgis (2.0.1-1) UNRELEASED; urgency=low * Use canonical URLs for Vcs-* fields. * Don't run tests during build, requires network. * Install SVG icon for QGIS desktop files. (closes: #676562) + * Use pkgkde-gensymbols & pkgkde-symbolshelper to handle C++ symbols. -- Bas Couwenberg <sebas...@xs4all.nl> Fri, 27 Sep 2013 02:05:32 +0200 diff --git a/debian/control b/debian/control index 27eb82a..2d496fd 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,8 @@ Build-Depends: bison, xfonts-base, xfonts-100dpi, xfonts-75dpi, - xfonts-scalable + xfonts-scalable, + pkg-kde-tools Build-Conflicts: libqgis-dev, qgis-dev Standards-Version: 3.9.3 diff --git a/debian/rules b/debian/rules index 12e7c24..e15259e 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,8 @@ DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_TEST_TARGET ?= Experimental +QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p') + ifeq (,$(DISPLAY)) TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE) else @@ -80,7 +82,7 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS))) endif %: - dh $@ --with python2 + dh $@ --with python2,pkgkde_symbolshelper override_dh_clean: dh_clean @@ -154,6 +156,9 @@ override_dh_python2: override_dh_compress: dh_compress --exclude=pdf +override_dh_makeshlibs: + dh_makeshlibs -- -c0 -v$(QGIS_VERSION) + override_dh_shlibdeps: dh_shlibdeps -l/usr/lib/$(GRASS)/lib -- The Quantum GIS in Debian project _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel