xserver-xorg-input-synaptics: Changes to 'debian-unstable'
debian/changelog | 5 +++--
debian/patches/04-delibcwrap.patch | 17 +++++++++++++++++
2 files changed, 20 insertions(+), 2 deletions(-)
New commits:
commit 747fd7765d2e3e9dfe355085accc51582436b154
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 2 12:22:13 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7909434..b78855e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-xfree86-driver-synaptics (0.14.7~git20070706-3) UNRELEASED; urgency=low
+xfree86-driver-synaptics (0.14.7~git20070706-2.1) unstable; urgency=low
+ * Non-maintainer upload, with Mattia's agreement.
* Add patch to fix the build with xserver 1.5, which removed the libc
wrapper (closes: #471494).
* Add armel and armeb to the Architecture field (closes: #461551).
- -- Julien Cristau <jcristau@debian.org> Wed, 12 Mar 2008 16:36:49 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 02 Jun 2008 12:21:39 +0200
xfree86-driver-synaptics (0.14.7~git20070706-2) unstable; urgency=low
commit b54ab2203fe3b50f6e25f499253fc64ca1e1915d
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jun 2 12:20:18 2008 +0200
04-delibcwrap.patch: link the driver with -lm
diff --git a/debian/patches/04-delibcwrap.patch b/debian/patches/04-delibcwrap.patch
index 3edd3e8..55bff88 100644
--- a/debian/patches/04-delibcwrap.patch
+++ b/debian/patches/04-delibcwrap.patch
@@ -1,6 +1,8 @@
Patch by Jarod Wilson <jwilson@redhat.com>
Downloaded from http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/synaptics/synaptics-0.14.6-delibcwrap.patch?rev=1.1
+Index: xserver-xorg-input-synaptics/synaptics.c
+===================================================================
--- xserver-xorg-input-synaptics.orig/synaptics.c
+++ xserver-xorg-input-synaptics/synaptics.c
@@ -70,7 +70,6 @@
@@ -119,6 +121,8 @@ Downloaded from http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/synaptics/
dy = integral;
}
+Index: xserver-xorg-input-synaptics/synaptics.h
+===================================================================
--- xserver-xorg-input-synaptics.orig/synaptics.h
+++ xserver-xorg-input-synaptics/synaptics.h
@@ -1,6 +1,18 @@
@@ -140,3 +144,16 @@ Downloaded from http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/synaptics/
#include <X11/Xdefs.h>
/******************************************************************************
+Index: xserver-xorg-input-synaptics/Makefile
+===================================================================
+--- xserver-xorg-input-synaptics.orig/Makefile
++++ xserver-xorg-input-synaptics/Makefile
+@@ -31,7 +31,7 @@
+ INSTALLED_X = $(shell pkg-config xorg-server --variable=prefix)
+ INPUT_MODULE_DIR = $(DESTDIR)$(shell pkg-config xorg-server --variable=moduledir)/input
+ SYNAPTICS_DRV = synaptics_drv.so
+- LDCOMBINEFLAGS = -shared -lc
++ LDCOMBINEFLAGS = -shared -lc -lm
+ PICFLAG = $(call check_gcc,-fPIC,)
+ X_INCLUDES_ROOT = $(INSTALLED_X)
+ ALLINCLUDES = $(shell pkg-config --cflags xorg-server)
Reply to: