[DebianGIS-dev] r856 - in packages/grass/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Sat May 26 17:27:37 UTC 2007
Author: frankie
Date: 2007-05-26 17:27:37 +0000 (Sat, 26 May 2007)
New Revision: 856
Modified:
packages/grass/trunk/debian/changelog
packages/grass/trunk/debian/control
packages/grass/trunk/debian/grass.postinst
packages/grass/trunk/debian/grass.postrm
packages/grass/trunk/debian/patches/00list
packages/grass/trunk/debian/rules
Log:
Merging from 6.2.1-4
Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog 2007-05-26 17:01:04 UTC (rev 855)
+++ packages/grass/trunk/debian/changelog 2007-05-26 17:27:37 UTC (rev 856)
@@ -1,4 +1,4 @@
-grass (6.2.2-1) UNRELEASED; urgency=low
+grass (6.2.2~20070421-1) UNRELEASED; urgency=low
* New upstream release.
* Patchset updated.
@@ -7,8 +7,13 @@
* Moved to debhelper version 5 compatibility.
* Set explicitly proj data dir at configuration time.
* Removed too strict versioning in build-dep from gdal (useful for backports).
+ * Fixed priority in debian/control.
+ * Merge from 6.2.1-4:
+ - New patch xterm.dpatch
+ - Added /etc/ld.so.conf.d/grass.conf file instead of adding lib path
+ in-line into /etc/ld.so.conf.
- -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 17 Apr 2007 11:53:27 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sat, 26 May 2007 19:21:00 +0200
grass (6.2.1-3) unstable; urgency=low
Modified: packages/grass/trunk/debian/control
===================================================================
--- packages/grass/trunk/debian/control 2007-05-26 17:01:04 UTC (rev 855)
+++ packages/grass/trunk/debian/control 2007-05-26 17:27:37 UTC (rev 856)
@@ -1,6 +1,6 @@
Source: grass
Section: science
-Priority: optional
+Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Steve Halasz <debian at adkgis.org>
Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 5), dpatch,
Modified: packages/grass/trunk/debian/grass.postinst
===================================================================
--- packages/grass/trunk/debian/grass.postinst 2007-05-26 17:01:04 UTC (rev 855)
+++ packages/grass/trunk/debian/grass.postinst 2007-05-26 17:27:37 UTC (rev 856)
@@ -4,12 +4,32 @@
set -e
+# Removes obsolete path in the main ld.so configuration file.
+# This should be removed post-lenny.
dir="/usr/lib/grass/lib"
ldsoconf="/etc/ld.so.conf"
-
-# is the line not already present?
-if ! fgrep -qsx "$dir" "$ldsoconf"; then
- echo "$dir" >> "$ldsoconf"
+# is the line present?
+if fgrep -qsx "$dir" "$ldsoconf"; then
+ # rewrite the file (very carefully)
+ set +e
+ fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
+ fgrep_status=$?
+ set -e
+ case $fgrep_status in
+ 0|1) ;; # we don't actually care if any lines matched or not
+ *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
+ "$fgrep_status" ;;
+ esac
+ set +e
+ cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
+ cmp_status=$?
+ set -e
+ case $cmp_status in
+ 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
+ 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
+ *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\"; cmp" \
+ "exited with status $cmp_status" ;;
+ esac
fi
if [ "$1" = "configure" ]; then
@@ -19,3 +39,5 @@
#DEBHELPER#
exit 0
+
+
Modified: packages/grass/trunk/debian/grass.postrm
===================================================================
--- packages/grass/trunk/debian/grass.postrm 2007-05-26 17:01:04 UTC (rev 855)
+++ packages/grass/trunk/debian/grass.postrm 2007-05-26 17:27:37 UTC (rev 856)
@@ -4,36 +4,8 @@
set -e
-dir="/usr/lib/grass/lib"
-ldsoconf="/etc/ld.so.conf"
-
if [ "$1" = "remove" ]; then
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\"; cmp" \
- "exited with status $cmp_status" ;;
- esac
- fi
-fi
-
-if [ "$1" = "remove" ]; then
+ rm -f /etc/ld.so.conf.d/grass.conf
ldconfig
fi
Modified: packages/grass/trunk/debian/patches/00list
===================================================================
--- packages/grass/trunk/debian/patches/00list 2007-05-26 17:01:04 UTC (rev 855)
+++ packages/grass/trunk/debian/patches/00list 2007-05-26 17:27:37 UTC (rev 856)
@@ -1,4 +1,4 @@
htmlgen-fakeroot
www-browser
pager
-#r.in.wms
+xterm
Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules 2007-05-26 17:01:04 UTC (rev 855)
+++ packages/grass/trunk/debian/rules 2007-05-26 17:27:37 UTC (rev 856)
@@ -146,6 +146,9 @@
# install pkg-config file
install -m 644 grass.pc debian/grass-dev/usr/share/pkgconfig/grass.pc
+ # install ld.so file
+ install -m 644 grass.conf debian/grass/etc/ld.so.conf.d/grass.conf
+
install-indep: build-indep
dh_testdir -i
dh_testroot -i
More information about the Pkg-grass-devel
mailing list