aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-05-05 01:23:04 +0200
committerMihai Moldovan <ionic@ionic.de>2015-05-05 01:23:04 +0200
commitb573cbba9416c8f87d7d399e383157ebd0446c8f (patch)
treed69f4be91e23823226b037bea4499a5e5e037fdb
parentfca264fd01bb7ae881445691e561fe235dfd9901 (diff)
downloadnx-libs-b573cbba9416c8f87d7d399e383157ebd0446c8f.tar.gz
nx-libs-b573cbba9416c8f87d7d399e383157ebd0446c8f.tar.bz2
nx-libs-b573cbba9416c8f87d7d399e383157ebd0446c8f.zip
debian/changelog: merge with master branch.
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ceb869c0a..e664e5b0f 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 ]