[X2Go-Commits] nx-libs.git - build-baikal (branch) updated: nxproxy/3.5.0-1-156-gd6fa23c

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:24:41 CEST 2013


The branch, build-baikal has been updated
       via  d6fa23c86ada56266981b3e873aa7da5e064cdff (commit)
      from  290fdeddfa7e1ac8e8c291122f74a4c248feed3a (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 ++
 debian/control   |    4 ++++
 2 files changed, 6 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 511ec79..d15603d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,8 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
   * Fix LD_LIBRARY_PATH export in wrapper scripts/patches.
   * X2Go Packaging Team becomes maintainer, Mike Gabriel + Reinhard Tartler become uploaders.
   * Make `breaks-without-version' lintian overrides needless.
+  * Break/conflict with nxlibs and nxlibs-dev (packages provided by
+    freenx-team on Launchpad).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 28 Dec 2011 19:06:26 +0100
 
diff --git a/debian/control b/debian/control
index 47fa1d2..9389b55 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Build-Depends:
  quilt (>= 0.46-7~),
  libxmltok1-dev,
  autoconf
+Breaks: nxlibs (<=3.5.1)
+Replaces: nxlibs
 Build-Conflicts:
  x11proto-core-dev,
  x11proto-kb-dev,
@@ -30,6 +32,8 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
+Breaks: nxlibs-dev (<=3.5.1)
+Replaces: nxlibs-dev
 Description: nx-X11 (NoMachine)
  X11 libraries customized for nxagent (NoMachine).
 


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

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 "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list