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

Jörg Sommer jo-guest@costa.debian.org
Mon, 02 May 2005 21:07:29 +0000


Author: jo-guest
Date: 2005-05-02 21:07:28 +0000 (Mon, 02 May 2005)
New Revision: 37

Modified:
   trunk/packages/jed/debian/control
   trunk/packages/jed/debian/jed-common.dirs
   trunk/packages/jed/debian/jed-common.postinst
   trunk/packages/jed/debian/jed-common.prerm
Log:
jed:

* control -> jed-common:
  + does not depend on slang anymore

  + added xjed to recommends (as or)

  + removed "byte compiled" from description

* jed-common.prerm and jed-common.postinst should only call the
  /u/s/j/compil/jed-common script to build or remove not the other files
  in this directory

* removed usr/share/man/man8 from jed-common.dirs, this ddirectory is
  empty


Modified: trunk/packages/jed/debian/control
===================================================================
--- trunk/packages/jed/debian/control	2005-04-30 20:43:43 UTC (rev 36)
+++ trunk/packages/jed/debian/control	2005-05-02 21:07:28 UTC (rev 37)
@@ -47,11 +47,10 @@
 
 Package: jed-common
 Architecture: all
-Depends: slang1 (>= 1.3.11)
 Replaces: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
 Conflicts: jedslc, jedsl, jedsl-src, jed (<< 0.99.10-2), jed-sl
-Recommends: jed
-Description: byte compiled S-Lang runtime files for jed and xjed
- This package provides the compiled S-Lang runtime files that
- are needed by both jed and xjed.
+Recommends: jed | xjed
+Description: S-Lang runtime files for jed and xjed
+ This package provides the S-Lang runtime files that are needed by both
+ jed and xjed.
 

Modified: trunk/packages/jed/debian/jed-common.dirs
===================================================================
--- trunk/packages/jed/debian/jed-common.dirs	2005-04-30 20:43:43 UTC (rev 36)
+++ trunk/packages/jed/debian/jed-common.dirs	2005-05-02 21:07:28 UTC (rev 37)
@@ -3,7 +3,6 @@
 usr/share/doc/jed-common
 usr/share/doc/jed-common/examples
 usr/share/info
-usr/share/man/man8
 usr/share/jed/lib
 usr/share/jed/compile
 usr/sbin

Modified: trunk/packages/jed/debian/jed-common.postinst
===================================================================
--- trunk/packages/jed/debian/jed-common.postinst	2005-04-30 20:43:43 UTC (rev 36)
+++ trunk/packages/jed/debian/jed-common.postinst	2005-05-02 21:07:28 UTC (rev 37)
@@ -6,20 +6,17 @@
 	install-info --quiet --section Editors Editors --description='Programmers editor.' /usr/share/info/jed.info.gz;
 
 	TEMP=$(tempfile)
-	for SCRIPT in $(find /usr/share/jed/compile -type f) ; do
-		if test -x $SCRIPT ; then
-			echo -n "Running $SCRIPT... "
-			RET=0
-			$SCRIPT install > $TEMP 2>&1 || RET=$?
-			if test "$RET" -ne 0 ; then
-				echo "failed (see $TEMP)"
-				exit $RET
-			fi
-			echo "done"
-		fi
-	done
-	rm -f $TEMP
+	RET=0
 
+	printf "Running /usr/share/jed/compile/jed-common"
+	/usr/share/jed/compile/jed-common install 2>$TEMP || RET=$?
+	if test "$RET" -ne 0 ; then
+		echo "failed (see $TEMP)"
+		exit $RET
+	fi
+	echo "done"
+	
+	rm $TEMP
 	;;
 
   abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/packages/jed/debian/jed-common.prerm
===================================================================
--- trunk/packages/jed/debian/jed-common.prerm	2005-04-30 20:43:43 UTC (rev 36)
+++ trunk/packages/jed/debian/jed-common.prerm	2005-05-02 21:07:28 UTC (rev 37)
@@ -2,21 +2,16 @@
 
 # jeds info file is broken. debhelper cannot handle it
 # (this used to be the case, I haven't check with woody dh yet)
-install-info --quiet --remove /usr/share/info/jed.info.gz;
+install-info --quiet --remove /usr/share/info/jed.info.gz
 
 TEMP=$(tempfile)
-for SCRIPT in $(find /usr/share/jed/compile -type f) ; do
-	if test -x $SCRIPT ; then
-		echo -n "Running $SCRIPT... "
-		RET=0
-		$SCRIPT remove > $TEMP 2>&1 || RET=$?
-		if test "$RET" -ne 0 ; then
-			echo "failed (see $TEMP)"
-			exit $RET
-		fi
-		echo "done"
-	fi
-done
+printf "Running /usr/share/jed/compile/jed-common"
+/usr/share/jed/compile/jed-common remove 2>$TEMP || RET=$?
+if test "$RET" -ne 0 ; then
+	echo "failed (see $TEMP)"
+	exit $RET
+fi
+echo "done"
 rm -f $TEMP
 
 #DEBHELPER#