[Pkg-jed-commit] r913 - in jed/branches/0.99.19/debian: . patches
Jörg Sommer
jo-guest at alioth.debian.org
Thu Oct 4 14:17:03 UTC 2007
Author: jo-guest
Date: 2007-10-04 14:17:03 +0000 (Thu, 04 Oct 2007)
New Revision: 913
Removed:
jed/branches/0.99.19/debian/patches/empty_rectangle.dpatch
jed/branches/0.99.19/debian/patches/fix-read_mini.dpatch
jed/branches/0.99.19/debian/patches/fix-warnings.dpatch
jed/branches/0.99.19/debian/patches/update-copyright.dpatch
Modified:
jed/branches/0.99.19/debian/changelog
jed/branches/0.99.19/debian/patches/00list
Log:
• debian/patches/empty_rectangle.dpatch …/update-copyright.dpatch
…/fix-read_mini.dpatch …/fix-warnings.dpatch
· Removed after they are applied upstream.
• changelog
· Raised the version number.
Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog 2007-10-03 12:12:31 UTC (rev 912)
+++ jed/branches/0.99.19/debian/changelog 2007-10-04 14:17:03 UTC (rev 913)
@@ -1,11 +1,14 @@
-jed (1:0.99.19~pre102-3) UNRELEASED; urgency=low
+jed (1:0.99.19~pre112-1) experimental; urgency=low
- * debian/patches/fix-read_mini.dpatch: New patch to fix to prevent the
- output of (default ) of read_mini() in BATCH mode, if the default
- string is empty.
+ * New upstream release, taken from the upstream SVN repository at
+ gna.org
- -- Jörg Sommer <joerg at alea.gnuu.de> Fri, 7 Sep 2007 21:43:41 +0200
+ * debian/patches/empty_rectangle.dpatch .../fix-warnings.dpatch
+ .../fix-read_mini.dpatch .../update-copyright.dpatch
+ + Removed these patches. They are now applied upstream.
+ -- Jörg Sommer <joerg at alea.gnuu.de> Thu, 4 Oct 2007 16:07:55 +0200
+
jed (1:0.99.19~pre95-2) experimental; urgency=low
* debian/patches/fix-update-before-key-hook.dpatch: The LASTKEY
Modified: jed/branches/0.99.19/debian/patches/00list
===================================================================
--- jed/branches/0.99.19/debian/patches/00list 2007-10-03 12:12:31 UTC (rev 912)
+++ jed/branches/0.99.19/debian/patches/00list 2007-10-04 14:17:03 UTC (rev 913)
@@ -16,12 +16,8 @@
remove_jed_library_path
fix-multi-key
slang2
-fix-warnings
-empty_rectangle
fix-documentation
-update-copyright
fix-update-before-key-hook
extend-jed_faq
fix-help.sl
extend-help.sl
-fix-read_mini
Deleted: jed/branches/0.99.19/debian/patches/empty_rectangle.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/empty_rectangle.dpatch 2007-10-03 12:12:31 UTC (rev 912)
+++ jed/branches/0.99.19/debian/patches/empty_rectangle.dpatch 2007-10-04 14:17:03 UTC (rev 913)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## empty_rectangle.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: Improves the string_rectanle to not fail on a empty rectangle, but
-## DP: instert only the text.
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/emacsmsc.sl 0.99.19/lib/emacsmsc.sl
---- 0.99.19~/lib/emacsmsc.sl 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/emacsmsc.sl 2007-06-08 13:07:03.482678222 +0200
-@@ -130,7 +130,10 @@
- variable line = what_line ();
- exchange_point_and_mark ();
- variable nlines = what_line () - line + 1;
-- kill_rect ();
-+ if (what_column() == col)
-+ pop_mark(0);
-+ else
-+ kill_rect ();
- goto_line (line);
- loop (nlines)
- {
Deleted: jed/branches/0.99.19/debian/patches/fix-read_mini.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-read_mini.dpatch 2007-10-03 12:12:31 UTC (rev 912)
+++ jed/branches/0.99.19/debian/patches/fix-read_mini.dpatch 2007-10-04 14:17:03 UTC (rev 913)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-read_mini.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: In BATCH mode read_mini() should not print (default %s) if the default
-## DP: value is an empty sting. This is also the behaviour in interactive mode.
-
- at DPATCH@
-diff -urNad 0.99.19~/src/misc.c 0.99.19/src/misc.c
---- 0.99.19~/src/misc.c 2006-06-03 18:27:52.000000000 +0200
-+++ 0.99.19/src/misc.c 2007-07-10 14:54:27.489639345 +0200
-@@ -276,7 +276,7 @@
- {
- if (prompt != NULL)
- fputs (prompt, stdout);
-- if (deflt != NULL)
-+ if ((deflt != NULL) && (*deflt != 0))
- fprintf (stdout, "(default %s)", deflt);
-
- fflush (stdout);
Deleted: jed/branches/0.99.19/debian/patches/fix-warnings.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/fix-warnings.dpatch 2007-10-03 12:12:31 UTC (rev 912)
+++ jed/branches/0.99.19/debian/patches/fix-warnings.dpatch 2007-10-04 14:17:03 UTC (rev 913)
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-warnings.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: If compiling the code with gcc -Wformat=2 -Wunused -Wundef -Wextra -Wall
-## DP: some warnings are printed:
-## DP: src/screen.c: In function ‘display_line_numbers’:
-## DP: src/screen.c:351: warning: format not a string literal, argument types not checked
-## DP: src/mouse.c: In function ‘do_mouse_cmd’:
-## DP: src/mouse.c:403: warning: ‘linenum’ may be used uninitialized in this function
-## DP: src/xterm.c: In function ‘load_font’:
-## DP: src/xterm.c:1667: warning: missing sentinel in function call
-
- at DPATCH@
-diff -urNad 0.99.19~/src/mouse.c 0.99.19/src/mouse.c
---- 0.99.19~/src/mouse.c 2006-03-26 00:55:45.000000000 +0100
-+++ 0.99.19/src/mouse.c 2007-05-25 17:19:40.270248336 +0200
-@@ -400,7 +400,7 @@
- static int do_mouse_cmd (JMouse_Type *jmouse, unsigned int type) /*{{{*/
- {
- int button, shift;
-- int linenum, column, is_status;
-+ int linenum = -1, column, is_status;
- int ret;
- SLang_Name_Type *fun, *default_fun;
- Jed_Buffer_Hook_Type *h = CBuf->buffer_hooks;
-diff -urNad 0.99.19~/src/screen.c 0.99.19/src/screen.c
---- 0.99.19~/src/screen.c 2007-05-25 16:11:39.000000000 +0200
-+++ 0.99.19/src/screen.c 2007-05-25 17:19:40.270248336 +0200
-@@ -298,7 +298,7 @@
- {
- unsigned int i, imin, imax, linenum;
- Line *line_start, *line;
-- char buf[32], format[32];
-+ char buf[32];
- unsigned int c;
-
- imin = JWindow->sy;
-@@ -328,7 +328,6 @@
- line = line->prev;
- }
-
-- sprintf (format, "%%%dd ", CBuf->line_num_display_size-1);
- SLsmg_set_color (JLINENUM_COLOR);
- c = JWindow->sx;
-
-@@ -348,7 +347,7 @@
- }
-
- SLsmg_gotorc (i, c);
-- sprintf (buf, format, linenum);
-+ sprintf (buf, "%*d", CBuf->line_num_display_size-1, linenum);
- SLsmg_write_string (buf);
-
- line = line->next;
-diff -urNad 0.99.19~/src/xterm.c 0.99.19/src/xterm.c
---- 0.99.19~/src/xterm.c 2007-05-25 17:19:39.838248336 +0200
-+++ 0.99.19/src/xterm.c 2007-05-25 17:19:54.870248336 +0200
-@@ -1664,7 +1664,7 @@
- XFT_FAMILY, XftTypeString, font,
- XFT_SIZE, XftTypeDouble, XWin->face_size,
- XFT_SPACING, XftTypeInteger, XFT_MONO,
-- 0);
-+ NULL);
- if (XWin->xftfont == NULL) return -1;
- XWin->font_name = font;
- XWin->font_height = XWin->xftfont->ascent + XWin->xftfont->descent;
Deleted: jed/branches/0.99.19/debian/patches/update-copyright.dpatch
===================================================================
--- jed/branches/0.99.19/debian/patches/update-copyright.dpatch 2007-10-03 12:12:31 UTC (rev 912)
+++ jed/branches/0.99.19/debian/patches/update-copyright.dpatch 2007-10-04 14:17:03 UTC (rev 913)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## update-copyright.dpatch by Jörg Sommer <joerg at alea.gnuu.de>
-##
-## DP: The year 2007 is missing in the copyright messages of Jed.
-
- at DPATCH@
-diff -urNad 0.99.19~/lib/aboutjed.hlp 0.99.19/lib/aboutjed.hlp
---- 0.99.19~/lib/aboutjed.hlp 2006-07-19 16:44:36.000000000 +0200
-+++ 0.99.19/lib/aboutjed.hlp 2007-06-09 23:16:09.469893086 +0200
-@@ -1,4 +1,4 @@
--Copyright (C) 1994, 1999, 2000-2006 John E. Davis
-+Copyright (C) 1994, 1999, 2000-2007 John E. Davis
- Email comments or suggestions to jed at jedsoft.org.
-
- Jed Home Page:
-diff -urNad 0.99.19~/lib/cpright.hlp 0.99.19/lib/cpright.hlp
---- 0.99.19~/lib/cpright.hlp 2006-02-13 18:51:58.000000000 +0100
-+++ 0.99.19/lib/cpright.hlp 2007-06-09 23:16:09.469893086 +0200
-@@ -11,5 +11,5 @@
- alt.lang.s-lang. To subscribe to the jed-users mailing list, see
- <http://www.jedsoft.org/jed/mailinglists.html>.
-
-- Copyright (C) 1994, 2000-2006 John E. Davis
-+ Copyright (C) 1994, 2000-2007 John E. Davis
- Email comments or suggestions to <jed at jedsoft.org>.
More information about the Pkg-jed-commit
mailing list