[X2Go-Commits] [nx-libs] 19/20: debian/changelog: merge with master branch.

[git-admin at x2go.org]

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

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 027f593fc78ea5bb53b1d6372aa7bf37e49e59f7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue May 5 01:23:04 2015 +0200

    debian/changelog: merge with master branch.
---
 debian/changelog |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ceb869c..e664e5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -154,6 +154,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
     Backported from Arctica GH 3.6.x branch.
   * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase.
     Backported from Arctica GH 3.6.x branch.
+  * debian/control: workaround missing dependencies of nxagent on Ubuntu for
+    now.
   * debian/libnx-xinerama1.*: fix faulty logic when creating symlinks.
 
   [ Bernard Cafarelli ]

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