aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-01-28 23:45:10 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-01-28 23:45:10 +0100
commitd95e47f3b85720dcb29152d86fe1fe2c178e3d6d (patch)
treef309c727795a28312aa749d846ea7bab4b6e95c3 /debian
parentfaa289a82954860c9dfb44dc7eb4d39ea6d99f25 (diff)
downloadnx-libs-d95e47f3b85720dcb29152d86fe1fe2c178e3d6d.tar.gz
nx-libs-d95e47f3b85720dcb29152d86fe1fe2c178e3d6d.tar.bz2
nx-libs-d95e47f3b85720dcb29152d86fe1fe2c178e3d6d.zip
debian/control: Build our imake against x11proto-core-dev headers.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/control2
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d52b685bd..c25e9b1fd 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@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 4993d8493..d13865c5c 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,