[DebianGIS-dev] r855 - packages/grass/branches/6.2.1/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-05-26 17:01:04 +0000 (Sat, 26 May 2007)
New Revision: 855

Added:
   packages/grass/branches/6.2.1/debian/grass.conf
   packages/grass/branches/6.2.1/debian/grass.dirs
Modified:
   packages/grass/branches/6.2.1/debian/changelog
   packages/grass/branches/6.2.1/debian/grass.postinst
   packages/grass/branches/6.2.1/debian/grass.postrm
   packages/grass/branches/6.2.1/debian/rules
Log:
Changes for ld.so


Modified: packages/grass/branches/6.2.1/debian/changelog
===================================================================
--- packages/grass/branches/6.2.1/debian/changelog	2007-05-25 13:15:52 UTC (rev 854)
+++ packages/grass/branches/6.2.1/debian/changelog	2007-05-26 17:01:04 UTC (rev 855)
@@ -1,8 +1,11 @@
 grass (6.2.1-4) unstable; urgency=low
 
   * Added xterm.dpatch to use x-terminal-emulator instead of xterm.
+  * Now install a new grass.conf file into /etc/ld.so.conf in order to simplify ls.so configuration at 
+    postinst and postrm time. This is also backcompatible with Etch. 
+  * Added a new grass.dirs file.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 17 May 2007 18:31:42 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 26 May 2007 18:46:28 +0200
 
 grass (6.2.1-3) unstable; urgency=low
 

Added: packages/grass/branches/6.2.1/debian/grass.conf
===================================================================
--- packages/grass/branches/6.2.1/debian/grass.conf	                        (rev 0)
+++ packages/grass/branches/6.2.1/debian/grass.conf	2007-05-26 17:01:04 UTC (rev 855)
@@ -0,0 +1 @@
+/usr/lib/grass/lib

Added: packages/grass/branches/6.2.1/debian/grass.dirs
===================================================================
--- packages/grass/branches/6.2.1/debian/grass.dirs	                        (rev 0)
+++ packages/grass/branches/6.2.1/debian/grass.dirs	2007-05-26 17:01:04 UTC (rev 855)
@@ -0,0 +1,6 @@
+etc/ld.so.conf.d
+usr/lib/grass
+/usr/bin
+/usr/lib/grass
+/usr/share/doc/grass
+/usr/share/man

Modified: packages/grass/branches/6.2.1/debian/grass.postinst
===================================================================
--- packages/grass/branches/6.2.1/debian/grass.postinst	2007-05-25 13:15:52 UTC (rev 854)
+++ packages/grass/branches/6.2.1/debian/grass.postinst	2007-05-26 17:01:04 UTC (rev 855)
@@ -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/branches/6.2.1/debian/grass.postrm
===================================================================
--- packages/grass/branches/6.2.1/debian/grass.postrm	2007-05-25 13:15:52 UTC (rev 854)
+++ packages/grass/branches/6.2.1/debian/grass.postrm	2007-05-26 17:01:04 UTC (rev 855)
@@ -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/branches/6.2.1/debian/rules
===================================================================
--- packages/grass/branches/6.2.1/debian/rules	2007-05-25 13:15:52 UTC (rev 854)
+++ packages/grass/branches/6.2.1/debian/rules	2007-05-26 17:01:04 UTC (rev 855)
@@ -143,6 +143,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