[X2Go-Commits] [x2goserver] 01/01: Upgrade to D again (bin:package x2goserver): xfonts-base (Fixes: #770).

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit 3d786f5f249b7d621b67f449f9a840ef2f309571
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jan 28 11:04:34 2015 +0100

    Upgrade to D again (bin:package x2goserver): xfonts-base (Fixes: #770).
    
    Conflicts (resolved by Mike Gabriel):
    	debian/control
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index db12550..3871cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -217,6 +217,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium
     + Bump Standards: to 3.9.6. No changes needed.
     - Don't depend on libdb-pg-perl for armhf builds. (Fixes: #712). Thanks to
       Heinrich Schuchardt for providing information on this.
+    - Upgrade to D again (bin:package x2goserver): xfonts-base (Fixes: #770).
   * debian/x2goserver.docs:
     + Install README.i18n file into bin:package x2goserver.
   * x2goserver.spec:
diff --git a/debian/control b/debian/control
index 6a8c2b7..0eab5c2 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Depends:
  xauth,
  psmisc,
  net-tools,
+ xfonts-base,
 Recommends:
  sshfs,
  x11-apps,
@@ -48,7 +49,6 @@ Recommends:
  x2goserver-xsession (>= ${source:Version}), x2goserver-xsession (<< ${source:Version}.1~),
  x2goserver-fmbindings (>= ${source:Version}), x2goserver-fmbindings (<< ${source:Version}.1~),
  x2goserver-printing (>= ${source:Version}), x2goserver-printing (<< ${source:Version}.1~),
- xfonts-base,
 Suggests:
  rdesktop,
  pulseaudio-utils

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git