Mailinglist Archive: opensuse-commit (1670 mails)
| < Previous | Next > |
commit x11-input-wacom
- From: root@xxxxxxx (h_root)
- Date: Wed, 18 Oct 2006 16:29:32 +0200 (CEST)
- Message-id: <20061018142932.423C88476F@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package x11-input-wacom
checked in at Wed Oct 18 16:29:31 CEST 2006.
--------
--- x11-input-wacom/x11-input-wacom.changes 2006-09-02 05:55:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/x11-input-wacom/x11-input-wacom.changes 2006-10-18 07:22:54.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 18 06:39:23 CEST 2006 - sndirsch@xxxxxxx
+
+- updated to release 0.7.6-1
+ * obsoletes linuxwacom-0.7.0-rotate-patch
+- fix-linuxwacom-Makefile-64bitArch.diff no longer required
+
+-------------------------------------------------------------------
Old:
----
fix-linuxwacom-Makefile-64bitArch.diff
linuxwacom-0.7.0-rotate-patch
linuxwacom-0.7.4-3.tar.bz2
New:
----
linuxwacom-0.7.6-1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-wacom.spec ++++++
--- /var/tmp/diff_new_pack.0ZtiPW/_old 2006-10-18 16:29:25.000000000 +0200
+++ /var/tmp/diff_new_pack.0ZtiPW/_new 2006-10-18 16:29:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package x11-input-wacom (Version 0.7.4)
+# spec file for package x11-input-wacom (Version 0.7.6)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,17 +15,15 @@
%ifnarch s390 s390x
BuildRequires: xorg-x11-server-sdk
%endif
-License: GPL
+License: Other License(s), see package
URL: http://linuxwacom.sourceforge.net/
Group: System/X11/Utilities
-Version: 0.7.4
-Release: 11
+Version: 0.7.6
+Release: 1
Summary: X11 input module for wacom tablet
Provides: xorg-x11-server:/usr/X11R6/%{_lib}/modules/input/wacom_drv.o
-Source: linuxwacom-%{version}-3.tar.bz2
-Patch: fix-linuxwacom-Makefile-64bitArch.diff
+Source: linuxwacom-%{version}-1.tar.bz2
Patch1: xsetwacom.diff
-Patch2: linuxwacom-0.7.0-rotate-patch
Patch3: xorg7.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -75,13 +73,11 @@
Ping Cheng <pingc@xxxxxxxxx>
%prep
-%setup -n linuxwacom-%{version}-3
-%patch
+%setup -n linuxwacom-%{version}-1
%ifnarch s390 s390x
%patch1
cp /usr/include/xorg/{xf86Parser.h,xf86Optrec.h} .
%endif
-%patch2
%patch3
%build
@@ -128,9 +124,9 @@
%dir /usr/%_lib/xorg
%dir /usr/%_lib/xorg/modules/
%dir /usr/%_lib/xorg/modules/input
-#### DO NOT STRIP ".o" modules ! ###
%attr (644,root,root) /usr/%_lib/xorg/modules/input/wacom_drv.so
%endif
+%{_mandir}/man4/wacom.4x.gz
%files tools
%defattr(-,root,root)
@@ -157,6 +153,10 @@
/usr/%_lib/libwacomcfg.so
%changelog -n x11-input-wacom
+* Wed Oct 18 2006 - sndirsch@xxxxxxx
+- updated to release 0.7.6-1
+ * obsoletes linuxwacom-0.7.0-rotate-patch
+- fix-linuxwacom-Makefile-64bitArch.diff no longer required
* Sat Sep 02 2006 - sndirsch@xxxxxxx
- xf86Parser.h/xf86Optrec.h has moved again
* Fri Jul 28 2006 - sndirsch@xxxxxxx
++++++ linuxwacom-0.7.4-3.tar.bz2 -> linuxwacom-0.7.6-1.tar.bz2 ++++++
++++ 51868 lines of diff (skipped)
++++++ xorg7.diff ++++++
--- /var/tmp/diff_new_pack.0ZtiPW/_old 2006-10-18 16:29:28.000000000 +0200
+++ /var/tmp/diff_new_pack.0ZtiPW/_new 2006-10-18 16:29:28.000000000 +0200
@@ -1,6 +1,6 @@
diff -x wacomxi.Plo -u -r src.old/xf86Wacom.h src/xf86Wacom.h
--- src.old/xf86Wacom.h 2006-07-19 13:03:53.000000000 +0200
-+++ src/xf86Wacom.h 2006-07-19 13:05:04.000000000 +0200
++++ src/xdrv/xf86Wacom.h 2006-07-19 13:05:04.000000000 +0200
@@ -63,6 +63,7 @@
#include <xf86.h>
#define NEED_XF86_TYPES
++++++ xsetwacom.diff ++++++
--- /var/tmp/diff_new_pack.0ZtiPW/_old 2006-10-18 16:29:28.000000000 +0200
+++ /var/tmp/diff_new_pack.0ZtiPW/_new 2006-10-18 16:29:28.000000000 +0200
@@ -1,18 +1,15 @@
diff -u -r ../linuxwacom-0.7.1.orig/src/Makefile.am ./src/Makefile.am
--- ../linuxwacom-0.7.1.orig/src/Makefile.am 2005-11-23 18:11:10.465489988 +0100
-+++ ./src/Makefile.am 2005-11-23 18:11:33.566446086 +0100
-@@ -37,7 +37,7 @@
++++ ./src/util/Makefile.am 2005-11-23 18:11:33.566446086 +0100
+@@ -30,4 +30,4 @@
libwacomcfg_la_LIBADD = @WCM_LIBWACOMCFG_LIBS@
- xsetwacom_SOURCES = xsetwacom.c wacomcfg.h Xwacom.h
+ xsetwacom_SOURCES = xsetwacom.c wacomcfg.h ../include/Xwacom.h
-xsetwacom_LDADD = libwacomcfg.la
-+xsetwacom_LDADD = libwacomcfg.la -L/usr/X11R6/lib -lX11 -lxf86config -lm
-
- EXTRA_DIST = xf86Wacom.c xf86Wacom.h \
- wcmSerial.c wcmISDV4.c wcmUSB.c \
++xsetwacom_LDADD = libwacomcfg.la -lX11 -lxf86config -lm
diff -u -r ../linuxwacom-0.7.1.orig/src/xsetwacom.c ./src/xsetwacom.c
--- ../linuxwacom-0.7.1.orig/src/xsetwacom.c 2005-11-23 18:11:10.447493138 +0100
-+++ ./src/xsetwacom.c 2005-11-23 18:12:39.809850081 +0100
++++ ./src/util/xsetwacom.c 2005-11-23 18:12:39.809850081 +0100
@@ -35,10 +35,13 @@
#include <stdio.h>
@@ -24,9 +21,9 @@
#include <errno.h>
#include <assert.h>
+#include <xf86Parser.h>
+ #include "../include/wcmAction.h"
int gnVerbose = 0;
- int gnLastXError = 0;
@@ -242,42 +245,104 @@
fprintf(stderr,"Error (%d): %s\n",err,pszText);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |