aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2012-12-12 10:07:52 +0100
committerReinhard Tartler <siretart@tauware.de>2012-12-12 17:08:23 +0100
commit6b505a48acf38d0450d7c615ac8f2e67b44aacf4 (patch)
treef888bff13f7e71f47165c6f79bd18a16d4842303 /debian
parentd634c16aaa793ab61ac40ced6ab741d5831ef570 (diff)
downloadnx-libs-6b505a48acf38d0450d7c615ac8f2e67b44aacf4.tar.gz
nx-libs-6b505a48acf38d0450d7c615ac8f2e67b44aacf4.tar.bz2
nx-libs-6b505a48acf38d0450d7c615ac8f2e67b44aacf4.zip
remove unnecessary build-conflict on xbitmaps
The Debian xterm package depends on xbitmaps. This change allows compiling on a host that has xterm installed.
Diffstat (limited to 'debian')
-rw-r--r--debian/control1
1 files changed, 0 insertions, 1 deletions
diff --git a/debian/control b/debian/control
index 11dc1001c..29693ce86 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Build-Conflicts:
x11proto-randr-dev,
x11proto-record-dev,
x11proto-xinerama-dev,
- xbitmaps,
Standards-Version: 3.9.3
Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary
Vcs-Git: git://code.x2go.org/nx-libs.git