[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-synaptics: Changes to 'ubuntu'



 debian/changelog |    7 +++++++
 debian/control   |    2 ++
 2 files changed, 9 insertions(+)

New commits:
commit 7a943acf8b7d1348220a6ca9cbe800ea94ef3374
Author: Loïc Minier <loic.minier@ubuntu.com>
Date:   Fri Jun 10 18:02:29 2011 +0200

    Also build-conflict with libxtst-dev as to make sure it's not present in e.g. local debug builds.

diff --git a/debian/changelog b/debian/changelog
index 1ff0743..62883a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu15) oneiric; urgency=low
+
+  * Also build-conflict with libxtst-dev as to make sure it's not present in
+    e.g. local debug builds.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Fri, 10 Jun 2011 18:01:59 +0200
+
 xserver-xorg-input-synaptics (1.3.99+git20110116.0e27ce3a-0ubuntu14) oneiric; urgency=low
 
   * Drop libxtst-dev build dependency so syndaemon does not use XRecord,
diff --git a/debian/control b/debian/control
index a5343e8..5eabb5b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Build-Depends:
  x11proto-input-dev (>= 2.0.1-1ubuntu1),
  libmtdev-dev,
  libutouch-grail-dev
+Build-Conflicts:
+ libxtst-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-synaptics
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-synaptics.git


Reply to: