Bug#654991: Patches for Bug#626412 and Bug#654991
Rafael Laboissiere
rafael at laboissiere.net
Sat Jan 7 19:11:26 UTC 2012
package jed-extra
tags 626412 patch
tags 654991 patch
thanks
Please, find here attached a debdiff file with fixes for Bug#626412 and
Bug#654991. The patch is minimal.
I have participated to the Debian JED Group before I retired from Debian.
The current members of the group do not seem to be very active regarding
the maintenance of the package. If a good soul DD or a member of the QA
team could upload the fixed package, I would be very grateful.
Rafael
-------------- next part --------------
diff -Nru jed-extra-2.5.6/debian/changelog jed-extra-2.5.6/debian/changelog
--- jed-extra-2.5.6/debian/changelog 2012-01-07 20:02:48.000000000 +0100
+++ jed-extra-2.5.6/debian/changelog 2012-01-07 20:02:15.000000000 +0100
@@ -1,3 +1,14 @@
+jed-extra (2.5.6-1.1) unstable; urgency=low
+
+ * Non-maintainer upload
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Added patches (taken from the CVS repository of the upstream project
+ JEDmodes):
+ - debian/patches/email-misplaced-parentheses.diff (closes: #626412)
+ - debian/patches/redefine-list-concat.diff (closes: #654991)
+
+ -- Rafael Laboissiere <rafael at laboissiere.net> Sat, 07 Jan 2012 19:40:50 +0100
+
jed-extra (2.5.6-1) unstable; urgency=low
* New upstream release,
* debian/rules: updated download URLs, [GM]
diff -Nru jed-extra-2.5.6/debian/format jed-extra-2.5.6/debian/format
--- jed-extra-2.5.6/debian/format 1970-01-01 01:00:00.000000000 +0100
+++ jed-extra-2.5.6/debian/format 2012-01-07 19:14:54.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru jed-extra-2.5.6/debian/patches/email-misplaced-parentheses.diff jed-extra-2.5.6/debian/patches/email-misplaced-parentheses.diff
--- jed-extra-2.5.6/debian/patches/email-misplaced-parentheses.diff 1970-01-01 01:00:00.000000000 +0100
+++ jed-extra-2.5.6/debian/patches/email-misplaced-parentheses.diff 2012-01-07 19:30:19.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Remove misplaced parentheses that break email.sl in slang 2.2
+ Taken upstream from:
+ http://jedmodes.cvs.sourceforge.net/viewvc/jedmodes/mode/email/email.sl?r1=1.8&r2=1.9
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-01-07
+
+--- jed-extra-2.5.6.orig/email/email.sl
++++ jed-extra-2.5.6/email/email.sl
+@@ -404,7 +404,7 @@
+ trim;
+ insert ();
+ email_reformat ();
+- go_up(2) ();
++ go_up (2);
+ }
+
+ % Remove quote levels beyond a user defined number
diff -Nru jed-extra-2.5.6/debian/patches/redefine-list-concat.diff jed-extra-2.5.6/debian/patches/redefine-list-concat.diff
--- jed-extra-2.5.6/debian/patches/redefine-list-concat.diff 1970-01-01 01:00:00.000000000 +0100
+++ jed-extra-2.5.6/debian/patches/redefine-list-concat.diff 2012-01-07 19:29:45.000000000 +0100
@@ -0,0 +1,89 @@
+Description: Remove misplaced parentheses that break email.sl in slang 2.2
+ Taken upstream from:
+ http://jedmodes.cvs.sourceforge.net/viewvc/jedmodes/mode/datutils/datutils.sl?r1=1.12&r2=1.13
+ http://jedmodes.cvs.sourceforge.net/viewvc/jedmodes/mode/listing/listing.sl?r1=1.16&r2=1.17
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2012-01-07
+
+--- jed-extra-2.5.6.orig/listing/listing.sl
++++ jed-extra-2.5.6/listing/listing.sl
+@@ -31,6 +31,7 @@
+ % 2007-04-19 3.1.1 * added a "Save Listing" entry to the mode menu
+ % 2009-02-16 3.1.2 * code cleanup
+ % 2009-12-08 3.1.3 * adapt to new require() syntax in Jed 0.99.19
++% 2010-12-08 * list_concat() -> list_extend() (datutils 2.3)
+ %
+ % TODO: * Shift-Click tags from point to Mousepoint
+ % may be also: right-drag tags lines
+@@ -49,7 +50,7 @@
+ require("keydefs");
+ require("view");
+ #endif
+-autoload("list_concat", "datutils"); % >= 2.1
++autoload("list_extend", "datutils"); % >= 2.3
+ autoload("push_defaults", "sl_utils");
+
+ % --- name it
+@@ -326,7 +327,7 @@
+ !if (scope <= 0) % not current line
+ {
+ list_append(newtags, tag, -1);
+- list_concat(newtags, tags);
++ list_extend(newtags, tags);
+ set_blocal_var(newtags, "Tags");
+ }
+ throw UserBreakError, "Quit";
+--- jed-extra-2.5.6.orig/datutils/datutils.sl
++++ jed-extra-2.5.6/datutils/datutils.sl
+@@ -29,6 +29,8 @@
+ % 2.2.3 2009-10-05 fallback defs of __push_list(), __pop_list()
+ % deprecated push_list(), pop2list(),
+ % favour literal constructs for array<->list conversion
++% 2.3 2010-12-08 name list_concat() to list_extend() to avoid
++% clash with intrinsic added in S-Lang 2.2.3 (report PB)
+
+ _autoload(
+ "push_defaults", "sl_utils",
+@@ -495,22 +497,28 @@
+ }
+
+ %!%+
+-%\function{list_concat}
+-%\synopsis{Concatenate 2 lists}
+-%\usage{list_concat(l1, l2)}
++%\function{list_extend}
++%\synopsis{Extend a list with the values of another one}
++%\usage{list_extend(l1, l2)}
+ %\description
+ % Concatenate 2 lists by appending the elements of \var{l2} to \var{l1}.
+ %#v+
+ % variable l1 = {1, 2, 3, 4};
+-% list_concat(l1, {5, 6, 7});
++% list_extend(l1, {5, 6, 7});
+ % l1 == {1, 2, 3, 4, 5, 6, 7};
+ %#v-
+ %\notes
++% Behaves similar to the .extend() method of Python lists.
++%
+ % As this function uses a foreach loop, \var{l2} can also be an
+ % \var{Array_Type} object.
++%
++% This function was called list_concat() earlier. However, the
++% list_concat intrinsic introduced in S-Lang > 2.2.3 returns a new
++% list instead of appending to the first argument.
+ %\seealso{list_append, list_insert}
+ %!%-
+-define list_concat(l1, l2)
++define list_extend(l1, l2)
+ {
+ variable element;
+ foreach element (l2)
+@@ -530,7 +538,7 @@
+ % list_inject(l1, {2.5, 2.6, 2.7}, 2);
+ % l1 == {1, 2, 2.5, 2.6, 2.7, 3, 4};
+ %#v-
+-%\seealso{list_concat, list_insert}
++%\seealso{list_extend, list_insert}
+ %!%-
+ define list_inject(l1, l2, i)
+ {
diff -Nru jed-extra-2.5.6/debian/patches/series jed-extra-2.5.6/debian/patches/series
--- jed-extra-2.5.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ jed-extra-2.5.6/debian/patches/series 2012-01-07 19:39:05.000000000 +0100
@@ -0,0 +1,2 @@
+email-misplaced-parentheses.diff
+redefine-list-concat.diff
diff -Nru jed-extra-2.5.6/debian/source/format jed-extra-2.5.6/debian/source/format
--- jed-extra-2.5.6/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ jed-extra-2.5.6/debian/source/format 2012-01-07 19:46:48.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-jed-devel
mailing list