Skip to content

Commit 8b054e6

Browse files
jef-njef-n
committedFeb 4, 2016
debian packaging update:
* replace grass diversion with generic wrapper also supporting oracle * update liblwgeom dependency for stretch and unstable
·
ltr-3_40archive/master_2
1 parent ddabad2 commit 8b054e6

File tree

5 files changed

+40
-59
lines changed

5 files changed

+40
-59
lines changed
 

‎debian/control.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ Depends:
380380
python-six,
381381
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
382382
#jessie# liblwgeom-2.1.4,
383-
#stretch sid# liblwgeom-2.2-2,
383+
#stretch sid# liblwgeom-2.2-5,
384384
libqgispython{QGIS_ABI},
385385
${shlibs:Depends},
386386
${python:Depends},

‎debian/qgis-plugin-grass.postrm

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎debian/qgis-plugin-grass.preinst

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎debian/qgis.sh.in

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
#!/bin/sh
22

3-
if [ "$LD_LIBRARY_PATH" = "" ]; then
4-
LD_LIBRARY_PATH=/usr/lib/{GRASS}/lib
5-
else
6-
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/{GRASS}/lib
3+
if dpkg -s qgis-plugin-grass >/dev/null; then
4+
if [ "$LD_LIBRARY_PATH" = "" ]; then
5+
LD_LIBRARY_PATH=/usr/lib/{GRASS}/lib
6+
else
7+
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/{GRASS}/lib
8+
fi
9+
fi
10+
11+
if dpkg -s qgis-oracle-provider >/dev/null; then
12+
if [ "$LD_LIBRARY_PATH" = "" ]; then
13+
LD_LIBRARY_PATH={ORACLE_LIBDIR}
14+
else
15+
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{ORACLE_LIBDIR}
16+
fi
717
fi
818

919
export LD_LIBRARY_PATH

‎debian/rules

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,17 +109,18 @@ endif
109109

110110
ifneq (,$(WITH_ORACLE))
111111
ifeq ($(DEB_BUILD_ARCH),amd64)
112-
CMAKE_OPTS += \
113-
-DWITH_ORACLE=TRUE \
114-
-DORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client64/ \
115-
-DORACLE_LIBDIR=/usr/lib/oracle/12.1/client64/lib/
112+
ORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client64/
113+
ORACLE_LIBDIR=/usr/lib/oracle/12.1/client64/lib/
116114
endif
117115
ifeq ($(DEB_BUILD_ARCH),i386)
116+
ORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client/
117+
ORACLE_LIBDIR=/usr/lib/oracle/12.1/client/lib/
118+
endif
119+
118120
CMAKE_OPTS += \
119121
-DWITH_ORACLE=TRUE \
120-
-DORACLE_INCLUDEDIR=/usr/include/oracle/12.1/client/ \
121-
-DORACLE_LIBDIR=/usr/lib/oracle/12.1/client/lib/
122-
endif
122+
-DORACLE_LIBDIR=$(ORACLE_LIBDIR) \
123+
-DORACLE_INCLUDEDIR=$(ORACLE_INCLUDEDIR)
123124
endif
124125

125126
ifneq (,$(findstring $(DISTRIBUTION),"sid stretch jessie"))
@@ -277,17 +278,20 @@ override_dh_auto_install:
277278

278279
# qgis binaries
279280
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
280-
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
281-
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin
281+
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin/qgis.bin
282+
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin/qbrowser.bin
282283

283284
$(RM) $(CURDIR)/debian/tmp/usr/bin/qgis
284285
$(RM) $(CURDIR)/debian/tmp/usr/bin/qbrowser
285286

286287
# qgis binary wrappers
287-
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
288-
sed -r -e "s/\{GRASS\}/$(GRASS)/g" $(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh
289-
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
290-
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
288+
sed -r \
289+
-e "s/\{GRASS\}/$(GRASS)/g" \
290+
-e "s#\{ORACLE_LIBDIR\}#$(ORACLE_LIBDIR)#g" \
291+
$(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh
292+
293+
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qgis
294+
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis/usr/bin/qbrowser
291295

292296
override_dh_install:
293297
# Don't ship srs.db, automatically updated in postinst with crssync
@@ -338,10 +342,18 @@ override_dh_compress:
338342
dh_compress --exclude=pdf
339343

340344
override_dh_makeshlibs:
345+
ifneq (,$(WITH_ORACLE))
346+
dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets -Xqgis-provider-oracle -- -c0 -v$(QGIS_VERSION)
347+
else
341348
dh_makeshlibs -Xqgis-plugin-grass -Xlibqgis-customwidgets -- -c0 -v$(QGIS_VERSION)
349+
endif
342350

343351
override_dh_shlibdeps:
352+
ifneq (,$(WITH_ORACLE))
353+
dh_shlibdeps -l/usr/lib/$(GRASS)/lib -l$(ORACLE_LIBDIR)
354+
else
344355
dh_shlibdeps -l/usr/lib/$(GRASS)/lib
356+
endif
345357

346358
override_dh_strip:
347359
dh_strip --dbg-package=qgis-dbg

0 commit comments

Comments
 (0)
Please sign in to comment.