[Pkg-jed-commit] r566 - in jed/branches/etch: . debian
debian/patches
Rafael Laboissiere
rafael at alioth.debian.org
Sun Feb 11 11:27:44 CET 2007
Author: rafael
Date: 2007-02-11 11:27:44 +0100 (Sun, 11 Feb 2007)
New Revision: 566
Added:
jed/branches/etch/debian/
jed/branches/etch/debian/jed-common.config
jed/branches/etch/debian/patches/fix-pymode-tab-space.dpatch
Removed:
jed/branches/etch/debian/jed-common.config
jed/branches/etch/debian/patches/fix-pymode-tab-space.dpatch
Log:
Copied files into etch branch
Copied: jed/branches/etch/debian (from rev 497, jed/tags/0.99.18-8/debian)
Deleted: jed/branches/etch/debian/jed-common.config
===================================================================
--- jed/tags/0.99.18-8/debian/jed-common.config 2007-01-14 10:57:38 UTC (rev 497)
+++ jed/branches/etch/debian/jed-common.config 2007-02-11 10:27:44 UTC (rev 566)
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# 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
-
-# md5sums from jed-0.99.15-5 (woody)
-file_3=ce466753801194229b9b78f0b3b7e28c:/etc/jed-init.d/00site.sl
-file_4=5f0954b045b6b81f1ef0ba545d42c000:/etc/jed.conf
-
-# md5sums from SVN revisions 2 to 35
-file_5=5bf498a3703c5330e3acea00d0fa7a87:/etc/jed-init.d/00debian.sl
-
-# md5sums from SVN revisions 36 to 41
-file_6=28962c5ff0ff7cfcc58a22394599967e:/etc/jed-init.d/00debian.sl
-
-# md5sums from SVN revisions 42 to 55
-file_7=472a1d8dbdc16496ba51334f62366466:/etc/jed-init.d/00debian.sl
-
-# md5sums from SVN revisions 50 to 56
-file_8=da918de66b912df0205c5b38401b09b6:/etc/jed.conf
-
-# md5sums from SVN revisions 57
-file_9=fc2b1e847dd08da8b338a50ab04d1eb0:/etc/jed.conf
-
-# md5sums from SVN revisions 58
-file_10=3b919dbba6a2656a926f818344a60552:/etc/jed.conf
-
-# (starting at SVN revision 59, the /etc/jed-init.d/ was not used anymore)
-
-changed=false
-
-for n in `seq 1 10` ; do
- eval "tmp=\$file_$n"
- 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
- # silently
- rm -f $file
- else
- changed=true
- fi
- fi
-done
-
-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 "rm -f \${file_$n##*:}"
- done
- fi
-fi
Copied: jed/branches/etch/debian/jed-common.config (from rev 564, jed/tags/0.99.18-8/debian/jed-common.config)
Deleted: jed/branches/etch/debian/patches/fix-pymode-tab-space.dpatch
===================================================================
--- jed/tags/0.99.18-8/debian/patches/fix-pymode-tab-space.dpatch 2007-01-14 10:57:38 UTC (rev 497)
+++ jed/branches/etch/debian/patches/fix-pymode-tab-space.dpatch 2007-02-11 10:27:44 UTC (rev 566)
@@ -1,160 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-pymode-tab-space.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## 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.
-
- at DPATCH@
-diff -urNad trunk~/lib/pymode.sl trunk/lib/pymode.sl
---- trunk~/lib/pymode.sl (Revision 35)
-+++ trunk/lib/pymode.sl (Arbeitskopie)
-@@ -69,6 +69,14 @@
-
-
-
-+private define py_whitespace(cnt)
-+{
-+ if ( get_blocal_var("py_use_tab") )
-+ whitespace(cnt);
-+ else
-+ loop (cnt) insert_char(' ');
-+}
-+
- % Set the following to your favourite indentation level
- custom_variable("Py_Indent_Level", 4);
-
-@@ -139,10 +147,16 @@
-
- col = what_column() - 1;
-
-+ variable indent;
-+ if ( get_blocal_var("py_use_tab") )
-+ indent = TAB;
-+ else
-+ indent = Py_Indent_Level;
-+
- if (py_line_ends_with_colon())
-- col += Py_Indent_Level;
-+ col += indent;
- if (py_endblock_cmd() or (subblock and not py_line_starts_block()))
-- col -= Py_Indent_Level;
-+ col -= indent;
- }
-
- define py_indent_line()
-@@ -151,7 +165,7 @@
-
- col = py_indent_calculate();
- bol_trim ();
-- whitespace( col );
-+ py_whitespace( col );
- }
-
- define py_comment_line()
-@@ -246,11 +260,19 @@
- bskip_white();
- if (bolp() and (col > 1)) {
- pop_spot();
-+ if ( blooking_at("\t") )
-+ {
-+ () = left(1);
-+ del();
-+ }
-+ else
-+ {
- bol_trim ();
- col--;
- if (col mod Py_Indent_Level == 0)
- col--;
-- whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
-+ py_whitespace ( (col / Py_Indent_Level) * Py_Indent_Level );
-+ }
- }
- else {
- pop_spot();
-@@ -261,7 +283,7 @@
- define py_shift_line_right()
- {
- bol_skip_white();
-- whitespace(Py_Indent_Level);
-+ py_whitespace(Py_Indent_Level);
- }
-
- define py_shift_region_right()
-@@ -293,9 +315,17 @@
- {
- bol_skip_white();
- if (what_column() > Py_Indent_Level) {
-+ if ( get_blocal_var("py_use_tab") )
-+ {
-+ () = left(1);
-+ del();
-+ }
-+ else
-+ {
- push_mark();
- goto_column(what_column() - Py_Indent_Level);
- del_region();
-+ }
- }
- }
-
-@@ -440,12 +470,12 @@
- % Indent is wrong. Hopefully it's a continuation line.
- level = oldlevel; % reset level
- bol_trim();
-- whitespace(level * Py_Indent_Level + (col - current_indent));
-+ py_whitespace(level * Py_Indent_Level + (col - current_indent));
- } else {
- current_indent = col;
- indent_level[level] = col;
- bol_trim();
-- whitespace(level * Py_Indent_Level);
-+ py_whitespace(level * Py_Indent_Level);
- }
- } while (down(1) == 1);
- }
-@@ -578,12 +608,28 @@
- {
- variable python = "python";
-
-- % TAB is checked by whitespace(). If TAB=0 no tab character is used,
-- % which avoids mixing up whitespace and tab indention
-- if (Py_Indent_Level == 8)
-- TAB = 8;
-- else
-- TAB = 0;
-+ create_blocal_var("py_use_tab");
-+ set_blocal_var(Py_Indent_Level == TAB, "py_use_tab");
-+ push_spot();
-+ bob();
-+ do
-+ {
-+ skip_white();
-+ if ( looking_at("\"\"\"") )
-+ {
-+ () = right(1);
-+ () = fsearch("\"\"\"");
-+ }
-+ else
-+ !if (looking_at_char('#') or eolp() or what_column() == 1)
-+ {
-+ bol();
-+ set_blocal_var(looking_at_char('\t'), "py_use_tab");
-+ break;
-+ }
-+ }
-+ while ( down(1) );
-+ pop_spot();
-
- set_mode (python, 0x4); % flag value of 4 is generic language mode
- use_keymap(python);
Copied: jed/branches/etch/debian/patches/fix-pymode-tab-space.dpatch (from rev 564, jed/tags/0.99.18-8/debian/patches/fix-pymode-tab-space.dpatch)
More information about the Pkg-jed-commit
mailing list