[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.2 branch, master, updated. debian/1.2.15-4-1-gfe8e6f6

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit fe8e6f66966eba3a7ce7be20f12fa8b181029801
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Thu Jun 21 14:22:29 2012 +0100

    Restrict libts (touch screen) input method to linux-any architectures, not available elsewhere

diff --git a/debian/changelog b/debian/changelog
index c38d3bb..43d4b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libsdl1.2 (1.2.15-5) unstable; urgency=low
+
+  * Restrict libts (touch screen) input method to linux-any architectures, not
+    available elsewhere
+
+ -- Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>  Thu, 21 Jun 2012 14:20:55 +0100
+
 libsdl1.2 (1.2.15-4) unstable; urgency=low
 
   [ Manuel A. Fernandez Montecelo ]
diff --git a/debian/control b/debian/control
index 0a2020c..bff0a52 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9),
                libxt-dev,
                libxv-dev,
                x11proto-core-dev,
-               libts-dev,
+               libts-dev [linux-any],
                libaudiofile-dev,
                libpulse-dev,
                libgl1-mesa-dev,
@@ -82,7 +82,7 @@ Depends: ${misc:Depends},
          libpulse-dev,
          libusbhid-dev [kfreebsd-any],
          libx11-dev,
-         libts-dev,
+         libts-dev [linux-any],
          libxext-dev
 Replaces: libsdl-dev
 Conflicts: libsdl-dev
diff --git a/debian/rules b/debian/rules
index ef954eb..1f4d484 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ confflags = --disable-rpath --enable-sdl-dlopen --disable-loadso \
             --disable-nas --disable-esd --disable-arts \
             --disable-alsa-shared --disable-pulseaudio-shared \
             --disable-x11-shared \
-            --enable-input-tslib \
             --enable-video-directfb
 all_confflags = --enable-video-caca
 udeb_confflags = --enable-video-directfb \

-- 
Debian packaging of SDL 1.2