diff -u screen-4.0.3/debian/changelog screen-4.0.3/debian/changelog --- screen-4.0.3/debian/changelog +++ screen-4.0.3/debian/changelog @@ -1,3 +1,11 @@ +screen (4.0.3-11ubuntu3) jaunty; urgency=low + + * debian/patches/56-source-file-not-found-warning.dpatch: When sourcing a + file in a screenrc which is not found, fail more gracefully by not + interrupting normal operation; instead, print a debug message. LP: #323756 + + -- Dustin Kirkland Sun, 01 Feb 2009 20:46:03 +0100 + screen (4.0.3-11ubuntu2) jaunty; urgency=low * debian/control: recommend screen-profiles diff -u screen-4.0.3/debian/patches/00list screen-4.0.3/debian/patches/00list --- screen-4.0.3/debian/patches/00list +++ screen-4.0.3/debian/patches/00list @@ -37,0 +38 @@ +56-source-file-not-found-warning.dpatch only in patch2: unchanged: --- screen-4.0.3.orig/debian/patches/56-source-file-not-found-warning.dpatch +++ screen-4.0.3/debian/patches/56-source-file-not-found-warning.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 56-source-file-not-found-warning.dpatch +## by Dustin Kirkland +## +## DP: sourcing a file that's not found should fail more gracefully, +## DP: by emitting a debug message rather than a work-flow-interrupting +## DP: error message directly to the screen +## DP: https://bugs.launchpad.net/ubuntu/+source/screen/+bug/323756 + +@DPATCH@ +--- screen-4.0.3/fileio.c 2003-09-08 16:25:28.000000000 +0200 ++++ screen-4.0.3/fileio.c.new 2009-02-01 20:15:12.479816708 +0100 +@@ -261,7 +261,7 @@ char *rcfilename; + if ((fp = secfopen(rc_name, "r")) == NULL) + { + if (rc_recursion) +- Msg(errno, "%s: source %s", oldrc_name, rc_name); ++ debug2("%s: source %s\n", oldrc_name, rc_name); + else if (RcFileName && !strcmp(RcFileName, rc_name)) + { + /*