Skip to content

Commit

Permalink
update debian packaging of grass plugin
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@9205 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Aug 28, 2008
1 parent 46bad08 commit 042e99f
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 3 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
qgis (1.0preview5) experimental; urgency=low

* add wrapper scripts to qgis-plugin-grass that adds the grass
shared libraries to LD_LIBRARY_PATH.

-- Jürgen E. Fischer <jef@norbit.de> Fri, 29 Aug 2008 00:19:05 +0200

qgis (1.0preview4) experimental; urgency=low

* add ogr converter plugin
Expand Down
5 changes: 5 additions & 0 deletions debian/qgis-plugin-grass.postrm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis /usr/bin/qgis
fi
5 changes: 5 additions & 0 deletions debian/qgis-plugin-grass.preinst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
fi
2 changes: 1 addition & 1 deletion debian/qgis.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
usr/bin/*
usr/bin/qgis_help
usr/share/qgis/doc/CODING
usr/share/qgis/doc/favicon.ico
usr/share/qgis/doc/index.html
Expand Down
12 changes: 12 additions & 0 deletions debian/qgis.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

LD_LIBRARY_PATH=/usr/lib/grass/lib
export LD_LIBRARY_PATH

if [ "$LD_LIBRARY_PATH" = "" ]; then
LD_LIBRARY_PATH=/usr/lib/grass/lib
else
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib
fi

exec $0.bin "$@"
16 changes: 14 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ include /usr/share/dpatch/dpatch.make
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE
CMAKE_OPTS = \
-Wno-dev \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_SKIP_RPATH=TRUE \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
-D PEDANTIC=TRUE \

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
Expand Down Expand Up @@ -86,6 +91,13 @@ binary-arch: build install
dh_installdocs
dh_installexamples
dh_install --sourcedir=debian/tmp

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis

dh_pycentral
dh_installmenu
dh_icons
Expand All @@ -99,7 +111,7 @@ binary-arch: build install
dh_fixperms
dh_makeshlibs
dh_installdeb
dh_shlibdeps
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Expand Down

0 comments on commit 042e99f

Please sign in to comment.