This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 0d9fc71716d9aaadb0e8fe71f0773308f65502ab Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 22 13:24:55 2014 +0200 Don't use Perl package File::ReadBackwards anymore. + Drop D (x2goserver): libfile-readbackwards-perl. + Drop R (x2goserver): perl(File::ReadBackwards). Conflicts (resolved by Mike Gabriel): debian/control x2goserver/bin/x2golistsessions --- debian/changelog | 3 +++ debian/control | 1 - x2goserver.spec | 1 - x2goserver/bin/x2golistsessions | 2 -- x2goserver/bin/x2golistshadowsessions | 2 -- x2goserver/sbin/x2gocleansessions | 2 -- x2goserver/sbin/x2golistsessions_root | 2 -- 7 files changed, 3 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index edb99c5..14840a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -202,14 +202,17 @@ x2goserver (4.0.1.16-0x2go1) UNRELEASED; urgency=low - x2gocleansessions: Don't print to stderr if the session state file cannot be found. This can happen during session startups. Report to system log instead. + - Don't use Perl package File::ReadBackwards anymore. * debian/control, x2goserver.spec: + Update versioned D: x2goagent (>= 3.5.0.25). This assures that X2Go works with poly-instantiated /tmp directories. + Make sure x2gogetagentstate gets packaged in bin:package x2goserver. + Bump Standards: to 3.9.5. No changes needed. + Mark x2goserver-pyhoca bin:package as deprecated. + + Drop D (x2goserver): libfile-readbackwards-perl. * x2goserver.spec: + Install {libdir}/x2go/x2gormforward into bin:package x2goserver. + + Drop R (x2goserver): perl(File::ReadBackwards). [ Oleksandr Shneyder ] * New upstream version (4.0.1.16): diff --git a/debian/control b/debian/control index c81ff23..a713dd6 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,6 @@ Depends: x2goserver-common (>= ${source:Version}), x2goserver-common (<< ${source:Version}.1~), ${misc:Depends}, libfile-basedir-perl, - libfile-readbackwards-perl, libtry-tiny-perl, libswitch-perl, libx2go-server-perl (>= ${source:Version}), libx2go-server-perl (<< ${source:Version}.1~), diff --git a/x2goserver.spec b/x2goserver.spec index 989b82d..0d9e58b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -35,7 +35,6 @@ Requires: bc Requires: net-tools Requires: openssh-server Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(File::ReadBackwards) Requires: perl(Capture::Tiny) Requires: perl(Try::Tiny) # We need a database diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions index 22c9a0c..91dedfa 100755 --- a/x2goserver/bin/x2golistsessions +++ b/x2goserver/bin/x2golistsessions @@ -24,8 +24,6 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::ReadBackwards; - use X2Go::Server::DB qw(db_listsessions db_listsessions_all db_changestatus); use X2Go::Server::Agent qw(session_is_suspended session_is_running); use X2Go::Log qw(loglevel); diff --git a/x2goserver/bin/x2golistshadowsessions b/x2goserver/bin/x2golistshadowsessions index 2298557..aad9c63 100755 --- a/x2goserver/bin/x2golistshadowsessions +++ b/x2goserver/bin/x2golistshadowsessions @@ -24,8 +24,6 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::ReadBackwards; - use X2Go::Server::DB qw(db_listshadowsessions db_listshadowsessions_all); use X2Go::Server::Agent qw(session_is_suspended); use X2Go::Log qw(loglevel); diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions index db95e82..7567b2b 100755 --- a/x2goserver/sbin/x2gocleansessions +++ b/x2goserver/sbin/x2gocleansessions @@ -28,8 +28,6 @@ use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); use POSIX; -use File::ReadBackwards; - use X2Go::Config qw( get_config ); use X2Go::Log qw( loglevel ); use X2Go::SupeReNicer qw( superenice ); diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root index 0e91b05..5cbff3d 100755 --- a/x2goserver/sbin/x2golistsessions_root +++ b/x2goserver/sbin/x2golistsessions_root @@ -23,8 +23,6 @@ use strict; use Sys::Hostname; use Sys::Syslog qw( :standard :macros ); -use File::ReadBackwards; - use X2Go::Log qw(loglevel); use X2Go::Utils qw(system_capture_stdout_output); use X2Go::Server::Agent qw(session_is_suspended); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git