Rafael Laboissiere <rafael@debian.org> writes: > Version 0.99.18-8.etch.1 of the jed packages is uploaded to unstable. > Please, consider allowing it into testing. The only change in respect to > the version currently in testing (0.99.18-8) is the inclusion of the Spanish > translation of the debconf templates (closes: #409807, diffs attached > below). The diff you attached is not the same that I get when diffing the versions in etch and sid: diff -u jed-0.99.18/debian/patches/fix-pymode-tab-space.dpatch jed-0.99.18/debian/patches/fix-pymode-tab-space.dpatch --- jed-0.99.18/debian/patches/fix-pymode-tab-space.dpatch +++ jed-0.99.18/debian/patches/fix-pymode-tab-space.dpatch @@ -4,6 +4,14 @@ ## 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 @@ -16,7 +24,7 @@ +private define py_whitespace(cnt) +{ + if ( get_blocal_var("py_use_tab") ) -+ loop (cnt / TAB) insert_char('\t'); ++ whitespace(cnt); + else + loop (cnt) insert_char(' '); +} diff -u jed-0.99.18/debian/jed-common.config jed-0.99.18/debian/jed-common.config --- jed-0.99.18/debian/jed-common.config +++ jed-0.99.18/debian/jed-common.config @@ -2,8 +2,6 @@ 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 @@ -36,8 +34,8 @@ for n in `seq 1 10` ; do eval "tmp=\$file_$n" - md5sum=`echo $tmp | cut -d: -f1` - file=`echo $tmp | cut -d: -f2` + md5sum=${tmp%%:*} + file=${tmp##*:} 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 @@ -51,13 +49,13 @@ -if $changed = true ; then - db_fset jed-common/rm-site-defaults seen false +if $changed; then + . /usr/share/debconf/confmodule + 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 "tmp=\$file_$n" - rm -f `echo $tmp | cut -d: -f2` + eval "rm -f \${file_$n##*:}" done - fi + fi fi These are also undocumented in the changelog. Uh? Marc -- Fachbegriffe der Informatik - Einfach erklärt 230: Deadlock Einsperren des Admins im Serverraum. (Manfred Worm Schäfer)
Attachment:
pgpc8BWBRS_bo.pgp
Description: PGP signature