10 files changed, 25 insertions, 36 deletions

diff --git a/.gitignore b/.gitignore
index 7eb23b5..19bcc25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+debian/files
+debian/xf86-input-multitouch*
 bin
 obj
 patches
diff --git a/Makefile b/Makefile
index 81eec08..b91b2fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 VERSION = 1
 PATCHLEVEL = 0
-EXTRAVERSION = beta1
+EXTRAVERSION = rc1
 
 LIBRARY = multitouch.so
-FDIS    = 11-multitouch.fdi
 MODULES = src
 XMODULES = driver
 
@@ -23,13 +22,11 @@ XOBJECTS= $(addsuffix .o,\
 TBIN    = $(addprefix bin/,$(TARGETS))
 TLIB    = $(addprefix obj/,$(LIBRARY))
 TOBJ    = $(addprefix obj/,$(addsuffix .o,$(TARGETS)))
-TFDI    = $(addprefix fdi/,$(FDIS))
 OBJS    = $(addprefix obj/,$(OBJECTS))
 XOBJS   = $(addprefix obj/,$(XOBJECTS))
 LIBS    = -lmtdev -lm
 
 DLIB    = usr/lib/xorg/modules/input
-DFDI    = usr/share/hal/fdi/policy/20thirdparty
 
 INCLUDE = -Iinclude -I/usr/include/xorg -I/usr/include/pixman-1
 OPTS    = -O3 -fPIC
@@ -59,10 +56,8 @@ clean:
         rm -rf bin obj
 
 distclean: clean
-        rm -rf debian/*.log debian/files
+        rm -rf debian/*.log debian/files debian/xf86-input-multitouch*
 
-install: $(TLIB) $(TFDI)
+install: $(TLIB)
         install -d "$(DESTDIR)/$(DLIB)"
-        install -d "$(DESTDIR)/$(DFDI)"
         install -m 755 $(TLIB) "$(DESTDIR)/$(DLIB)"
-        install -m 644 $(TFDI) "$(DESTDIR)/$(DFDI)"
diff --git a/README b/README
index f6716ab..7d36411 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-Multitouch X Driver
+xf86-input-multitouch
 
-The Multitouch X Driver driver uses the kernel MT protocol to bring
-multi-touch gestures to the Linux desktop.
+The Multitouch X Driver provides gestures support for multitouch
+touchpads, in particular those with integrated button.
 
 ---
 Copyright (C) 2008 Henrik Rydberg <rydberg@euromail.se>
diff --git a/debian/README.Debian b/debian/README.Debian
index e1e27bf..82e4cb1 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-multitouch Xorg driver
+xf86-input-multitouch Xorg driver
 
 * Install the debian package
 
diff --git a/debian/changelog b/debian/changelog
index b6ef16b..7b0cbae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-multitouch (0.1) unstable; urgency=low
+xf86-input-multitouch (1.0~rc2-mactel1) unstable; urgency=low
 
-  * Add multitouch Xorg input driver
+  * Introducing the multitouch Xorg input driver
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Thu, 21 Oct 2010 19:30:17 +0200
 
- -- Henrik Rydberg <rydberg@euromail.se>  Mon, 03 Nov 2008 00:47:37 +0100
diff --git a/debian/control b/debian/control
index c74798c..0deffc6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,17 @@
-Source: multitouch
+Source: xf86-input-multitouch
 Section: misc
 Priority: optional
 Maintainer: Henrik Rydberg <rydberg@euromail.se>
-Build-Depends: debhelper (>= 5)
+Build-Depends:
+        debhelper (>= 5),
+        xserver-xorg-dev (>= 2:1.7.6.901),
+        libmtdev-dev (>= 1.0.10)
 Standards-Version: 3.7.2
-Homepage: http://web.comhem.se/rydberg/Bits/
+Homepage: http://bitmath.org/code/multitouch/
 
-Package: multitouch
+Package: xf86-input-multitouch
 Architecture: any
-Depends: bash (>> 1.99)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmtdev1 (>= 1.0)
 Description: Multitouch X input driver
- This package is a multitouch Xorg input driver.
-
+ This X input driver provides gestures support for multitouch touchpads,
+ in particular those with integrated button.
diff --git a/debian/copyright b/debian/copyright
index bf1dcd2..93b3ce3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Source URL: http://web.comhem.se/rydberg/Bits/
+Source URL: http://bitmath.org/code/multitouch/
 
 Upstream Author: Henrik Rydberg <rydberg@euromail.se>
 
diff --git a/debian/dirs b/debian/dirs
index 6611862..8b13789 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1 @@
-usr/share/hal/fdi/information/10freedesktop
-usr/lib/hal
 
diff --git a/debian/rules b/debian/rules
index 90568c9..c34780c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ install:
         dh_testroot
         dh_clean -k
         dh_installdirs
-        $(MAKE) DESTDIR=$(CURDIR)/debian/hal-applesmc install
+        $(MAKE) DESTDIR=$(CURDIR)/debian/xf86-input-multitouch install
 
 binary-arch: build-arch install
         dh_testdir
diff --git a/fdi/11-multitouch.fdi b/fdi/11-multitouch.fdi
deleted file mode 100644
index 215b866..0000000
--- a/fdi/11-multitouch.fdi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.capabilities" contains="input.touchpad">
-      <match key="info.product" contains="bcm5974">
-        <merge key="input.x11_driver" type="string">multitouch</merge>
-      </match>
-    </match>
-  </device>
-</deviceinfo>