[X2Go-Commits] [nx-libs] 01/02: debian/control: Build our imake against x11proto-core-dev headers.

[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 nx-libs.

commit d95e47f3b85720dcb29152d86fe1fe2c178e3d6d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 28 23:45:10 2014 +0100

    debian/control: Build our imake against x11proto-core-dev headers.
---
 debian/changelog |    4 ++++
 debian/control   |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d52b685..c25e9b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ nx-libs (2:3.5.0.23-0x2go1) UNRELEASED; urgency=low
     - Sync nx-libs.spec in Fedora with upstream's nx-libs.spec file. (Fixes:
       #393).
 
+  [ Mike Gabriel ]
+  * debian/control:
+    + Build our imake against x11proto-core-dev headers.
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 04 Jan 2014 22:02:16 +0100
 
 nx-libs (2:3.5.0.22-0x2go2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 4993d84..d13865c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,8 +19,8 @@ Build-Depends:
  libxml2-dev,
  autoconf,
  pkg-config,
-Build-Conflicts:
  x11proto-core-dev,
+Build-Conflicts:
  x11proto-kb-dev,
  x11proto-randr-dev,
  x11proto-record-dev,

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