diff options
author | Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> | 2007-08-30 18:31:53 +0200 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2011-09-03 14:05:30 +0200 |
commit | eda6bb153399adbd1aa3dbc9c2f5bcb62d1a7280 (patch) | |
tree | 2faf8416f69bdd131826f579a53932aa7bfefae2 | |
parent | 36d81cb7e914b53be85296259c8d2c82d455fec2 (diff) | |
download | screen-eda6bb153399adbd1aa3dbc9c2f5bcb62d1a7280.tar.gz |
Imported Debian patch 4.0.3-4debian/4.0.3-4
37 files changed, 273 insertions, 839 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index beec65a..cd7fb4a 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,5 +1,3 @@ -$Id: README.Debian,v 1.9 2003/10/08 11:39:03 zal Exp $ - Screen Information ------------------ See the copyright file for information about where to get screen, licensing, @@ -16,6 +14,22 @@ Debian Modifications Debian Screen Q&A ----------------- +Q: The last upgrade said it changed the socket directory to /tmp/.screen, but + all I see is a symlink back to the old location - is that intentional? + +A: Because /var/run and /tmp might live on different filesystems (especially + /var/run may be on some kind of volatile filesystem like shmfs), screen's + socket directory cannot simply be moved around, as that would break existing + screen sessions. + + Upon upgrade the installation scripts install a symlink so further invo- + cations of screen (which already have the new location compiled in) can + continue to access the existing sessions, and create new ones under the old + location. The next time the initscript is called in order to clean up the + socket directory (i.e. usually at the next reboot), this state is detected + and cleaned up, making /tmp/.screen a proper directory. + + Q: shift+page up in xterm/gnome-terminal/konsole used to let me scroll back a bit, but now it doesn't. How can I make it work with scrollback? diff --git a/debian/changelog b/debian/changelog index 5acfe3a..dbbbcd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +screen (4.0.3-4) unstable; urgency=low + + * Take 4: The "the FHS is a fine thing after all" release. + * Move example config files into /usr/share/doc/screen/examples. + * Move fifo dir from /var/run/screen to /tmp/.screen. Closes: #214796. + Create preinst to make the upgrade fail early (i.e. before the unpack + phase) if /tmp/.screen is otherwise occupied. + Add another Q&A pair to README.Debian to explain how all this is done. + * Redo 11replace_doc_paths.dpatch from scratch due to these reorganisations. + * Drop po/ subdirectory (after dropping debconf usage in 4.0.3-1). + Closes: #440725 (sorry). Closes: #440410. + Also stop calling dh_installdebconf. + * Update the FSF address in the source files. + + -- Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> Thu, 30 Aug 2007 18:31:53 +0200 + screen (4.0.3-3) unstable; urgency=low * Take 3: The "less bugreports than upstream" release. Whew. diff --git a/debian/control b/debian/control index 9fa1631..a9d3108 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Build-Depends: libncursesw5-dev, texinfo, libpam0g-dev, debhelper (>> 5), dpatch Package: screen Architecture: any -Depends: ${shlibs:Depends} -Description: a terminal multiplexor with VT100/ANSI terminal emulation +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: terminal multiplexor with VT100/ANSI terminal emulation screen is a terminal multiplexor that runs several separate "screens" on a single physical character-based terminal. Each virtual terminal emulates a DEC VT100 plus several ANSI X3.64 and ISO 2022 functions. Screen sessions diff --git a/debian/copyright b/debian/copyright index 52081d4..4e6529a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ See the info documentation for contact information for the upstream authors. License: - screen - a terminal multiplexor with VT100/ANSI terminal emulation + screen - terminal multiplexor with VT100/ANSI terminal emulation Copyright (C) 1987 Oliver Laumann Copyright (C) 1991 Wayne Davidson Copyright (C) 1993-2006 Juergen Weigert <jnweiger@immd4.informatik.uni-erlangen.de> diff --git a/debian/docs b/debian/docs index 645d9f9..3536f8e 100644 --- a/debian/docs +++ b/debian/docs @@ -4,7 +4,5 @@ TODO doc/FAQ doc/fdpat.ps doc/window_to_display.ps -etc/screenrc -etc/etcscreenrc terminfo debian/README.Debian diff --git a/debian/examples b/debian/examples new file mode 100644 index 0000000..8037475 --- /dev/null +++ b/debian/examples @@ -0,0 +1,2 @@ +etc/screenrc +etc/etcscreenrc diff --git a/debian/init b/debian/init index ad7601d..ff7de01 100644 --- a/debian/init +++ b/debian/init @@ -15,17 +15,19 @@ set -e -SCREENDIR=/var/run/screen +SCREENDIR=/tmp/.screen case "$1" in start) + rm -rf /var/run/screen if ! test -d $SCREENDIR; then + rm -f $SCREENDIR mkdir $SCREENDIR chown root:utmp $SCREENDIR fi find $SCREENDIR -type p -print0 | xargs -0r rm -f -- # If the local admin has used dpkg-statoverride to install screen setuid, -# change the permissions of /var/run/screen accordingly +# change the permissions of $SCREENDIR accordingly if [ `stat -c%a /usr/bin/screen` -ge 4000 ]; then chmod 0755 $SCREENDIR else diff --git a/debian/patches/00list b/debian/patches/00list index 78955c3..b23eab6 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -18,4 +18,6 @@ 22no_public_exchange 23exitcode_q_ls 24option_parser +25allow_symlink_sockdir +30fix_fsf_address 50EXP_tilde_expansion diff --git a/debian/patches/11replace_doc_paths.dpatch b/debian/patches/11replace_doc_paths.dpatch index 0b47f74..c8c7c34 100644 --- a/debian/patches/11replace_doc_paths.dpatch +++ b/debian/patches/11replace_doc_paths.dpatch @@ -5,8 +5,8 @@ ## DP: locations Debian uses. @DPATCH@ ---- screen-4.0.3.orig/doc/screen.1 2007-07-23 23:15:03.000000000 +0200 -+++ screen-4.0.3/doc/screen.1 2007-07-23 23:15:13.000000000 +0200 +--- screen-4.0.3.orig/doc/screen.1 2007-08-11 02:22:31.000000000 +0200 ++++ screen-4.0.3/doc/screen.1 2007-08-11 02:40:07.000000000 +0200 @@ -99,7 +99,7 @@ The above example would start the emacs editor (editing prog.c) and switch to its window. @@ -25,16 +25,24 @@ This can also be defined through the \*Qdeflogin\*U .screenrc command. .TP 5 .BR \-ls " and " \-list -@@ -581,7 +581,7 @@ +@@ -580,8 +580,8 @@ + .SH CUSTOMIZATION - The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to +-The \*Qsocket directory\*U defaults either to $HOME/.screen or simply to -/tmp/screens or preferably to /usr/local/screens chosen at compile-time. If -+/tmp/screens or preferably to /var/run/screen chosen at compile-time. If ++The \*Qsocket directory\*U defaults to $HOME/.screen or /tmp/screens, ++but this can be overridden by the compile-time constant SOCKDIR. If .I screen is installed setuid-root, then the administrator should compile -@@ -594,7 +594,7 @@ +@@ -590,11 +590,13 @@ + .I screen + is not running setuid-root, the user can specify any mode 700 directory + in the environment variable $SCREENDIR. ++.B Note: ++Debian uses /tmp/.screen as socket directory - see \*QFILES\*Q below. + .PP When .I screen is invoked, it executes initialization commands from the files @@ -43,7 +51,19 @@ \*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's defaults\*U that can be overridden in the following ways: for the global screenrc file -@@ -1669,7 +1669,7 @@ +@@ -623,8 +625,9 @@ + variable substitution shall be performed. A string in single-quotes is also + protected from variable substitution. + .PP +-Two configuration files are shipped as examples with your screen distribution: +-\*Qetc/screenrc\*U and \*Qetc/etcscreenrc\*U. They contain a number of ++Two configuration files are shipped as examples with your screen distribution ++and installed into /usr/share/doc/screen/examples: ++\*Qscreenrc\*U and \*Qetcscreenrc\*U. They contain a number of + useful examples for various commands. + .PP + Customization can also be done 'on-line'. To enter the command mode type +@@ -1669,7 +1672,7 @@ The echo command may be used to annoy .I screen users with a 'message of the @@ -52,7 +72,24 @@ The option \*Q-n\*U may be used to suppress the line feed. See also \*Qsleep\*U. Echo is also useful for online checking of environment variables. -@@ -4416,14 +4416,14 @@ +@@ -2080,7 +2083,7 @@ + .B lockscreen + .PP + Lock this display. +-Call a screenlock program (/local/bin/lck or /usr/bin/lock or a builtin if no ++Call a screenlock program (/usr/bin/lck or /usr/bin/lock or a builtin if no + other is available). Screen does not accept any command keys until this program + terminates. Meanwhile processes in the windows may continue, as the windows + are in the `detached' state. The screenlock program may be changed through the +@@ -4410,27 +4413,23 @@ + + .SH FILES + .PD 0 +-.IP .../screen-4.?.??/etc/screenrc 34 +-.IP .../screen-4.?.??/etc/etcscreenrc ++.IP /usr/share/doc/screen/examples/screenrc 34 ++.IP /usr/share/doc/screen/examples/etcscreenrc + Examples in the .I screen distribution package for private and global initialization files. .IP $SYSSCREENRC @@ -66,11 +103,18 @@ +Read in after /etc/screenrc .IP $SCREENDIR/S-<login> -.IP /local/screens/S-<login> -+.IP /var/run/screen/S-<login> ++.IP /tmp/.screen/S-<login> Socket directories (default) - .IP /usr/tmp/screens/S-<login> - Alternate socket directories. -@@ -4442,7 +4442,7 @@ +-.IP /usr/tmp/screens/S-<login> +-Alternate socket directories. + .IP "<socket directory>/.termcap" + Written by the "termcap" output function +-.IP /usr/tmp/screens/screen-exchange +-or + .IP /tmp/screen-exchange + .I screen + `interprocess communication buffer' +@@ -4442,7 +4441,7 @@ or .IP /etc/termcap Terminal capability databases @@ -79,7 +123,7 @@ Login records .IP $LOCKPRG Program that locks a terminal. -@@ -4555,9 +4555,9 @@ +@@ -4555,9 +4554,9 @@ must be installed as set-uid with owner root on most systems in order to be able to correctly change the owner of the tty device file for each window. @@ -91,8 +135,8 @@ .I screen is killed with SIGKILL. This will cause some programs (like "w" or "rwho") ---- screen-4.0.3.orig/doc/screen.texinfo 2007-07-23 23:15:06.000000000 +0200 -+++ screen-4.0.3/doc/screen.texinfo 2007-07-23 23:15:14.000000000 +0200 +--- screen-4.0.3.orig/doc/screen.texinfo 2007-08-11 02:22:32.000000000 +0200 ++++ screen-4.0.3/doc/screen.texinfo 2007-08-11 02:45:01.000000000 +0200 @@ -176,7 +176,7 @@ variable) who will use it to create the new window. The above example would start the @code{emacs} editor (editing @file{prog.c}) and switch to its window. @@ -120,7 +164,28 @@ following ways: For the global screenrc file @code{screen} searches for the environment variable @code{$SYSSCREENRC} (this override feature may be disabled at -@@ -997,7 +997,7 @@ +@@ -469,7 +469,8 @@ + single-quotes is also protected from variable substitution. + + Two configuration files are shipped as examples with your screen +-distribution: @file{etc/screenrc} and @file{etc/etcscreenrc}. They ++distribution and installed into /usr/share/doc/screen/examples: ++@file{screenrc} and @file{etcscreenrc}. They + contain a number of useful examples for various commands. + + @node Source, Colon, Startup Files, Customization +@@ -512,8 +513,8 @@ + (@pxref{Customization}). As of version 3.3, all commands can be bound + to keys, although some may be less useful than others. + For a number of real life working examples of the most important +-commands see the files @file{etc/screenrc} and @file{etc/etcscreenrc} +-of your screen distribution. ++commands see the files @file{/usr/share/doc/screen/examples/screenrc} ++and @file{/usr/share/doc/screen/examples/etcscreenrc}. + + In this manual, a command definition looks like this: + +@@ -997,7 +998,7 @@ @item logfile @var{filename} Place where to collect logfiles. @xref{Log}. @item login [@var{state}] @@ -129,7 +194,16 @@ @item logtstamp [@var{state}] Configure logfile time-stamps. @xref{Log}. @item mapdefault -@@ -1900,7 +1900,7 @@ +@@ -1561,7 +1562,7 @@ + @kindex C-x + @deffn Command lockscreen + (@kbd{C-a x}, @kbd{C-a C-x})@* +-Call a screenlock program (@file{/local/bin/lck} or @file{/usr/bin/lock} ++Call a screenlock program (@file{/usr/bin/lck} or @file{/usr/bin/lock} + or a builtin, if no other is available). Screen does not accept any + command keys until this program terminates. Meanwhile processes in the + windows may continue, as the windows are in the detached state. +@@ -1900,7 +1901,7 @@ * Naming Windows:: Control the name of the window * Console:: See the host's console messages * Kill:: Destroy an unwanted window @@ -138,7 +212,7 @@ * Mode:: Control the file mode of the pty * Monitor:: Watch for activity in a window * Windows:: List the active windows -@@ -2109,7 +2109,7 @@ +@@ -2109,7 +2110,7 @@ @kindex L @deffn Command login [state] (@kbd{C-a L})@* @@ -147,7 +221,15 @@ This controls whether or not the window is @dfn{logged in}. In addition to this toggle, it is convenient to have ``log in'' and ``log out'' keys. For instance, @code{bind I login on} and @code{bind O -@@ -4962,17 +4962,17 @@ +@@ -4956,33 +4957,29 @@ + @cindex files + + @table @file +-@item .../screen-4.?.??/etc/screenrc +-@itemx .../screen-4.?.??/etc/etcscreenrc ++@item /usr/share/doc/screen/examples/screenrc ++@itemx /usr/share/doc/screen/examples/etcscreenrc + Examples in the @code{screen} distribution package for private and global initialization files. @item @code{$SYSSCREENRC} @@ -164,11 +246,22 @@ @item @code{$SCREENDIR}/S-@var{login} -@item /local/screens/S-@var{login} -+@item /var/run/screen/S-@var{login} ++@item /tmp/.screen/S-@var{login} Socket directories (default) - @item /usr/tmp/screens/S-@var{login} -@@ -4995,7 +4995,7 @@ +-@item /usr/tmp/screens/S-@var{login} +-Alternate socket directories. +- + @item @var{socket directory}/.termcap + Written by the @code{dumptermcap} command + +-@item /usr/tmp/screens/screen-exchange or +-@itemx /tmp/screen-exchange ++@item /tmp/screen-exchange + @code{screen} interprocess communication buffer + + @item hardcopy.[0-9] +@@ -4995,7 +4992,7 @@ @itemx /etc/termcap Terminal capability databases @@ -177,7 +270,7 @@ Login records @item @code{$LOCKPRG} -@@ -5100,10 +5100,10 @@ +@@ -5100,10 +5097,10 @@ in order to be able to correctly change the owner of the tty device file for each window. Special permission may also be required to write the file @@ -190,12 +283,22 @@ with SIGKILL. This will cause some programs (like "w" or "rwho") to advertise that a user is logged on who really isn't. -@@ -5184,7 +5184,7 @@ +@@ -5183,13 +5180,14 @@ + @section Socket Directory @cindex socket directory - The socket directory defaults either to @file{$HOME/.screen} or simply to +-The socket directory defaults either to @file{$HOME/.screen} or simply to -@file{/tmp/screens} or preferably to @file{/usr/local/screens} chosen at -+@file{/tmp/screens} or preferably to @file{/var/run/screen} chosen at - compile-time. If @code{screen} is installed +-compile-time. If @code{screen} is installed ++The socket directory defaults to @file{$HOME/.screen} or @file{/tmp/screens}, ++but this can be overridden by the compile-time constant SOCKDIR. ++If @code{screen} is installed setuid root, then the administrator should compile screen with an adequate (not NFS mounted) @code{SOCKDIR}. If @code{screen} is not + running setuid-root, the user can specify any mode 700 directory in the +-environment variable @code{$SCREENDIR}. ++environment variable @code{$SCREENDIR}. Note: Debian uses /tmp/.screen as ++socket directory. + + @node Compiling Screen, , Socket Directory, Installation + @section Compiling Screen diff --git a/debian/patches/25allow_symlink_sockdir.dpatch b/debian/patches/25allow_symlink_sockdir.dpatch new file mode 100644 index 0000000..21cbdd9 --- /dev/null +++ b/debian/patches/25allow_symlink_sockdir.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25allow_symlink_sockdir.dpatch by <hesso@pool.math.tu-berlin.de> +## +## DP: I don't know why screen should not allow a symlinked SockDir; +## DP: so now it does. (Note: this is one of TWO calls to lstat() +## DP: the whole program has - and this one isn't even wrapped in +## DP: #ifdef HAVE_LSTAT as it should.) + +@DPATCH@ +diff -Nau screen-4.0.3.orig/screen.c screen-4.0.3/screen.c +--- screen-4.0.3.orig/screen.c ++++ screen-4.0.3/screen.c +@@ -971,7 +971,7 @@ + else + { + SockDir = SOCKDIR; +- if (lstat(SockDir, &st)) ++ if (stat(SockDir, &st)) + { + n = (eff_uid == 0 && (real_uid || eff_gid == real_gid)) ? 0755 : + (eff_gid != real_gid) ? 0775 : diff --git a/debian/patches/30fix_fsf_address.dpatch b/debian/patches/30fix_fsf_address.dpatch new file mode 100644 index 0000000..b312713 --- /dev/null +++ b/debian/patches/30fix_fsf_address.dpatch @@ -0,0 +1,36 @@ +#! /bin/bash +## 30fix_fsf_address.dpatch by Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> +## +## DP: Update the FSF address in the GPL header of the source files +## DP: until upstream does. + +set -o errexit + +non_ascii_source_files="acls.c process.c help.c" +original_encoding=iso-8859-1 +patched_encoding=utf-8 + +convert_encoding () { + local in_encoding=$1 + local out_encoding=$2 + local in_file=$3 + local out_file=$(tempfile) + iconv --from-code $in_encoding --to-code $out_encoding $in_file > $out_file + mv $out_file $in_file +} + +dpatch_patch () { + for file in *.c; do + sed -i -e 's/59 Temple Place - Suite 330, Boston, MA 02111-1307, USA/51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA/' $file + done +} + +dpatch_unpatch () { + for file in *.c; do + sed -i -e 's/51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA/59 Temple Place - Suite 330, Boston, MA 02111-1307, USA/' $file + done +} + +DPATCH_LIB_NO_DEFAULT=1 + +. /usr/share/dpatch/dpatch.lib.sh diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index cef83a3..0000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff --git a/debian/po/ca.po b/debian/po/ca.po deleted file mode 100644 index af61ee6..0000000 --- a/debian/po/ca.po +++ /dev/null @@ -1,42 +0,0 @@ -# -# Catalan translations for screen package. -# Copyright (C) 2007 Adam Lazur. -# This file is distributed under the same license as the screen package. -# -# Jordà Polo <jorda@ettin.org>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: 4.0.3-0.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2007-02-25 00:37+0100\n" -"Last-Translator: Jordà Polo <jorda@ettin.org>\n" -"Language-Team: Català <debian-l10n-catalan@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Podeu perdre les sessions d'screen que s'estiguin executant. Segur que voleu " -"continuar amb la instal·lació?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Aquesta versió d'screen és incompatible amb totes les versions anteriors a " -"3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Si continueu amb la instal·lació, no podreu accedir a les sessions d'screen " -"que s'estiguin executant des d'abans." diff --git a/debian/po/cs.po b/debian/po/cs.po deleted file mode 100644 index 3d87803..0000000 --- a/debian/po/cs.po +++ /dev/null @@ -1,44 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2004-07-24 09:49+0200\n" -"Last-Translator: Miroslav Kure <kurem@debian.cz>\n" -"Language-Team: Czech <provoz@debian.cz>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "Můžete ztratit momentálně běžící sezení. Pokračovat v instalaci?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "Tato verze screenu není kompatibilní s verzemi před 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Pokud budete pokračovat v instalaci, ztratíte přístup k aktuálně " -"probíhajícím sezením screenu." diff --git a/debian/po/da.po b/debian/po/da.po deleted file mode 100644 index 917560b..0000000 --- a/debian/po/da.po +++ /dev/null @@ -1,44 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen 4.0.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2004-03-31 14:24+0200\n" -"Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n" -"Language-Team: Danish <dansk@klid.dk>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "Du vil måske tabe kørende screen sessioner. Fortsæt installationen?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "Denne version af screen er ikke kompatibel med versioner før 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Hvis du fortsætter med installationen, vil du ikke kunne tilgå screen " -"sessioner der kører allerede." diff --git a/debian/po/de.po b/debian/po/de.po deleted file mode 100644 index bb6acb3..0000000 --- a/debian/po/de.po +++ /dev/null @@ -1,45 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2003-07-23 07:08+0200\n" -"Last-Translator: German <debian-l10n-german@lists.debian.org>\n" -"Language-Team: German <debian-l10n-german@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Sie k=F6nnten aktive Screen-Sitzungen verlieren. Installation fortsetzen?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "Diese screen-Version ist inkompatibel mit allen Versionen vor 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Wenn Sie die Installation fortsetzen, dann werden Sie auf alle im Moment " -"aktiven screen-Sitzungen nicht mehr zugreifen k=F6nnen." diff --git a/debian/po/es.po b/debian/po/es.po deleted file mode 100644 index 6ca5ec4..0000000 --- a/debian/po/es.po +++ /dev/null @@ -1,46 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2003-07-23 07:08+0200\n" -"Last-Translator: Spanish <debian-l10n-spanish@lists.debian.org>\n" -"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "Puede perder las sesiones de screen que tiene abiertas. ¿Continuar?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"La versión que está instalando de screen es incompatible con todas las " -"versiones anteriores a la 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Si continúa con la instalación, no podrá acceder a las sesiones de screen " -"que tenga abiertas." diff --git a/debian/po/fi.po b/debian/po/fi.po deleted file mode 100644 index 89cf2e5..0000000 --- a/debian/po/fi.po +++ /dev/null @@ -1,48 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2005-04-09 01:57+0300\n" -"Last-Translator: Matti Pöllä <mpo@iki.fi>\n" -"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Yhteys käynnissä oleviin screen-istuntoihin voi katketa. Jatketaanko " -"asennusta?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Tämä screen:in versio on yhteensopimaton kaikkien versiota 3.9.5-5\n" -"edeltävien versioiden kanssa." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Jos jatkat asennusta, menetät yhteyden käynnissä oleviin\n" -"screen-istuntoihin." diff --git a/debian/po/fr.po b/debian/po/fr.po deleted file mode 100644 index d736ba6..0000000 --- a/debian/po/fr.po +++ /dev/null @@ -1,45 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen 3.9.15-1\n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2003-07-23 07:13+0100\n" -"Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" -"Language-Team: French <debian-l10n-french@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "Risque de perte des sessions screen. Continuer l'installation ?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Cette version est incompatible avec toutes les versions antérieures à la " -"version 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Si vous continuez l'installation, vous ne pourrez plus accéder aux sessions " -"de screen en cours." diff --git a/debian/po/fr.po.poedit b/debian/po/fr.po.poedit deleted file mode 100644 index a37dcf4..0000000 --- a/debian/po/fr.po.poedit +++ /dev/null @@ -1,7 +0,0 @@ -#. This catalog was generated by poedit -#. Number of items: 3 -#. Language: French -#. Country: -#. Basepath: -#. Paths: 0 -#. Keywords: 0 diff --git a/debian/po/gl.po b/debian/po/gl.po deleted file mode 100644 index 4b359de..0000000 --- a/debian/po/gl.po +++ /dev/null @@ -1,39 +0,0 @@ -# Galician translation of screen's debconf templates -# This file is distributed under the same license as the screen package. -# Jacobo Tarrio <jtarrio@debian.org>, 2007. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2007-01-22 16:16+0100\n" -"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" -"Language-Team: Galician <proxecto@trasno.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Pode perder as sesións de screen que se están a executar. ¿Quere continuar a " -"instalación?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Esta versión de screen é incompatible con tódalas versións anteriores a " -"3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Se continúa a instalación non ha poder acceder ás sesións de screen que " -"estean en execución neste momento." diff --git a/debian/po/it.po b/debian/po/it.po deleted file mode 100644 index ac66736..0000000 --- a/debian/po/it.po +++ /dev/null @@ -1,42 +0,0 @@ -# screen - Italian Debconf messages -# -# This file is distributed under the same license as the screen package. -# Andrea Bolognani <eof@kiyuko.org>, 2006. -msgid "" -msgstr "" -"Project-Id-Version: screen 4.0.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-10 07:38-0700\n" -"PO-Revision-Date: 2005-03-21 10:46+0100\n" -"Last-Translator: Andrea Bolognani <eof@kiyuko.org>\n" -"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Potresti perdere le sessioni correnti di screen. Proseguire con " -"l'installazione?" - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Questa versione di screen è incompatibile con tutte le versioni precedenti " -"la 3.9.5-5." - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Se prosegui con l'installazione, non sarai in grado di accedere alle " -"sessioni correnti di screen." diff --git a/debian/po/ja.po b/debian/po/ja.po deleted file mode 100644 index b441fb7..0000000 --- a/debian/po/ja.po +++ /dev/null @@ -1,42 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2003-11-20 23:14+0900\n" -"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n" -"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "¹ screen Υåϼޤȡ³ޤ?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "ΥС screen 3.9.5-5 ƤΥСȸߴޤ" - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "ȡ³Ԥ硢¹ screen Υå˥Ǥʤʤޤ" diff --git a/debian/po/nl.po b/debian/po/nl.po deleted file mode 100644 index d964023..0000000 --- a/debian/po/nl.po +++ /dev/null @@ -1,45 +0,0 @@ -#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid "" -msgstr "" -"Project-Id-Version: screen 4.0.2-3\n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2004-04-14 17:21+0100\n" -"Last-Translator: Luk Claes <luk.claes@ugent.be>\n" -"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description
-#: ../templates:4
-msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"U kunt momenteel draaiende screen-sessies verliezen. Doorgaan met de " -"installatie?" - -#. Description
-#: ../templates:4
-msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "Deze versie van screen is incompatibel met alle versies voor 3.9.5-5." - -#. Description
-#: ../templates:4
-msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Als u verdergaat met de installatie, zult u geen toegang hebben tot " -"momenteel draaiende screen-sessies." diff --git a/debian/po/pt.po b/debian/po/pt.po deleted file mode 100644 index 75187cf..0000000 --- a/debian/po/pt.po +++ /dev/null @@ -1,43 +0,0 @@ -# Portuguese translation for screen's debconf messages. -# 2005, Miguel Figueiredo <elmig@debianpt.org> -# -# 2005-12-24 - Initial translation -# -msgid "" -msgstr "" -"Project-Id-Version: screen 4.0.2-4.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-10 10:06-0700\n" -"PO-Revision-Date: 2005-12-28 18:23+0000\n" -"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" -"Language-Team: Portuguese <traduz@debianpt.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Pode perder sessões de screen que estão actualmente a correr. Continuar a " -"instalação?" - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Esta versão de screen é incompatível com todas as versões anteriores a 3.9.5-" -"5." - -#. Type: boolean -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Se continuar com a instalação, não poderá aceder a sessões de screen " -"actualmente a correr" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po deleted file mode 100644 index b8a0e87..0000000 --- a/debian/po/pt_BR.po +++ /dev/null @@ -1,47 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen_4.0.1-3\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2003-11-02 15:59-0300\n" -"Last-Translator: André LuÃs Lopes <andrelop@debian.org>\n" -"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Você pode perder sessões screen em execução. Continuar a instalação ?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Esta versão do screen é incompatÃvel com todas as versões anteriores a " -"versão 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Caso você continue com a instalação você não será capaz de acessar as " -"sessões screen em execução." diff --git a/debian/po/ru.po b/debian/po/ru.po deleted file mode 100644 index e681e96..0000000 --- a/debian/po/ru.po +++ /dev/null @@ -1,44 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2003-07-23 07:08+0200\n" -"Last-Translator: Russian <debian-l10n-russian@lists.debian.org>\n" -"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Сейчас вы можете потерять запущенные сессии screen. Продолжить установку?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "Эта версия screen несовместима со всеми версиями до 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Если вы продолжите установку, то вы лишитесь запущенных сейчас сессий screen." diff --git a/debian/po/sv.po b/debian/po/sv.po deleted file mode 100644 index 83e9658..0000000 --- a/debian/po/sv.po +++ /dev/null @@ -1,45 +0,0 @@ -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# Developers do not need to manually edit POT or PO files. -# , fuzzy -# -# -msgid "" -msgstr "" -"Project-Id-Version: screen 4.0.2-4.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2005-10-05 05:36+0200\n" -"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" -"Language-Team: Swedish <sv@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Du kan förlora screen som körs för närvarande. Fortsätta installationen?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Denna version av screen är inte kompatibel med alla versioner före 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Om du fortsätter med installationen kommer du inte kunna hämta upp nuvarande " -"screen-sessioner som körs." diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index 61304e9..0000000 --- a/debian/po/templates.pot +++ /dev/null @@ -1,43 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po deleted file mode 100644 index f082f69..0000000 --- a/debian/po/vi.po +++ /dev/null @@ -1,39 +0,0 @@ -# Vietnamese translation for screen. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall <clytie@riverland.net.au>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: screen 4.0.2-4.1\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2005-07-12 22:34+0930\n" -"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" -"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: BBEdit 8.2.2\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "" -"Có lẽ bạn sẽ mất phiên làm việc screen đang chạy. Tiếp tục cài đặt không?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "" -"Phiên bản screen này không tương thích với các phiên bản trước 3.9.5-5." - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "" -"Nếu bạn tiếp tục cài đặt thì bạn sẽ không thể truy cập phiên bản screen đang " -"chạy." diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po deleted file mode 100644 index aeabf16..0000000 --- a/debian/po/zh_CN.po +++ /dev/null @@ -1,41 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: screen debconf\n" -"POT-Creation-Date: 2003-07-23 07:08+0200\n" -"PO-Revision-Date: 2004-02-02 18:29+0800\n" -"Last-Translator: Li Daobing <nichloas@sohu.com>\n" -"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Description -#: ../templates:4 -msgid "You may lose currently running screen sessions. Continue the install?" -msgstr "正在运行的 screen 会话进程会被终止。继续安装吗?" - -#. Description -#: ../templates:4 -msgid "" -"This version of screen is incompatible with all versions before 3.9.5-5." -msgstr "此版与 3.9.5-5 以前的所有版本都不兼容。" - -#. Description -#: ../templates:4 -msgid "" -"If you continue with the installation, you will not be able to access " -"currently running screen sessions." -msgstr "如果继续安装,你将不再可以访问当前运行的 screen 会话进程。" diff --git a/debian/postinst b/debian/postinst index ef46085..0b4f2bd 100644 --- a/debian/postinst +++ b/debian/postinst @@ -2,11 +2,27 @@ set -e if [ "$1" = configure ]; then - if ! test -d /var/run/screen; then - install -g utmp -m 0775 -d /var/run/screen - [ `stat -c%a /usr/bin/screen` -lt 4000 ] || chmod 0755 /var/run/screen + if test -e /tmp/.screen -a ! -d /tmp/.screen; then + echo "The new location of screen's socket directory, /tmp/.screen, is" + echo "occupied by something else. Please move it aside." + exit 1 fi - # add screen to /etc/shells + + if dpkg --compare-versions "$2" lt-nl 4.0.3-4; then + echo -n "Migrating socket directory (/var/run/screen -> /tmp/.screen)..." + if ln -s /var/run/screen /tmp/.screen; then + echo " done." + else + echo " failed!" + exit 1 + fi + else + if ! test -d /tmp/.screen; then + install -g utmp -m 0775 -d /tmp/.screen + [ `stat -c%a /usr/bin/screen` -lt 4000 ] || chmod 0755 /tmp/.screen + fi + fi + /usr/sbin/add-shell /usr/bin/screen || true fi diff --git a/debian/postrm b/debian/postrm index 7a544c1..c0f3088 100644 --- a/debian/postrm +++ b/debian/postrm @@ -2,11 +2,10 @@ set -e if [ "$1" = purge ] || [ "$1" = remove ]; then - rm -rf /var/run/screen + rm -rf /var/run/screen /tmp/.screen fi if [ "$1" = disappear ]; then - # remove from /etc/shells /usr/sbin/remove-shell /usr/bin/screen || true fi diff --git a/debian/preinst b/debian/preinst new file mode 100644 index 0000000..c20f95b --- /dev/null +++ b/debian/preinst @@ -0,0 +1,16 @@ +#!/bin/sh +set -e + +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl 4.0.3-4; then + if test -e /tmp/.screen -a ! -d /tmp/.screen; then +cat - <<"EOMSG" +Error: the new location of screen's socket directory, /tmp/.screen, is already +occupied (probably by a user-created file). Please move it aside and retry. + +Your screen sessions will not be interrupted at any point during the upgrade. +EOMSG + exit 1 + fi +fi + +#DEBHELPER# diff --git a/debian/prerm b/debian/prerm index 0a3def0..3574d4b 100644 --- a/debian/prerm +++ b/debian/prerm @@ -2,7 +2,6 @@ set -e if [ "$1" = remove ] || [ "$1" = deconfigure ]; then - # remove from /etc/shells /usr/sbin/remove-shell /usr/bin/screen || true fi diff --git a/debian/rules b/debian/rules index affd5a5..7f3f349 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ #export DH_VERBOSE=1 package := screen -ROOT := $(shell pwd)/debian/$(package) +ROOT := $(CURDIR)/debian/$(package) # statically define this... sucko TTYGROUP := 5 @@ -29,7 +29,7 @@ configure-stamp: ./configure --prefix=/usr \ --infodir='$$(prefix)/share/info' \ --mandir='$$(prefix)/share/man' \ - --with-socket-dir=/var/run/screen \ + --with-socket-dir=/tmp/.screen \ --enable-pam \ --with-pty-mode=0620 \ --with-pty-group=${TTYGROUP} \ @@ -57,7 +57,7 @@ install: build $(MAKE) prefix=$(ROOT)/usr SCREENENCODINGS='$$(prefix)/share/screen/utf8encodings' installdirs install_bin # install the debian screenrc to etc install -m 644 debian/screenrc $(ROOT)/etc - # hack around the fact that the install target makes screen a symlink to screen-$(VERSION) + # hack around the fact that the install target makes screen a symlink to screen-$$(VERSION) rm -f $(ROOT)/usr/bin/screen mv -f $(ROOT)/usr/bin/screen* $(ROOT)/usr/bin/screen # make it setgid utmp @@ -72,7 +72,6 @@ binary-indep: build install binary-arch: build install dh_testdir dh_testroot - dh_installdebconf dh_installdocs cp debian/README.terminfo $(ROOT)/usr/share/doc/screen/terminfo/ dh_installexamples diff --git a/debian/screen.lintian.overrides b/debian/screen.lintian.overrides index e12027b..e130a58 100644 --- a/debian/screen.lintian.overrides +++ b/debian/screen.lintian.overrides @@ -1 +1,4 @@ screen: setgid-binary usr/bin/screen 2755 root/utmp +screen: possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:5 +screen: possibly-insecure-handling-of-tmp-files-in-maintainer-script postrm:5 +screen: possibly-insecure-handling-of-tmp-files-in-maintainer-script preinst:5 |