Bug#862439: unblock: eterm/0.9.6-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Except for some whitespace change in command.c, the only
difference after applying patches is the one-line #728813
fix in fix-esetroot-on-pseudocolor.patch
This one-line bugfix is the part I would like to see in stretch.
If unblocking this is not acceptable, I can make a t-p-u
(or unstable) upload containing only the #728813 fix on
top of 0.9.6-4.
changelog | 9 +++
patches/command.c.patch | 44 -------------------
patches/fix-esetroot-on-pseudocolor.patch | 14 ++++++
patches/manpage-is-dated-2008-08-17 | 11 ----
patches/manpage-is-dated-2008-08-17.patch | 11 ++++
patches/run-shell-correctly.patch | 16 ++++++
patches/series | 11 ++--
patches/typos-in-eterm-1-in | 31 -------------
patches/typos-in-eterm-1-in.patch | 32 +++++++++++++
patches/typos-in-eterm-reference-html | 13 -----
patches/typos-in-eterm-reference-html.patch | 13 +++++
patches/we-will-do-fine-without-the-build-date | 13 -----
patches/we-will-do-fine-without-the-build-date.patch | 13 +++++
13 files changed, 114 insertions(+), 117 deletions(-)
diff -Nru eterm-0.9.6/debian/changelog eterm-0.9.6/debian/changelog
--- eterm-0.9.6/debian/changelog 2016-03-05 18:22:37.000000000 +0200
+++ eterm-0.9.6/debian/changelog 2017-01-29 20:02:04.000000000 +0200
@@ -1,3 +1,12 @@
+eterm (0.9.6-5) unstable; urgency=medium
+
+ * QA upload.
+ * Rename all patches to have .patch ending.
+ * Fix Esetroot on PseudoColor visual. Closes: #728813.
+ Thanks to Kevin Ryde for the patch.
+
+ -- Santiago Vila <sanvila@debian.org> Sun, 29 Jan 2017 19:02:04 +0100
+
eterm (0.9.6-4) unstable; urgency=medium
* QA upload.
diff -Nru eterm-0.9.6/debian/patches/command.c.patch eterm-0.9.6/debian/patches/command.c.patch
--- eterm-0.9.6/debian/patches/command.c.patch 2016-03-05 18:12:49.000000000 +0200
+++ eterm-0.9.6/debian/patches/command.c.patch 1970-01-01 02:00:00.000000000 +0200
@@ -1,44 +0,0 @@
-Description: Workaround for making Eterm run shell.
-Forwarded: not-needed
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770369
-Author: Arnaud Ceyrolle <aceyrolle@googlemail.com>
-Index: eterm-0.9.6/src/command.c
-===================================================================
---- eterm-0.9.6.orig/src/command.c
-+++ eterm-0.9.6/src/command.c
-@@ -1561,7 +1561,7 @@ get_tty(void)
- * child processes remain alive upon deletion of the window.
- */
- {
-- unsigned short i;
-+ unsigned long i;
- unsigned long max_fds;
-
- /* get number of available file descriptors */
-@@ -2354,7 +2354,7 @@ run_command(char **argv)
- privileges(REVERT);
- }
-
-- /* Permanently revoke all privileges for the child process.
-+ /* Permanently revoke all privileges for the child process.
- Root shells for everyone are tres uncool.... ;^) -- mej */
- #ifdef _HPUX_SOURCE
- setresuid(my_ruid, my_ruid, my_euid);
-@@ -3671,7 +3671,7 @@ main_loop(void)
- D_SCREEN(("Adding %d lines (%d chars); str == %8p, cmdbuf_ptr == %8p, cmdbuf_endp == %8p\n",
- nlines, cmdbuf_ptr - str, str, cmdbuf_ptr, cmdbuf_endp));
- #if FIXME_BLOCK
-- /*
-+ /*
- * iconv() is not my friend. :-( I've tried various things
- * to make this work (including UCS2, SJIS, EUCJ, and
- * WCHAR_T), but nothing has worked. I'm obviously
-@@ -3800,7 +3800,7 @@ v_doPending(void)
-
- /* Write data to the pty as typed by the user, pasted with the mouse,
- * or generated by us in response to a query ESC sequence.
-- * Code stolen from xterm
-+ * Code stolen from xterm
- */
- void
- v_writeBig(int f, char *d, int len)
diff -Nru eterm-0.9.6/debian/patches/fix-esetroot-on-pseudocolor.patch eterm-0.9.6/debian/patches/fix-esetroot-on-pseudocolor.patch
--- eterm-0.9.6/debian/patches/fix-esetroot-on-pseudocolor.patch 1970-01-01 02:00:00.000000000 +0200
+++ eterm-0.9.6/debian/patches/fix-esetroot-on-pseudocolor.patch 2017-01-29 19:06:00.000000000 +0200
@@ -0,0 +1,14 @@
+From: Kevin Ryde <user42_kevin@yahoo.com.au>
+Subject: Fix Esetroot on PseudoColor visual
+Bug-Debian: https://bugs.debian.org/728813
+
+--- a/utils/Esetroot.c
++++ b/utils/Esetroot.c
+@@ -180,6 +180,7 @@
+ }
+ imlib_context_set_display(Xdisplay);
+ imlib_context_set_visual(DefaultVisual(Xdisplay, DefaultScreen(Xdisplay)));
++ imlib_context_set_colormap(DefaultColormap(Xdisplay, DefaultScreen(Xdisplay)));
+ im = imlib_load_image_immediately(fname);
+ if (!im) {
+ fprintf(stderr, "%s: Unable to load image file \"%s\".\n", *argv, fname);
diff -Nru eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17 eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17
--- eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17 2015-09-06 20:23:42.000000000 +0300
+++ eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17 1970-01-01 02:00:00.000000000 +0200
@@ -1,11 +0,0 @@
-From: Santiago Vila <sanvila@debian.org>
-Subject: Hardcode date of Eterm.1 as the timestamp in upstream tarball
-
---- a/doc/Eterm.1.in
-+++ b/doc/Eterm.1.in
-@@ -1,4 +1,4 @@
--.TH ETERM 1 "@DATE@" "X Version 11" "X Tools"
-+.TH ETERM 1 "17 August 2008" "X Version 11" "X Tools"
- .SH NAME
- Eterm - the Enlightened terminal emulator for the X Window System
- .SH SYNOPSIS
diff -Nru eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17.patch eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17.patch
--- eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17.patch 1970-01-01 02:00:00.000000000 +0200
+++ eterm-0.9.6/debian/patches/manpage-is-dated-2008-08-17.patch 2017-01-29 19:02:00.000000000 +0200
@@ -0,0 +1,11 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: Hardcode date of Eterm.1 as the timestamp in upstream tarball
+
+--- a/doc/Eterm.1.in
++++ b/doc/Eterm.1.in
+@@ -1,4 +1,4 @@
+-.TH ETERM 1 "@DATE@" "X Version 11" "X Tools"
++.TH ETERM 1 "17 August 2008" "X Version 11" "X Tools"
+ .SH NAME
+ Eterm - the Enlightened terminal emulator for the X Window System
+ .SH SYNOPSIS
diff -Nru eterm-0.9.6/debian/patches/run-shell-correctly.patch eterm-0.9.6/debian/patches/run-shell-correctly.patch
--- eterm-0.9.6/debian/patches/run-shell-correctly.patch 1970-01-01 02:00:00.000000000 +0200
+++ eterm-0.9.6/debian/patches/run-shell-correctly.patch 2017-01-29 19:05:00.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Workaround for making Eterm run shell.
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/770369
+Author: Arnaud Ceyrolle <aceyrolle@googlemail.com>
+
+--- a/src/command.c
++++ b/src/command.c
+@@ -1561,7 +1561,7 @@
+ * child processes remain alive upon deletion of the window.
+ */
+ {
+- unsigned short i;
++ unsigned long i;
+ unsigned long max_fds;
+
+ /* get number of available file descriptors */
diff -Nru eterm-0.9.6/debian/patches/series eterm-0.9.6/debian/patches/series
--- eterm-0.9.6/debian/patches/series 2016-03-05 18:08:11.000000000 +0200
+++ eterm-0.9.6/debian/patches/series 2017-01-29 19:00:00.000000000 +0200
@@ -1,5 +1,6 @@
-we-will-do-fine-without-the-build-date
-manpage-is-dated-2008-08-17
-typos-in-eterm-1-in
-typos-in-eterm-reference-html
-command.c.patch
+we-will-do-fine-without-the-build-date.patch
+manpage-is-dated-2008-08-17.patch
+typos-in-eterm-1-in.patch
+typos-in-eterm-reference-html.patch
+run-shell-correctly.patch
+fix-esetroot-on-pseudocolor.patch
diff -Nru eterm-0.9.6/debian/patches/typos-in-eterm-1-in eterm-0.9.6/debian/patches/typos-in-eterm-1-in
--- eterm-0.9.6/debian/patches/typos-in-eterm-1-in 2015-09-06 20:23:54.000000000 +0300
+++ eterm-0.9.6/debian/patches/typos-in-eterm-1-in 1970-01-01 02:00:00.000000000 +0200
@@ -1,31 +0,0 @@
-Description: Typos in Eterm.1
-
---- a/doc/Eterm.1.in
-+++ b/doc/Eterm.1.in
-@@ -592,7 +592,7 @@
- The pipe for the PrintScreen function.
- .TP
- .BI \-\-cut-chars " separators"
--The seperators for double-click selection.
-+The separators for double-click selection.
- .TP
- .BI \-\-finished-title " title"
- Specifies the string Eterm should add to its title bar if
-@@ -694,7 +694,7 @@
- ~/.Eterm/themes/<theme_name>/ or @THEMEDIR@/<theme_name>.
-
- Eterm now supports the existence of a user configuration file as a
--suppliment to the theme configuration file. The default name for this
-+supplement to the theme configuration file. The default name for this
- file is user.cfg, and it follows the exact same syntax as any other
- configuration file. It is searched for using the same algorithm used
- for the theme.cfg file, and any settings in the user.cfg will override
-@@ -2255,7 +2255,7 @@
- Presents a dialog box into which the user may enter a search term.
- The default value is set to
- .IR str .
--All occurances of the specified search string are highlighted in the
-+All occurrences of the specified search string are highlighted in the
- scrollback buffer, and Eterm jumps back to the most recent one.
- Searching again with the same keyword will clear the previous
- highlighting.
diff -Nru eterm-0.9.6/debian/patches/typos-in-eterm-1-in.patch eterm-0.9.6/debian/patches/typos-in-eterm-1-in.patch
--- eterm-0.9.6/debian/patches/typos-in-eterm-1-in.patch 1970-01-01 02:00:00.000000000 +0200
+++ eterm-0.9.6/debian/patches/typos-in-eterm-1-in.patch 2017-01-29 19:03:00.000000000 +0200
@@ -0,0 +1,32 @@
+Description: Typos in Eterm.1
+Bug-Debian: https://bugs.debian.org/351426
+
+--- a/doc/Eterm.1.in
++++ b/doc/Eterm.1.in
+@@ -592,7 +592,7 @@
+ The pipe for the PrintScreen function.
+ .TP
+ .BI \-\-cut-chars " separators"
+-The seperators for double-click selection.
++The separators for double-click selection.
+ .TP
+ .BI \-\-finished-title " title"
+ Specifies the string Eterm should add to its title bar if
+@@ -694,7 +694,7 @@
+ ~/.Eterm/themes/<theme_name>/ or @THEMEDIR@/<theme_name>.
+
+ Eterm now supports the existence of a user configuration file as a
+-suppliment to the theme configuration file. The default name for this
++supplement to the theme configuration file. The default name for this
+ file is user.cfg, and it follows the exact same syntax as any other
+ configuration file. It is searched for using the same algorithm used
+ for the theme.cfg file, and any settings in the user.cfg will override
+@@ -2255,7 +2255,7 @@
+ Presents a dialog box into which the user may enter a search term.
+ The default value is set to
+ .IR str .
+-All occurances of the specified search string are highlighted in the
++All occurrences of the specified search string are highlighted in the
+ scrollback buffer, and Eterm jumps back to the most recent one.
+ Searching again with the same keyword will clear the previous
+ highlighting.
diff -Nru eterm-0.9.6/debian/patches/typos-in-eterm-reference-html eterm-0.9.6/debian/patches/typos-in-eterm-reference-html
--- eterm-0.9.6/debian/patches/typos-in-eterm-reference-html 2015-09-06 20:14:01.000000000 +0300
+++ eterm-0.9.6/debian/patches/typos-in-eterm-reference-html 1970-01-01 02:00:00.000000000 +0200
@@ -1,13 +0,0 @@
-Description: Typos in Eterm_reference.html
-
---- a/doc/Eterm_reference.html
-+++ b/doc/Eterm_reference.html
-@@ -1278,7 +1278,7 @@
- </TR>
- <TR>
- <TD><TT>ESC <B>] 6 ; 72</B> [ ;</B> <I>string</I> ] BEL</TT></TD>
-- <TD>Search for and highlight any occurances of <I>string</I> in the
-+ <TD>Search for and highlight any occurrences of <I>string</I> in the
- scrollback buffer.
- </TD>
- </TR>
diff -Nru eterm-0.9.6/debian/patches/typos-in-eterm-reference-html.patch eterm-0.9.6/debian/patches/typos-in-eterm-reference-html.patch
--- eterm-0.9.6/debian/patches/typos-in-eterm-reference-html.patch 1970-01-01 02:00:00.000000000 +0200
+++ eterm-0.9.6/debian/patches/typos-in-eterm-reference-html.patch 2017-01-29 19:04:00.000000000 +0200
@@ -0,0 +1,13 @@
+Description: Typos in Eterm_reference.html
+
+--- a/doc/Eterm_reference.html
++++ b/doc/Eterm_reference.html
+@@ -1278,7 +1278,7 @@
+ </TR>
+ <TR>
+ <TD><TT>ESC <B>] 6 ; 72</B> [ ;</B> <I>string</I> ] BEL</TT></TD>
+- <TD>Search for and highlight any occurances of <I>string</I> in the
++ <TD>Search for and highlight any occurrences of <I>string</I> in the
+ scrollback buffer.
+ </TD>
+ </TR>
diff -Nru eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date
--- eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date 2015-09-06 20:13:39.000000000 +0300
+++ eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date 1970-01-01 02:00:00.000000000 +0200
@@ -1,13 +0,0 @@
-From: Santiago Vila <sanvila@debian.org>
-Subject: Do not use the build date
-
---- a/src/options.c
-+++ b/src/options.c
-@@ -405,7 +405,6 @@
- printf("Copyright (c) 1997-2009, " AUTHORS "\n\n");
-
- printf("Build info:\n");
-- printf(" Built on " BUILD_DATE "\n");
- printf(" " ACTIONS_IDENT "\n"
- " " BUTTONS_IDENT "\n"
- " " COMMAND_IDENT "\n"
diff -Nru eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date.patch eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date.patch
--- eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date.patch 1970-01-01 02:00:00.000000000 +0200
+++ eterm-0.9.6/debian/patches/we-will-do-fine-without-the-build-date.patch 2017-01-29 19:01:00.000000000 +0200
@@ -0,0 +1,13 @@
+From: Santiago Vila <sanvila@debian.org>
+Subject: Do not use the build date
+
+--- a/src/options.c
++++ b/src/options.c
+@@ -405,7 +405,6 @@
+ printf("Copyright (c) 1997-2009, " AUTHORS "\n\n");
+
+ printf("Build info:\n");
+- printf(" Built on " BUILD_DATE "\n");
+ printf(" " ACTIONS_IDENT "\n"
+ " " BUTTONS_IDENT "\n"
+ " " COMMAND_IDENT "\n"
Reply to: