Author: frankie
Date: 2006-08-26 18:51:23 +0000 (Sat, 26 Aug 2006)
New Revision: 551

Added:
   packages/grass/branches/6.1/debian/grass.postinst
   packages/grass/branches/6.1/debian/grass.postrm
Modified:
   packages/grass/branches/6.1/debian/control
   packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch
   packages/grass/branches/6.1/debian/rules
Log:
True merge from 6.0 trunk. Also fixed one patch description.


Modified: packages/grass/branches/6.1/debian/control
===================================================================
--- packages/grass/branches/6.1/debian/control  2006-08-25 13:59:54 UTC (rev 
550)
+++ packages/grass/branches/6.1/debian/control  2006-08-26 18:51:23 UTC (rev 
551)
@@ -1,6 +1,6 @@
 Source: grass
 Section: science
-Priority: extra
+Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <[EMAIL PROTECTED]>, Steve Halasz <[EMAIL 
PROTECTED]>
 Build-depends: flex, bison, libreadline5-dev | libreadline-dev, 
libncurses5-dev, lesstif2-dev, debhelper (>= 4.0.2), dpatch, libtiff4-dev, 
tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libgl1-mesa-swx11-dev, 
libglu1-xorg-dev | xlibmesa-glu-dev, libfreetype6-dev, autoconf2.13, 
autotools-dev, libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, 
libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, 
libmysqlclient15-dev | libmysqlclient14-dev, graphviz

Added: packages/grass/branches/6.1/debian/grass.postinst
===================================================================
--- packages/grass/branches/6.1/debian/grass.postinst   2006-08-25 13:59:54 UTC 
(rev 550)
+++ packages/grass/branches/6.1/debian/grass.postinst   2006-08-26 18:51:23 UTC 
(rev 551)
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Make sure grass libraries are picked up by ldconfig
+# Lifted from xfree86 package's shell-lib.sh script
+
+set -e
+
+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"
+fi
+
+if [ "$1" = "configure" ]; then
+  ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0

Added: packages/grass/branches/6.1/debian/grass.postrm
===================================================================
--- packages/grass/branches/6.1/debian/grass.postrm     2006-08-25 13:59:54 UTC 
(rev 550)
+++ packages/grass/branches/6.1/debian/grass.postrm     2006-08-26 18:51:23 UTC 
(rev 551)
@@ -0,0 +1,42 @@
+#!/bin/sh
+# Make sure grass library dir is removed from ld.so.conf
+# Lifted from xfree86 package's shell-lib.sh script
+
+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
+  ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch
===================================================================
--- packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch 2006-08-25 
13:59:54 UTC (rev 550)
+++ packages/grass/branches/6.1/debian/patches/xterm-fix.dpatch 2006-08-26 
18:51:23 UTC (rev 551)
@@ -2,9 +2,8 @@
 ## htmlgen-fakeroot.dpatch by  <[EMAIL PROTECTED]>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: use fakeroot to avoid weird stat/permission problem when
-## DP: building under pbuilder. This was preventing most man
-## DP: pages from being built.
+## DP: change all xterm occurences in debian x-terminal-emulator
+## DP: wrapper, as managed alternative.
 
 @DPATCH@
 diff -urNad grass-6.1.0~/gui/tcltk/d.m/chart.tcl 
grass-6.1.0/gui/tcltk/d.m/chart.tcl

Modified: packages/grass/branches/6.1/debian/rules
===================================================================
--- packages/grass/branches/6.1/debian/rules    2006-08-25 13:59:54 UTC (rev 
550)
+++ packages/grass/branches/6.1/debian/rules    2006-08-26 18:51:23 UTC (rev 
551)
@@ -130,7 +130,7 @@
        debian/fixpaths.sh $(CURDIR)/debian/tmp debian/tmp
        
        # delete extra license files
-       rm -f debian/tmp/usr/lib/grass/etc/license 
debian/tmp/usr/lib/grass/bwidget/LICENSE.txt
+       rm -f debian/tmp/usr/lib/grass/bwidget/LICENSE.txt
     
        # change section from 1 to .1grass 
        mv debian/tmp/usr/lib/grass/man/man1/grass6.1 debian/grass61.1


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to