[Pkg-jed-commit] r41 - trunk/packages/jed/debian

Jörg Sommer jo-guest@costa.debian.org
Sat, 07 May 2005 17:07:19 +0000


Author: jo-guest
Date: 2005-05-07 17:07:18 +0000 (Sat, 07 May 2005)
New Revision: 41

Added:
   trunk/packages/jed/debian/xjed.postinst
   trunk/packages/jed/debian/xjed.prerm
Modified:
   trunk/packages/jed/debian/compile
   trunk/packages/jed/debian/jed.postinst
   trunk/packages/jed/debian/jed.prerm
   trunk/packages/jed/debian/rules
Log:
* removed jed-script from jed

* managed jed-script with alternatives for xjed and jed

* added xjed.postinst and xjed.prerm

* updated compile to use jed-script


Modified: trunk/packages/jed/debian/compile
===================================================================
--- trunk/packages/jed/debian/compile	2005-05-05 10:52:41 UTC (rev 40)
+++ trunk/packages/jed/debian/compile	2005-05-07 17:07:18 UTC (rev 41)
@@ -1,23 +1,11 @@
 #!/bin/sh -e
 
-for i in /usr/bin/jed /usr/bin/xjed $(which jed); do
-    if [ -x $i ]; then
-        JED=$i
-	break
-    fi
-done
-
-if [ -z "$JED" ]; then
-    echo "no installed jed version found"
-    exit 0  # this is not an error, if jed is not installed
-fi
-
 LIBDIR=/usr/share/jed/lib/
 PREPARSE=preparse.sl
 
 case "$1" in
   install)
-	$JED -batch -n -l $PREPARSE
+	jed-script $PREPARSE
 	;;
   remove)
 	find $LIBDIR -name \*.slc -o -name \*.dfa | xargs rm -f

Modified: trunk/packages/jed/debian/jed.postinst
===================================================================
--- trunk/packages/jed/debian/jed.postinst	2005-05-05 10:52:41 UTC (rev 40)
+++ trunk/packages/jed/debian/jed.postinst	2005-05-07 17:07:18 UTC (rev 41)
@@ -5,6 +5,10 @@
     update-alternatives \
     	--install /usr/bin/editor editor /usr/bin/jed 42 \
     	--slave /usr/share/man/man1/editor.1.gz editor.1.gz /usr/share/man/man1/jed.1.gz;
+
+    update-alternatives \
+    	--install /usr/bin/jed-script jed-script /usr/bin/jed 50 \
+    	--slave /usr/share/man/man1/jed-script.1.gz jed-script.1.gz /usr/share/man/man1/jed.1.gz;
     ;;
 
   abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/packages/jed/debian/jed.prerm
===================================================================
--- trunk/packages/jed/debian/jed.prerm	2005-05-05 10:52:41 UTC (rev 40)
+++ trunk/packages/jed/debian/jed.prerm	2005-05-07 17:07:18 UTC (rev 41)
@@ -1,5 +1,6 @@
 #!/bin/sh
 
 update-alternatives --remove editor /usr/bin/jed
+update-alternatives --remove jed-script /usr/bin/jed
 
 #DEBHELPER#

Modified: trunk/packages/jed/debian/rules
===================================================================
--- trunk/packages/jed/debian/rules	2005-05-05 10:52:41 UTC (rev 40)
+++ trunk/packages/jed/debian/rules	2005-05-07 17:07:18 UTC (rev 41)
@@ -126,8 +126,8 @@
 	@echo --- JED ---
 	@echo
 	dh_install -pjed --autodest \
-	    $(temp)/usr/bin/jed $(temp)/usr/share/man/man1/jed.1 \
-	    $(temp)/usr/bin/jed-script $(temp)/usr/share/man/man1/jed-script.1
+	    $(temp)/usr/bin/jed $(temp)/usr/share/man/man1/jed.1
+#	    $(temp)/usr/bin/jed-script $(temp)/usr/share/man/man1/jed-script.1
 #	    $(temp)/usr/bin/jgrep $(temp)/usr/share/man/man1/jgrep.1
 
 	dh_link -pjed usr/share/doc/jed-common usr/share/doc/jed

Added: trunk/packages/jed/debian/xjed.postinst
===================================================================
--- trunk/packages/jed/debian/xjed.postinst	2005-05-05 10:52:41 UTC (rev 40)
+++ trunk/packages/jed/debian/xjed.postinst	2005-05-07 17:07:18 UTC (rev 41)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+case "$1" in
+  configure)
+    update-alternatives \
+    	--install /usr/bin/jed-script jed-script /usr/bin/xjed 40 \
+    	--slave /usr/share/man/man1/jed-script.1.gz jed-script.1.gz /usr/share/man/man1/xjed.1.gz;
+    ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+  *)
+    echo "unknown argument --> \"$1"\" >&2
+    exit 0
+    ;;
+esac
+
+#DEBHELPER#

Added: trunk/packages/jed/debian/xjed.prerm
===================================================================
--- trunk/packages/jed/debian/xjed.prerm	2005-05-05 10:52:41 UTC (rev 40)
+++ trunk/packages/jed/debian/xjed.prerm	2005-05-07 17:07:18 UTC (rev 41)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+update-alternatives --remove jed-script /usr/bin/jed
+
+#DEBHELPER#