[Pkg-jed-commit] r564 - in jed/tags/0.99.18-8/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2007-02-11 11:12:24 +0100 (Sun, 11 Feb 2007)
New Revision: 564

Modified:
   jed/tags/0.99.18-8/debian/jed-common.config
   jed/tags/0.99.18-8/debian/patches/fix-pymode-tab-space.dpatch
Log:
Updated the 0.99.18-8 tag with the files that are truly in this release
(currently in testing, which is etch)


Modified: jed/tags/0.99.18-8/debian/jed-common.config
===================================================================
--- jed/tags/0.99.18-8/debian/jed-common.config	2007-02-07 10:18:12 UTC (rev 563)
+++ jed/tags/0.99.18-8/debian/jed-common.config	2007-02-11 10:12:24 UTC (rev 564)
@@ -2,6 +2,8 @@
 
 set -e
 
+. /usr/share/debconf/confmodule
+
 # md5sums from jed-0.99.9 (potato)
 file_1=38af7aa6498bfd7be927aa52c6c46585:/etc/jed-init.d/00site.sl
 file_2=91a5aee61e23906dcfffd24904d7ef62:/etc/jed-init.d/99default.sl
@@ -34,8 +36,8 @@
 
 for n in `seq 1 10` ; do
     eval "tmp=\$file_$n"
-    md5sum=${tmp%%:*}
-    file=${tmp##*:}
+    md5sum=`echo $tmp | cut -d: -f1`
+    file=`echo $tmp | cut -d: -f2` 
     if [ -e $file ] ; then
         if echo "$md5sum  $file" | md5sum -c >/dev/null 2>&1 ; then
 	    # The configuration file was not changed by the user: remove it
@@ -47,15 +49,15 @@
     fi
 done
 
-if $changed; then
-    . /usr/share/debconf/confmodule
-
+if $changed = true ; then
+    db_fset jed-common/rm-site-defaults seen false
     db_input medium jed-common/rm-site-defaults || true
     db_go
     db_get jed-common/rm-site-defaults
     if [ "$RET" = true ] ; then
         for n in `seq 1 10` ; do
-            eval "rm -f \${file_$n##*:}"
+            eval "tmp=\$file_$n"
+            rm -f `echo $tmp | cut -d: -f2` 
 	done
-    fi
+    fi    
 fi

Modified: jed/tags/0.99.18-8/debian/patches/fix-pymode-tab-space.dpatch
===================================================================
--- jed/tags/0.99.18-8/debian/patches/fix-pymode-tab-space.dpatch	2007-02-07 10:18:12 UTC (rev 563)
+++ jed/tags/0.99.18-8/debian/patches/fix-pymode-tab-space.dpatch	2007-02-11 10:12:24 UTC (rev 564)
@@ -4,14 +4,6 @@
 ## DP: In Python, it is forbidden to mix up tabs and spaces as indention
 ## DP: characters. This patch enhances the python mode to take care of the
 ## DP: prefered indention character in a file. Fixes #305668
-##
-## The idea of the patch is to assume the user wants tabs as indent characters,
-## if he set the Py_Indent_Level to the value of TAB. (used for empty files)
-##   This might be overwritten by the indention character used in the current
-## file. If the first line that starts with whitespace and is not part of """
-## ... """ or starts with # it overwrites the default selection. If this line
-## starts with a tab, tab is used as character for indention, otherwise spaces
-## are used.
 
 @DPATCH@
 diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
@@ -24,7 +16,7 @@
 +private define py_whitespace(cnt)
 +{
 +   if ( get_blocal_var("py_use_tab") )
-+      whitespace(cnt);
++      loop (cnt / TAB) insert_char('\t');
 +   else
 +      loop (cnt) insert_char(' ');
 +}