Skip to content

Commit d362be5

Browse files
jef-njef-n
committedDec 6, 2015
debian packaging update
* sync other branches * avoid testing and installing twice * manually merge PR#2524
·
final-2_12_3final-2_12_2
1 parent 5f86422 commit d362be5

File tree

2 files changed

+29
-17
lines changed

2 files changed

+29
-17
lines changed
 

‎debian/control.in

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Build-Depends:
77
bison,
88
cmake (>= 2.8),
99
#sid stretch jessie wheezy saucy trusty utopic vivid wily# debhelper (>= 9),
10+
#sid stretch jessie trusty vivid wily# dh-python,
1011
#precise# debhelper (>= 7),
1112
flex,
1213
grass-dev,
@@ -16,8 +17,9 @@ Build-Depends:
1617
#precise# libgdal-dev (>= 1.9.0) | libgdal1-dev (<< 1.9.0),
1718
#saucy# libgdal-dev (>= 1.9.0),
1819
#wheezy# libgdal1-dev,
20+
python-gdal,
1921
libgeos-dev (>= 3.0.0),
20-
libgsl0-dev,
22+
libgsl-dev | libgsl0-dev,
2123
libpq-dev,
2224
libproj-dev,
2325
libqt4-dev (>= 4.7.0),
@@ -26,7 +28,7 @@ Build-Depends:
2628
libqca2-plugin-ossl,
2729
libqtwebkit-dev,
2830
#stretch jessie wheezy# libqwt-dev,
29-
#precise saucy trusty utopic vivid wily stretch sid# libqwt5-qt4-dev,
31+
#precise saucy trusty utopic vivid wily sid# libqwt5-qt4-dev,
3032
libspatialite-dev,
3133
libsqlite3-dev,
3234
libspatialindex-dev,
@@ -41,9 +43,8 @@ Build-Depends:
4143
#saucy wheezy# python-dev,
4244
#saucy# libpython2.7-dev,
4345
#sid stretch jessie trusty utopic vivid wily# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
44-
#sid stretch jessie# pyqt4.qsci-dev,
46+
#sid stretch jessie wily# pyqt4.qsci-dev,
4547
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
46-
#sid stretch# dh-python,
4748
python-sip (>= 4.5.0),
4849
python-sip-dev (>= 4.5.0),
4950
libosgearth-dev,
@@ -241,7 +242,7 @@ Depends:
241242
#saucy# libgdal-dev (>= 1.9.0),
242243
#wheezy# libgdal1-dev,
243244
libgeos-dev (>= 3.0.0),
244-
libgsl0-dev,
245+
libgsl-dev | libgsl0-dev,
245246
libpq-dev,
246247
libproj-dev,
247248
libqgis-app{QGIS_ABI} (= ${binary:Version}),

‎debian/rules

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
1616
QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
1717

1818
DEB_TEST_TARGET ?= Experimental
19-
BUILDDIR ?= debian/build
19+
QGIS_BUILDDIR ?= debian/build
2020

21-
QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
21+
QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \([0-9]\+:\)\?\([^+-]\+\).*$$/\2/p')
2222

2323
ifeq (,$(DISTRIBUTION))
2424
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
@@ -148,6 +148,7 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
148148
LDFLAGS += -pg
149149
endif
150150

151+
151152
# multi distribution support:
152153
# - remove lines with applicable excludes
153154
# - remove prefixes with applicable includes
@@ -189,8 +190,13 @@ cleantemplates:
189190
$(MAKE) -f debian/rules templateclean
190191
$(MAKE) -f debian/rules debian/control debian/compat
191192

192-
binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
193-
dh $@ --with python2 --parallel --builddirectory=$(BUILDDIR)
193+
build: ;
194+
195+
binary binary-arch binary-indep build-arch build-indep clean install install-arch install-indep:
196+
dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR)
197+
198+
override_dh_auto_build-arch:
199+
dh_auto_build
194200

195201
override_dh_clean: cleantemplates
196202
dh_clean
@@ -199,27 +205,32 @@ override_dh_clean: cleantemplates
199205
-$(RM) $(CURDIR)/src/core/qgscontexthelp_texts.cpp
200206
-$(RM) $(CURDIR)/src/core/qgsexpression_texts.cpp
201207

202-
-$(RM) -r $(CURDIR)/$(BUILDDIR)/
208+
-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/
203209

204-
override_dh_auto_configure: templates
210+
override_dh_auto_configure-arch: templates
205211
dh_auto_configure -- $(CMAKE_OPTS)
206212

213+
override_dh_auto_test-arch:
207214
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
208-
override_dh_auto_test:
209215
# Code to run the package test suite - and ignore the outcome for now
210216
mkdir -p debian/tmp/locale/
211217
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
212218
-LOCPATH=$(CURDIR)/debian/tmp/locale/ \
213219
LC_ALL=en_US.UTF-8 \
214-
LD_LIBRARY_PATH=$(CURDIR)/$(BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
220+
LD_LIBRARY_PATH=$(CURDIR)/$(QGIS_BUILDDIR)/output/lib:$(LD_LIBRARY_PATH) \
215221
PATH=/usr/sbin:$(PATH) \
216-
$(TESTMAKE) -C $(BUILDDIR) $(DEB_TEST_TARGET)
222+
$(TESTMAKE) -C $(QGIS_BUILDDIR) $(DEB_TEST_TARGET)
217223
else
218-
override_dh_auto_test:
219224
@echo Skipping tests.
220225
endif
221226

222-
override_dh_auto_install:
227+
override_dh_auto_configure-indep: ;
228+
override_dh_auto_test-indep: ;
229+
override_dh_auto_install-indep: ;
230+
override_dh_auto_build-indep: ;
231+
override_dh_install-indep: ;
232+
233+
override_dh_auto_install-arch:
223234
dh_auto_install
224235

225236
# Install menu pixmap
@@ -273,7 +284,7 @@ override_dh_auto_install:
273284
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
274285
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
275286

276-
override_dh_install:
287+
override_dh_install-arch:
277288
# Don't ship srs.db, automatically updated in postinst with crssync
278289
mv $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs.db $(CURDIR)/debian/tmp/usr/share/qgis/resources/srs-template.db
279290

0 commit comments

Comments
 (0)
Please sign in to comment.