Package: xf86-input-wacom
Severity: normal
Tags: patch
Hey,
New gnome-settings-daemon and gnome-control-center uses some of the header
files of xf86-input-wacom. It would be nice if the header files were split out
in a proper -dev package similar to e.g. xserver-xorg-input-evdev-dev.
Attached patch does this splitout, although I want a bit overboard and moved
the package to debhelper 7 (v9) and dpkg source format 3 :)
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (101,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.3.0-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From cd8eaf0157b7e6dcf215a769d231383dc19393af Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjo...@luon.net>
Date: Fri, 18 May 2012 21:54:04 +0200
Subject: [PATCH] New upstream release (0.15.0)
* New upstream release (0.15.0)
* Switch to debhelper 7, compat mode 9
* Add xserver-xorg-wacom-dev package
---
debian/changelog | 8 +++
debian/compat | 2 +-
debian/control | 16 +++--
debian/rules | 92 +++------------------------
debian/source/format | 1 +
debian/xserver-xorg-input-wacom-dev.install | 2 +
debian/xserver-xorg-input-wacom.install | 5 ++
7 files changed, 38 insertions(+), 88 deletions(-)
create mode 100644 debian/source/format
create mode 100644 debian/xserver-xorg-input-wacom-dev.install
create mode 100644 debian/xserver-xorg-input-wacom.install
diff --git a/debian/changelog b/debian/changelog
index b1f74ea..b50f18a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xf86-input-wacom (0.15.0-1) UNRELEASED; urgency=low
+
+ * New upstream release (0.15.0)
+ * Switch to debhelper 7, compat mode 9
+ * Add xserver-xorg-wacom-dev package
+
+ -- Sjoerd Simons <sjo...@debian.org> Fri, 18 May 2012 21:50:11 +0200
+
xf86-input-wacom (0.12.0-1) unstable; urgency=low
* Adds support for many new devices, and better support for finger input.
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 7d1f94d..278ec81 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,11 @@ Source: xf86-input-wacom
Section: x11
Priority: optional
Maintainer: Ron Lee <r...@debian.org>
-Build-Depends: debhelper (>= 6.0.7), pkg-config, libudev-dev, xutils-dev,
- xserver-xorg-dev (>= 2:1.9.4), libx11-dev, libxi-dev,
+Build-Depends: debhelper (>= 9), autotools-dev, pkg-config, libudev-dev,
+ xutils-dev, xserver-xorg-dev (>= 2:1.9.4),
+ libx11-dev, libxi-dev,
libxrandr-dev, libxinerama-dev
-Standards-Version: 3.9.2.0
+Standards-Version: 3.9.3
Homepage: http://linuxwacom.sf.net
Vcs-Git: git://git.debian.org/users/ron/xf86-input-wacom.git
Vcs-Browser: http://git.debian.org/?p=users/ron/xf86-input-wacom.git;a=summary
@@ -13,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=users/ron/xf86-input-wacom.git;a=summary
Package: xserver-xorg-input-wacom
Section: x11
Architecture: any
-Depends: ${xinpdriver:Depends}, ${shlibs:Depends}
+Depends: ${xinpdriver:Depends}, ${shlibs:Depends}, ${misc:Depends}
Suggests: xinput
Provides: ${xinpdriver:Provides}
Replaces: wacom-tools (<< 0.10.0)
@@ -21,3 +22,10 @@ Conflicts: wacom-tools (<< 0.10.0)
Description: X.Org X server -- Wacom input driver
This package provides the X.Org driver for Wacom tablet devices.
+Package: xserver-xorg-input-wacom-dev
+Section: libdevel
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: X.Org X server -- Wacom input driver (development headers)
+ This package provides the development headers for the X.Org driver for Wacom
+ tablet devices.
diff --git a/debian/rules b/debian/rules
index 72a580b..650fced 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,89 +1,15 @@
#!/usr/bin/make -f
-# (ever more vaguely) Derived from:
-# Sample debian/rules that uses debhelper,
-# GNU copyright 1997 by Joey Hess.
-# Copyright Ron Lee 2003, 2004, 2007
-export DH_OPTIONS
+# Kill *.la files, and forget no-one:
+override_dh_install:
+ find debian/tmp -name '*.la' -delete
+ dh_install --fail-missing
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-objdir = objs
-package = xserver-xorg-input-wacom
-
-
-clean:
- dh_testdir
- dh_testroot
- $(RM) -r $(objdir)
- rm -f *-stamp
- dh_clean
-
-
-$(objdir)/config.status: configure
- dh_testdir
- mkdir -p $(objdir)
- cd $(objdir) && ../configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr
-
-build: build-arch
-
-build-arch: build-arch-stamp
-build-arch-stamp: $(objdir)/config.status
- dh_testdir
- cd $(objdir) && $(MAKE)
- touch $@
-
-build-indep:
-
-
-install: install-arch
-
-install-arch: XDEP = $(shell cat /usr/share/xserver-xorg/xinputdep)
-install-arch: XSUB = debian/$(package).substvars
-install-arch: DH_OPTIONS = -p$(package)
-install-arch: build-arch
-install-arch:
- dh_testdir
- dh_testroot
- dh_clean -k
-
- cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)
- $(RM) debian/$(package)/usr/lib/xorg/modules/input/*.la
+override_dh_auto_configure:
+ dh_auto_configure -- --libdir=/usr/lib/
+override_dh_installudev:
dh_installudev --priority=69
- echo "xinpdriver:Depends=$(XDEP)" > $(XSUB)
- echo "xinpdriver:Provides=xorg-driver-input" >> $(XSUB)
-
-install-indep:
-
-
-binary: binary-arch
-
-binary-arch: DH_OPTIONS = -a
-binary-arch: install-arch
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep:
-
-
-.PHONY: clean build build-arch build-indep install install-arch install-indep \
- binary binary-arch binary-indep
-
+%:
+ dh $@ --with autotools_dev,xsf
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/xserver-xorg-input-wacom-dev.install b/debian/xserver-xorg-input-wacom-dev.install
new file mode 100644
index 0000000..abaf196
--- /dev/null
+++ b/debian/xserver-xorg-input-wacom-dev.install
@@ -0,0 +1,2 @@
+usr/include/xorg/*
+/usr/lib/pkgconfig/*
diff --git a/debian/xserver-xorg-input-wacom.install b/debian/xserver-xorg-input-wacom.install
new file mode 100644
index 0000000..ab19e1b
--- /dev/null
+++ b/debian/xserver-xorg-input-wacom.install
@@ -0,0 +1,5 @@
+usr/lib/xorg/modules/input/*.so
+usr/share/man
+usr/bin/xsetwacom
+usr/bin/isdv4-serial-debugger
+usr/share/X11/xorg.conf.d/50-wacom.conf
--
1.7.10
