[X2Go-Commits] [x2goserver] 01/01: Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2-0~). (Fixes: #700).
git-admin at x2go.org
git-admin at x2go.org
Fri Jan 9 00:02:32 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 34d2866d396298bcedcb56cd9c72a6a9f63a3780
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jan 9 00:01:19 2015 +0100
Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2-0~). (Fixes: #700).
Conflicts (resolved by Mike Gabriel):
debian/control
---
debian/changelog | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4b223b..f0abae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -209,7 +209,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
that not only works on Debian, but also on Fedora et al. (Fixes: #727).
* debian/control:
+ Add D (x2goserver): libfile-which-perl.
- + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2).
+ + Add C (x2goserver: x2godesktopsharing (<< 3.1.1.2-0~). (Fixes: #700).
+ Bump Standards: to 3.9.6. No changes needed.
* debian/x2goserver.docs:
+ Install README.i18n file into bin:package x2goserver.
diff --git a/debian/control b/debian/control
index bd7d8f8..614efa2 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Conflicts:
x2goserver-home,
x2goserver-compat,
x2goserver-pyhoca,
- x2godesktopsharing (<< 3.1.1.2),
+ x2godesktopsharing (<< 3.1.1.2-0~),
Replaces:
x2goserver-one,
x2goserver-home,
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list