[kernel] r15051 - in people/waldi/s390/s390-tools/debian: . patches

[Bastian Blank]

Author: waldi
Date: Wed Jan 27 17:55:08 2010
New Revision: 15051

Log:
* debian/changelog: Update.
* debian/patches/install-iucvterm.patch
  - Move iucvtty to /sbin.
  - Move iucvtty manpage to section 8.
* debian/patches/series: Add new patch.
* debian/s390-tools.install: Add iucvtty.

Added:
   people/waldi/s390/s390-tools/debian/patches/install-iucvterm.patch
Modified:
   people/waldi/s390/s390-tools/debian/changelog
   people/waldi/s390/s390-tools/debian/patches/series
   people/waldi/s390/s390-tools/debian/s390-tools.install

Modified: people/waldi/s390/s390-tools/debian/changelog
==============================================================================
--- people/waldi/s390/s390-tools/debian/changelog	Wed Jan 27 17:53:39 2010	(r15050)
+++ people/waldi/s390/s390-tools/debian/changelog	Wed Jan 27 17:55:08 2010	(r15051)
@@ -8,6 +8,7 @@
   * Don't install the scripts dbginfo.sh, scsi_logging_level and zfcpdbf.
   * Install ipl tools.
   * Install iucv terminal tools.
+    - Move iucvtty to /sbin, it is a getty to be called from inittab.
 
   [ Frans Pop ]
   * lstape, chccwdev: use bash as shell. Closes: #566675.

Added: people/waldi/s390/s390-tools/debian/patches/install-iucvterm.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ people/waldi/s390/s390-tools/debian/patches/install-iucvterm.patch	Wed Jan 27 17:55:08 2010	(r15051)
@@ -0,0 +1,76 @@
+--- a/iucvterm/src/Makefile
++++ b/iucvterm/src/Makefile
+@@ -10,12 +10,16 @@
+ CPPFLAGS += -DUSE_NLS -DGETTEXT_TEXTDOMAIN=\"$(GETTEXT_TEXTDOMAIN)\"
+ #CPPFLAGS += -D__DEBUG__
+ 
+-PROGRAMS = iucvconn iucvtty
++PROGRAMS_SBIN = iucvtty
++PROGRAMS_USRBIN = iucvconn
++PROGRAMS = $(PROGRAMS_SBIN) $(PROGRAMS_USRBIN)
+ 
+ all: $(PROGRAMS)
+ check:
+ install:
+-	$(INSTALL) $(PROGRAMS) $(USRBINDIR)
++	$(INSTALL) -d $(BINDIR) $(USRBINDIR)
++	$(INSTALL) $(PROGRAMS_SBIN) $(BINDIR)
++	$(INSTALL) $(PROGRAMS_USRBIN) $(USRBINDIR)
+ 
+ clean:
+ 	-rm -f *.o $(PROGRAMS)
+--- a/iucvterm/doc/Makefile
++++ b/iucvterm/doc/Makefile
+@@ -2,7 +2,10 @@
+ 
+ include ../../common.mak
+ 
+-MANS = iucvconn.1 iucvtty.1 ts-shell.1 hvc_iucv.9 chiucvallow.8
++MANS = iucvconn.1 iucvtty.8 ts-shell.1 hvc_iucv.9 chiucvallow.8
++
++iucvtty.8: iucvtty.1
++	ln -s $< $@
+ 
+ all:
+ 
+@@ -17,6 +20,7 @@
+ 	done
+ 
+ clean:
++	rm iucvtty.8
+ 
+ pdf: $(MANS)
+ 	for man in $(MANS); do \
+--- a/iucvterm/doc/iucvtty.1
++++ b/iucvterm/doc/iucvtty.1
+@@ -1,10 +1,10 @@
+-.\" iucvtty.1
++.\" iucvtty.8
+ .\"
+ .\"
+ .\" Copyright IBM Corp. 2008, 2009.
+ .\" Author(s): Hendrik Brueckner <brueckner at linux.vnet.ibm.com>
+ .\" ----------------------------------------------------------------------
+-.TH iucvtty "1" "March 2009" "s390-tools" "IUCV terminal applications"
++.TH iucvtty "8" "March 2009" "s390-tools" "IUCV terminal applications"
+ .LO 8
+ .
+ .ds t \fBiucvtty\fP
+@@ -139,7 +139,7 @@
+ .ft CW
+ .in +0.25in
+ .nf
+-t1:2345:respawn:/usr/bin/iucvtty lnxterm
++t1:2345:respawn:/sbin/iucvtty lnxterm
+ .fi
+ .in -0.25in
+ .ft
+@@ -150,7 +150,7 @@
+ .ft CW
+ .in +0.25in
+ .nf
+-s1:S:respawn:/usr/bin/iucvtty suterm -- /sbin/sulogin
++s1:S:respawn:/sbin/iucvtty suterm -- /sbin/sulogin
+ .fi
+ .in -0.25in
+ .ft

Modified: people/waldi/s390/s390-tools/debian/patches/series
==============================================================================
--- people/waldi/s390/s390-tools/debian/patches/series	Wed Jan 27 17:53:39 2010	(r15050)
+++ people/waldi/s390/s390-tools/debian/patches/series	Wed Jan 27 17:55:08 2010	(r15051)
@@ -1,6 +1,7 @@
 common-cflags.patch
 error.patch
 install.patch
+install-iucvterm.patch
 disable.patch
 zipl-optional.patch
 bashism.patch

Modified: people/waldi/s390/s390-tools/debian/s390-tools.install
==============================================================================
--- people/waldi/s390/s390-tools/debian/s390-tools.install	Wed Jan 27 17:53:39 2010	(r15050)
+++ people/waldi/s390/s390-tools/debian/s390-tools.install	Wed Jan 27 17:55:08 2010	(r15051)
@@ -26,7 +26,9 @@
 
 # iucvterm
 /usr/bin/iucvconn
+/sbin/iucvtty
 /usr/share/man/man1/iucvconn.1
+/usr/share/man/man8/iucvtty.8
 
 # qetharp
 /sbin/qetharp