Skip to content

Commit

Permalink
debian packaging update: allow building with GRASS 6.4 on sid
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10255 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Mar 2, 2009
1 parent ee0f523 commit e5043fc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
qgis (1.1.0-1) UNRELEASED; urgency=low

* allow build with GRASS 6.4rc3

-- Jürgen E. Fischer <jef@norbit.de> Mon, 02 Mar 2009 21:06:07 +0100

qgis (1.1.0) UNRELEASED; urgency=low

* gridmaker plugin removed from package
Expand Down
4 changes: 2 additions & 2 deletions debian/qgis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ LD_LIBRARY_PATH=/usr/lib/grass/lib
export LD_LIBRARY_PATH

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

exec $0.bin "$@"
3 changes: 2 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

CMAKE_OPTS = \
-Wno-dev \
-D GRASS_PREFIX=/usr/lib/grass64 \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_SKIP_RPATH=TRUE \
-D BINDINGS_GLOBAL_INSTALL=TRUE \
Expand Down Expand Up @@ -116,7 +117,7 @@ binary-arch: build install
dh_fixperms
dh_makeshlibs
dh_installdeb
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib dh_shlibdeps
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/usr/lib/grass/lib:/usr/lib/grass64/lib dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Expand Down

0 comments on commit e5043fc

Please sign in to comment.