Skip to content

Commit 042e99f

Browse files
author
jef
committed
update debian packaging of grass plugin
git-svn-id: http://svn.osgeo.org/qgis/trunk@9205 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 46bad08 commit 042e99f

File tree

6 files changed

+44
-3
lines changed

6 files changed

+44
-3
lines changed

debian/changelog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
qgis (1.0preview5) experimental; urgency=low
2+
3+
* add wrapper scripts to qgis-plugin-grass that adds the grass
4+
shared libraries to LD_LIBRARY_PATH.
5+
6+
-- Jürgen E. Fischer <jef@norbit.de> Fri, 29 Aug 2008 00:19:05 +0200
7+
18
qgis (1.0preview4) experimental; urgency=low
29

310
* add ogr converter plugin

debian/qgis-plugin-grass.postrm

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
if [ "$1" = "remove" ]; then
4+
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis /usr/bin/qgis
5+
fi

debian/qgis-plugin-grass.preinst

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
3+
if [ "$1" = "install" -o "$1" = "upgrade" ]; then
4+
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
5+
fi

debian/qgis.install

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
usr/bin/*
1+
usr/bin/qgis_help
22
usr/share/qgis/doc/CODING
33
usr/share/qgis/doc/favicon.ico
44
usr/share/qgis/doc/index.html

debian/qgis.sh

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
LD_LIBRARY_PATH=/usr/lib/grass/lib
4+
export LD_LIBRARY_PATH
5+
6+
if [ "$LD_LIBRARY_PATH" = "" ]; then
7+
LD_LIBRARY_PATH=/usr/lib/grass/lib
8+
else
9+
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib
10+
fi
11+
12+
exec $0.bin "$@"

debian/rules

+14-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ include /usr/share/dpatch/dpatch.make
1313
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
1414
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
1515

16-
CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE
16+
CMAKE_OPTS = \
17+
-Wno-dev \
18+
-D CMAKE_INSTALL_PREFIX=/usr \
19+
-D CMAKE_SKIP_RPATH=TRUE \
20+
-D BINDINGS_GLOBAL_INSTALL=TRUE \
21+
-D PEDANTIC=TRUE \
1722

1823
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
1924
CFLAGS += -O0
@@ -86,6 +91,13 @@ binary-arch: build install
8691
dh_installdocs
8792
dh_installexamples
8893
dh_install --sourcedir=debian/tmp
94+
95+
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
96+
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
97+
98+
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
99+
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
100+
89101
dh_pycentral
90102
dh_installmenu
91103
dh_icons
@@ -99,7 +111,7 @@ binary-arch: build install
99111
dh_fixperms
100112
dh_makeshlibs
101113
dh_installdeb
102-
dh_shlibdeps
114+
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib dh_shlibdeps
103115
dh_gencontrol
104116
dh_md5sums
105117
dh_builddeb

0 commit comments

Comments
 (0)