novi debian/rules i debian/copyright

[jre-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 09395ab..676d423 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,7 +2,7 @@
 
 set -e
 
-[ "$DEBIAN_SCRIPT_DEBUG" ] && set -x
+[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
 case "$1" in
   configure)
@@ -19,7 +19,7 @@ case "$1" in
   ;;
 esac
 
-libdir="/usr/lib/jvm/java-1.5.0-sun/jre"
+libdir="/usr/lib/jvm/java-6-sun/jre"
 
 if [ -x /usr/sbin/chpax ]; then
   chpax=/usr/sbin/chpax
@@ -43,7 +43,9 @@ if [ ! -x $libdir/bin/java ]; then
   exit 0
 fi
 
-if [ "$chpax" ] && \
-   ! $chpax -v $libdir/bin/java | egrep -q "flags for $libdir/bin/java \(...r.s\)"; then
-  $chpax -rs $libdir/bin/java
+if uname -r | grep -q grsec; then
+  if [ "$chpax" ] && \
+     ! $chpax -v $libdir/bin/java | egrep -q "flags for $libdir/bin/java \(...r.s\)"; then
+    $chpax -rs $libdir/bin/java
+  fi
 fi