[pkg-fso-commits] [SCM] Xglamo, the X server of the Openmoko FreeRunner (GTA02) branch, debian, updated. 229c582667a633b2b061007296411b2421aeefbe

[Luca Capello]

The following commit has been merged in the debian branch:
commit 229c582667a633b2b061007296411b2421aeefbe
Author: Luca Capello <luca at pca.it>
Date:   Fri Aug 29 12:53:26 2008 +0200

    debian/patches/01_check-for-tslib-0.0-in-configure.ac.diff: new file
    
    This commit adds support for touchscreen input devices via tslib.
    However, you need to specify the touchscreen device, something like
    TSLIB_TSDEVICE=/dev/input/event1.
    
    Thanks to Arne Anka <openmoko at ginguppin.de> for the patch.

diff --git a/debian/changelog b/debian/changelog
index 4cf4336..120a186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,17 @@ xglamo (1.3.0.0+git20080807-2) UNRELEASED; urgency=low
 
   * debian/control:
     + add Vcs-* fields.
+    + Build-Depends: on libts-dev and quilt.
+
+  * debian/patches/series: new file.
+  * debian/patches/01_check-for-tslib-0.0-in-configure.ac.diff:
+    + Debian's libts-dev includes tslib-0.0.pc, thanks to Arne Anka
+     <openmoko at ginguppin.de> for the patch.
+
+  * debian/rules:
+    + adapt to quilt, using the debian/xsfbs/xsfbs.mk targets instead
+      of the usual quilt ones.
+    + enable kdrive tslib.
 
  --
 
diff --git a/debian/control b/debian/control
index 0ac1e56..9fb3e82 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,8 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config, bison, flex,
  libxt-dev (>= 1:0.99.1), libxmu-dev (>= 1:0.99.1),
  libxtst-dev (>= 1:0.99.1), libxres-dev (>= 1:0.99.1),
  libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386],
- libhal-dev [!hurd-i386], libxv-dev
+ libhal-dev [!hurd-i386], libxv-dev,
+ libts-dev, quilt (>= 0.40)
 Build-Conflicts: xlibs-static-dev
 Standards-Version: 3.7.3
 Vcs-Git: http://git.debian.org/git/pkg-fso/xglamo.git
diff --git a/debian/patches/01_check-for-tslib-0.0-in-configure.ac.diff b/debian/patches/01_check-for-tslib-0.0-in-configure.ac.diff
new file mode 100644
index 0000000..bceabbf
--- /dev/null
+++ b/debian/patches/01_check-for-tslib-0.0-in-configure.ac.diff
@@ -0,0 +1,11 @@
+--- xglamo.orig/configure.ac
++++ xglamo/configure.ac
+@@ -1519,7 +1519,7 @@
+     
+     # tslib...
+     if test "x$TSLIB" = xyes; then
+-        PKG_CHECK_MODULES([TSLIB], [tslib-1.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
++        PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
+         if test "x$HAVE_TSLIB" = xno; then
+             AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
+         fi
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..06f4e5f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_check-for-tslib-0.0-in-configure.ac.diff
diff --git a/debian/rules b/debian/rules
index b8b7494..1118a76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+
 include debian/xsfbs/xsfbs.mk
 
 CFLAGS = -Wall -g
@@ -42,6 +43,7 @@ confflags += --disable-static \
 	     --with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
 	     --enable-composite \
 	     --enable-kdrive \
+	     --enable-tslib \
 	     --disable-dga \
 	     --disable-dri \
 	     --disable-xinerama \
@@ -56,7 +58,6 @@ confflags += --disable-static \
 	     --disable-xprint \
 	     --disable-xtrap \
 	     --disable-dmx \
-	     --disable-tslib \
 	     --disable-xcalibrate \
 	     ac_cv_file__usr_share_sgml_X11_defs_ent=no
 
@@ -75,7 +76,7 @@ obj-$(DEB_BUILD_GNU_TYPE)/config.status: configure
 
 
 build: build-stamp
-build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
+build-stamp: patch obj-$(DEB_BUILD_GNU_TYPE)/config.status
 	dh_testdir
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
 	>$@

-- 
Xglamo, the X server of the Openmoko FreeRunner (GTA02)