Imported Debian patch 4.0.3-14debian/4.0.3-14

8 files changed, 225 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index c1f361f..71a159c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+screen (4.0.3-14) unstable; urgency=low
+
+  * Cherry-pick a few upstream commits:
+    * f6b50e17 (create windows in detached session, closes: #466072).
+    * 97708d58 (vertical split documentation, closes: #525998).
+    * bb04008e (report session identifier on detach, closes: #199747).
+  * Slightly adjust Homepage field.
+  * Add support for build option 'noopt'.
+  * Bump Standards version to 3.8.2, no changes.
+  * Specify GPL version in d/copyright.
+
+ -- Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>  Tue, 28 Jul 2009 13:21:24 +0200
+
 screen (4.0.3-13) unstable; urgency=low
 
   * Sync with Ubuntu, closes: #520359. New dpatches:
diff --git a/debian/control b/debian/control
index 9522e71..53a5587 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: misc
 Priority: optional
 Maintainer: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de>
 Uploaders: Adam Lazur <zal@debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Build-Depends: libncursesw5-dev, texinfo, libpam0g-dev, debhelper (>> 7), dpatch
-Homepage: http://www.gnu.org/software/screen
+Homepage: http://savannah.gnu.org/projects/screen
 
 Package: screen
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 4e6529a..33cceff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This is the Debian prepackaged version of screen, a screen manager with
 VT100/ANSI terminal emulation.
 
 This package was put together from sources obtained from:
-  ftp://ftp.uni-erlangen.de/pub/utilities/screen
+  http://savannah.gnu.org/projects/screen
 
 See the info documentation for contact information for the upstream authors.
 
@@ -28,8 +28,8 @@ License:
 	with this program; if not, write to the Free Software Foundation, Inc.,
 	51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-On Debian systems, the complete text of the GNU General Public License can
-be found in /usr/share/common-licenses/GPL file.
+On Debian systems, the complete text of the GNU General Public License, version 2
+can be found in /usr/share/common-licenses/GPL-2.
 
 Debian Modifications:
   Copyright (C) 1996 Ian Murdock <imurdock@debian.org>
diff --git a/debian/patches/00list b/debian/patches/00list
index 2eb485f..2145d1c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,12 +1,15 @@
 # before doing anything else, advance to CVS HEAD
 01CVS
-# 01-09: fixes to configure, altering preprocessor macros etc.
+# 01-08: fixes to configure, altering preprocessor macros etc.
 01configure_fix_alpha_vsprintf
 02configure_use_ncursesw
 03fully_expand_screenencodings
 04AUTOCONF
 05fix_osdef_include
-## <06 REMOVED>
+# 09   : Cherry-picked upstream commits
+09CHERRY_f6b50e17
+09CHERRY_97708d58
+09CHERRY_bb04008e
 # 10-49: "regular" code and documentation fixes
 10norootpassword
 11replace_doc_paths
diff --git a/debian/patches/09CHERRY_97708d58.dpatch b/debian/patches/09CHERRY_97708d58.dpatch
new file mode 100644
index 0000000..157952f
--- /dev/null
+++ b/debian/patches/09CHERRY_97708d58.dpatch
@@ -0,0 +1,94 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09CHERRY_97708d58.dpatch
+##
+## DP: Cherry-pick commit 97708d5800ac845b4c3a25d96d544f0dafa735d7
+## DP: (documentation for the vertical split feature).
+
+@DPATCH@
+diff --git a/doc/screen.1 b/doc/screen.1
+index 80c6483..b781e3a 100644
+--- a/doc/screen.1
++++ b/doc/screen.1
+@@ -509,7 +509,7 @@ automatic margins on and off).
+ .PD
+ Send a control-s to the current window.
+ .IP "\fBC-a S\fP	(split)"
+-Split the current region into two new ones.
++Split the current region horizontally into two new ones.
+ See also \fIonly, remove, focus\fP.
+ .IP "\fBC-a t\fP"
+ .PD 0
+@@ -582,6 +582,8 @@ Shows where
+ comes from, where it went to and why you can use it.
+ .IP "\fBC-a _\fP	(silence)"
+ Start/stop monitoring the current window for inactivity.
++.IP "\fBC-a |\fP	(split -v)"
++Split the current region vertically into two new ones.
+ .IP "\fBC-a *\fP	(displays)"
+ Show a listing of all currently attached displays.
+ 
+@@ -2729,12 +2731,13 @@ The default is currently \*Q=s dd\*U (standout, default colors).
+ .sp
+ .ne 3
+ .B split
++.RB [ -v ]
+ .PP
+ Split the current region into two new ones. All regions on the
+ display are resized to make room for the new region. The blank
+-window is displayed on the new region. Use the \*Qremove\*U or the
+-\*Qonly\*U command to delete regions.
+-Use \*Qfocus\*U to toggle between regions.
++window is displayed on the new region. Splits are made horizontally
++unless -v is used. Use the \*Qremove\*U or the \*Qonly\*U command
++to delete regions. Use \*Qfocus\*U to toggle between regions.
+ .sp
+ .ne 3
+ .B "startup_message on\fP|\fBoff"
+diff --git a/doc/screen.texinfo b/doc/screen.texinfo
+index 1acabe2..cfcbafe 100644
+--- a/doc/screen.texinfo
++++ b/doc/screen.texinfo
+@@ -705,7 +705,7 @@ Send a ^S (ASCII XOFF) to the current window.  @xref{XON/XOFF}.
+ 
+ @item @kbd{C-a S}
+ (split)@*
+-Split the current region into two new ones.  @xref{Regions}.
++Split the current region horizontally into two new ones.  @xref{Regions}.
+ 
+ @item @kbd{C-a t}
+ @itemx @kbd{C-a C-t}
+@@ -799,6 +799,10 @@ Delete the screen-exchange file.  @xref{Screen Exchange}.
+ (silence)@*
+ Start/stop monitoring the current window for inactivity. @xref{Silence},
+ 
++@item @kbd{C-a |}
++(split -v)@*
++Split the current region vertically into two new ones.  @xref{Regions}.
++
+ @item @kbd{C-a ,}
+ (license)@*
+ Show the copyright page.
+@@ -1808,11 +1812,20 @@ which can contain different windows.
+ @node Split, Focus,  , Regions
+ @section Split
+ @kindex S
+-@deffn Command split
+-(@kbd{C-a S})@*
++@kindex |
++@deffn Command split [-v]
++(@kbd{C-a S}, @kbd{C-a |})@*
+ Split the current region into two new ones. All regions on the
+ display are resized to make room for the new region. The blank
+-window is displayed on the new region.
++window is displayed on the new region. The default is to create
++a horizontal split, putting the new regions on the top and
++bottom of each other. Using -v will create a vertical split,
++causing the new regions to appear side by side of each other.
++
++With this current implementation of @code{screen}, scrolling data
++will appear much slower in a vertically splited region than one
++that is not. This should be taken into consideration if you need
++to use system commands such as @code{cat} or @code{tail -f}.
+ @end deffn
+ 
+ @node Focus, Only, Split, Regions
diff --git a/debian/patches/09CHERRY_bb04008e.dpatch b/debian/patches/09CHERRY_bb04008e.dpatch
new file mode 100644
index 0000000..6c5f8f7
--- /dev/null
+++ b/debian/patches/09CHERRY_bb04008e.dpatch
@@ -0,0 +1,75 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09CHERRY_bb04008e.dpatch
+##
+## DP: Cherry-pick commit bb04008e82e2820cc2c20ee0668818a5884280d9
+## DP: (report session identifier on detach).
+
+@DPATCH@
+diff --git a/screen.c b/screen.c
+index e1fb3f0..8160a73 100644
+--- a/screen.c
++++ b/screen.c
+@@ -1832,6 +1832,17 @@ int mode;
+   if (display == 0)
+     return;
+ 
++#define AddStrSock(msg) do { \
++    if (SockName) \
++      { \
++	AddStr("[" msg " from "); \
++	AddStr(SockName); \
++	AddStr("]\r\n"); \
++      } \
++    else \
++      AddStr("[" msg "]\r\n"); \
++  } while (0)
++
+   signal(SIGHUP, SIG_IGN);
+   debug1("Detach(%d)\n", mode);
+   if (D_status)
+@@ -1845,7 +1856,7 @@ int mode;
+       sign = SIG_BYE;
+       break;
+     case D_DETACH:
+-      AddStr("[detached]\r\n");
++      AddStrSock("detached");
+       sign = SIG_BYE;
+       break;
+ #ifdef BSDJOBS
+@@ -1855,14 +1866,14 @@ int mode;
+ #endif
+ #ifdef REMOTE_DETACH
+     case D_REMOTE:
+-      AddStr("[remote detached]\r\n");
++      AddStrSock("remote detached");
+       sign = SIG_BYE;
+       break;
+ #endif
+ #ifdef POW_DETACH
+     case D_POWER:
+-      AddStr("[power detached]\r\n");
+-      if (PowDetachString) 
++      AddStrSock("power detached");
++      if (PowDetachString)
+ 	{
+ 	  AddStr(PowDetachString);
+ 	  AddStr("\r\n");
+@@ -1871,8 +1882,8 @@ int mode;
+       break;
+ #ifdef REMOTE_DETACH
+     case D_REMOTE_POWER:
+-      AddStr("[remote power detached]\r\n");
+-      if (PowDetachString) 
++      AddStrSock("remote power detached");
++      if (PowDetachString)
+ 	{
+ 	  AddStr(PowDetachString);
+ 	  AddStr("\r\n");
+@@ -1948,6 +1959,7 @@ int mode;
+   debug2("Detach: Signal %d to Attacher(%d)!\n", sign, pid);
+   debug("Detach returns, we are successfully detached.\n");
+   signal(SIGHUP, SigHup);
++#undef AddStrSock
+ }
+ 
+ static int
diff --git a/debian/patches/09CHERRY_f6b50e17.dpatch b/debian/patches/09CHERRY_f6b50e17.dpatch
new file mode 100644
index 0000000..2aa36ff
--- /dev/null
+++ b/debian/patches/09CHERRY_f6b50e17.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09CHERRY_f6b50e17.dpatch
+##
+## DP: Cherry-pick commit f6b50e175bc39763c4660cc88d7f82e5811797de
+## DP: (do not enforce the existence of a display, see #466072).
+
+@DPATCH@
+diff --git a/socket.c b/socket.c
+index 09aa73d..4c32ed5 100644
+--- a/socket.c
++++ b/socket.c
+@@ -1102,12 +1097,8 @@ ReceiveMsg()
+        * the window that issued the create message need not be an active
+        * window. Then we create the window without having a display.
+        * Resulting in another inactive window.
+-       * 
+-       * Currently we enforce that at least one display exists. But why?
+-       * jw.
+        */
+-      if (displays)
+-	ExecCreate(&m);
++      ExecCreate(&m);
+       break;
+     case MSG_CONT:
+ 	if (display && D_userpid != 0 && kill(D_userpid, 0) == 0)
diff --git a/debian/rules b/debian/rules
index 549b3f1..5762708 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,12 @@ ROOT := $(CURDIR)/debian/$(package)
 # statically define this... sucko
 TTYGROUP := 5
 
+ifeq ($(findstring noopt,$(DEB_BUILD_OPTIONS)),noopt)
+CC_OPTFLAGS := -O0 -g3
+else
+CC_OPTFLAGS := -O2 -g
+endif
+
 clean: unpatch
 	dh_testdir
 	dh_testroot
@@ -43,8 +49,8 @@ configure-stamp: patch-stamp
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) CFLAGS+='-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers'
-	$(MAKE) CFLAGS+='-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers' -C doc
+	$(MAKE) CFLAGS+='$(CC_OPTFLAGS) -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers'
+	$(MAKE) CFLAGS+='$(CC_OPTFLAGS) -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers' -C doc
 	touch $@
 
 install: install-stamp