The branch, master has been updated via e0115b28ed503bcd2abfb3bbbb023d9515f8423a (commit) from a7ec7f31e75f10dd11067fdfa9cedfeb9f6e4b66 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e0115b28ed503bcd2abfb3bbbb023d9515f8423a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 7 18:36:32 2014 +0100 Build hotfix for RPM packages (x2goserver.spec): * Build hotfix for RPM packages (x2goserver.spec): + Add perl(Capture::Tiny) to Requires: field of x2goserver. Conflicts (resolved by Mike Gabriel): debian/changelog x2goserver.spec ----------------------------------------------------------------------- Summary of changes: debian/changelog | 21 ++++++++++++++------- x2goserver.spec | 1 + 2 files changed, 15 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5cdebfd..9850a69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,20 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.12-0x2go2) UNRELEASED; urgency=low + + * Build hotfix for RPM packages (x2goserver.spec): + + Add perl(Capture::Tiny) to Requires: field of x2goserver. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:35:49 +0100 + +x2goserver (4.0.1.12-0x2go1) unstable; urgency=low + + * Hotfix release including changes from LTS release version + 4.0.0.10 (see below). + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:26:28 +0100 + x2goserver (4.0.1.11-0x2go1) unstable; urgency=low * New upstream version (4.0.1.11): @@ -137,13 +151,6 @@ x2goserver (4.0.1.10-0x2go1) unstable; urgency=low -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 03 Jan 2014 11:34:36 +0100 -x2goserver (4.0.1.12-0x2go1) unstable; urgency=low - - * Hotfix release including changes from LTS release version - 4.0.0.10 (see below). - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Jan 2014 18:26:28 +0100 - x2goserver (4.0.1.9-0x2go1) unstable; urgency=low * Silent bugfix release (4.0.1.9): diff --git a/x2goserver.spec b/x2goserver.spec index 13fb795..eebf5e3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -36,6 +36,7 @@ Requires: net-tools Requires: openssh-server Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(File::ReadBackwards) +Requires: perl(Capture::Tiny) # We need a database # For killall in x2gosuspend-session Requires: psmisc hooks/post-receive -- x2goserver.git (X2Go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2Go Server).