26 files changed, 96 insertions, 374 deletions

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 195fd05..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-Installation instructions bcm5974
-----------------------------------
-
-Standing in the source directory, do:
-
-1. make -C /lib/modules/`uname -r`/build M=$PWD modules
-
-2. sudo cp bcm5974.ko /lib/modules/`uname -r`/kernel/drivers/input/mouse/
-
-3. sudo ./scripts/bcm5974-post-install
-
-4. sudo depmod -a
-
-5. reboot (or reload the bcm5974 module if already installed)
-
-For trouble-shooting, try running
-
- ./scripts/bcm5974-diagnostics
-
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index c7aea18..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,280 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
diff --git a/Makefile b/Makefile
index 6a04556..b750188 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,30 @@
-#
-# Makefile for input/mouse drivers
-#
+NAME    = bcm5974
+VERSION = 0.99
+SRC     = usr/src
 
-obj-m   := bcm5974.o
+TARBALL = $(NAME)-$(VERSION).dkms.tar.gz
+PATCH   = ./scripts/patch-name-version.sh $(NAME) $(VERSION)
+
+all:    $(SRC)/$(TARBALL)
+
+$(SRC)/$(TARBALL): $(SRC)/dkms_source_tree/$(NAME).c
+        (cd $(SRC); tar cvfz $(TARBALL) dkms*)
+
+clean:
+        rm -f $(SRC)/$(TARBALL)
+
+distclean: clean
+        rm -rf *-stamp debian/$(NAME)-dkms debian/*.log debian/files
+
+install: $(SRC)/$(TARBALL)
+        install -d "$(DESTDIR)/$(SRC)"
+        (cd $(SRC); install -m 644 $(NAME)-$(VERSION).dkms.tar.gz "$(DESTDIR)/$(SRC)")
+
+bump:
+        $(PATCH) debian/postinst
+        $(PATCH) debian/postrm
+        $(PATCH) debian/prerm
+        $(PATCH) debian/rules
+        $(PATCH) debian/postinst
+        $(PATCH) usr/src/dkms_source_tree/dkms.conf
+        chmod 0755 debian/rules
diff --git a/README b/README
deleted file mode 100644
index 898826a..0000000
--- a/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Apple USB BCM5974 Multitouch trackpad support
----------------------------------------------
-
-This driver adds support for the multitouch trackpad on the new
-Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
-appletouch driver on those computers, and integrates well with the
-synaptics driver of the Xorg system. 
-
-Authors
--------
-
-Written by Henrik Rydberg (rydberg@euromail.se); see bcm5974.c for the
-complete list of credits.
-
diff --git a/bcm5974-dkms-mkdeb/Makefile b/bcm5974-dkms-mkdeb/Makefile
deleted file mode 100644
index b8d246c..0000000
--- a/bcm5974-dkms-mkdeb/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-SRC = $(DESTDIR)/usr/src
-
-all:
-
-clean:
-
-install:
-        install -d "$(SRC)"
-        install -m 644 $(NAME)-$(VERSION).dkms.tar.gz "$(SRC)"
-
diff --git a/bcm5974-dkms-mkdeb/debian/changelog b/bcm5974-dkms-mkdeb/debian/changelog
deleted file mode 100644
index 2f74f29..0000000
--- a/bcm5974-dkms-mkdeb/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-MODULE_NAME-dkms (MODULE_VERSION) unstable; urgency=low
-
-  * Add support for MacBook 5,1 (unibody)
-
- -- Henrik Rydberg <rydberg@euromail.se>  DATE_STAMP
diff --git a/bcm5974-dkms-mkdeb/debian/dirs b/bcm5974-dkms-mkdeb/debian/dirs
deleted file mode 100644
index b601f22..0000000
--- a/bcm5974-dkms-mkdeb/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/src
diff --git a/bcm5974-dkms-mkdeb/debian/README.Debian b/debian/README.Debian
index 1f170f1..1fd7380 100644
--- a/bcm5974-dkms-mkdeb/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-MODULE_NAME DKMS module for Debian
+bcm5974 DKMS module for Debian
 
 BCM5974: This driver adds support for the multitouch trackpad on the
 new Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
diff --git a/CHANGES b/debian/changelog
index e1df040..fed1652 100644
--- a/CHANGES
+++ b/debian/changelog
@@ -1,55 +1,62 @@
-bcm5974 (0.66) unstable; urgency=low
+bcm5974-dkms (1.0) unstable; urgency=low
+
+  * Add support for MacBookPro 5,1 (unibody)
+  * Distribute package at launchpad as version 1.0
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Fri, 24 Oct 2008 23:36:22 +0200
+
+bcm5974-dkms (0.66) unstable; urgency=low
 
   * Add support for MacBook 5,1 (unibody)
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sun, 19 Oct 2008 17:23:26 +0200
 
-bcm5974 (0.65) unstable; urgency=low
+bcm5974-dkms (0.65) unstable; urgency=low
 
   * Switch back to normal mode when closing
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sun, 14 Sep 2008 16:06:42 +0200
 
-bcm5974 (0.64) unstable; urgency=low
+bcm5974-dkms (0.64) unstable; urgency=low
 
   * Finger counting improved further
 
  -- Henrik Rydberg <rydberg@euromail.se>  Wed, 03 Sep 2008 21:58:38 +0200
 
-bcm5974 (0.63) unstable; urgency=low
+bcm5974-dkms (0.63) unstable; urgency=low
 
   * Finger pressure hysteresis added
 
  -- Henrik Rydberg <rydberg@euromail.se>  Wed, 03 Sep 2008 13:26:29 +0200
 
-bcm5974 (0.62) unstable; urgency=low
+bcm5974-dkms (0.62) unstable; urgency=low
 
   * Compatibility mode reverted
   * BTN_TOUCH event added for mousedev
 
  -- Henrik Rydberg <rydberg@euromail.se>  Tue, 02 Sep 2008 20:46:51 +0200
 
-bcm5974 (0.61) unstable; urgency=low
+bcm5974-dkms (0.61) unstable; urgency=low
 
   * Smoother motion in mouse interface
 
  -- Henrik Rydberg <rydberg@euromail.se>  Mon, 01 Sep 2008 21:01:24 +0200
 
-bcm5974 (0.60) unstable; urgency=low
+bcm5974-dkms (0.60) unstable; urgency=low
 
   * New default mouse driver mode
   * Mouse configuration parameters
 
  -- Henrik Rydberg <rydberg@euromail.se>  Mon, 01 Sep 2008 18:38:21 +0200
 
-bcm5974 (0.59) unstable; urgency=low
+bcm5974-dkms (0.59) unstable; urgency=low
 
   * Cleanup patch from Dmitry Torokhov
   * Auto-suspend patch from Dmitry Torokhov
 
  -- Henrik Rydberg <rydberg@euromail.se>  Fri, 25 Jul 2008 20:14:05 +0200
 
-bcm5974 (0.58) unstable; urgency=low
+bcm5974-dkms (0.58) unstable; urgency=low
 
   * Name changes; use usbhid definitions, rename atp to bcm5974
   * Input syncing moved to report functions, event type setup broken out
@@ -59,14 +66,14 @@ bcm5974 (0.58) unstable; urgency=low
 
  -- Henrik Rydberg <rydberg@euromail.se>  Wed, 23 Jul 2008 02:20:10 +0200
 
-bcm5974 (0.57) unstable; urgency=low
+bcm5974-dkms (0.57) unstable; urgency=low
 
   * Keep reset_resume around
   * Submitted to kernel.org
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sat, 19 Jul 2008 01:42:52 +0200
 
-bcm5974 (0.56) unstable; urgency=low
+bcm5974-dkms (0.56) unstable; urgency=low
 
   * Leave device initialization to hid; use mode-switch only
   * Mode switch moved to atp_open and simplified
@@ -76,33 +83,33 @@ bcm5974 (0.56) unstable; urgency=low
 
  -- Henrik Rydberg <rydberg@euromail.se>  Fri, 18 Jul 2008 02:42:52 +0200
 
-bcm5974 (0.55) unstable; urgency=low
+bcm5974-dkms (0.55) unstable; urgency=low
 
   * Package updates.
   * Reverting GFP_ATOMIC for irq handlers.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Wed, 09 Jul 2008 20:59:39 +0200
 
-bcm5974 (0.54) unstable; urgency=low
+bcm5974-dkms (0.54) unstable; urgency=low
 
   * And another one... finally got the bright idea to test it by
     emulating the different product ids.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Tue, 08 Jul 2008 20:59:39 +0200
 
-bcm5974 (0.53) unstable; urgency=low
+bcm5974-dkms (0.53) unstable; urgency=low
 
   * Another typo in the post-install script.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Mon, 07 Jul 2008 20:59:39 +0200
 
-bcm5974 (0.52) unstable; urgency=low
+bcm5974-dkms (0.52) unstable; urgency=low
 
   * Typo in the post-install script.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Mon, 07 Jul 2008 20:09:39 +0200
 
-bcm5974 (0.51) unstable; urgency=low
+bcm5974-dkms (0.51) unstable; urgency=low
 
   * Fine-tuned signal-to-noise ratio, smoother mouse motion.
   * Interrupt code got minor simplifications.
@@ -110,7 +117,7 @@ bcm5974 (0.51) unstable; urgency=low
 
  -- Henrik Rydberg <rydberg@euromail.se>  Mon, 07 Jul 2008 18:09:39 +0200
 
-bcm5974 (0.5) unstable; urgency=low
+bcm5974-dkms (0.5) unstable; urgency=low
 
   * Working palm detection
   * Changes for kernel.org
@@ -118,62 +125,62 @@ bcm5974 (0.5) unstable; urgency=low
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sun, 06 Jul 2008 20:59:39 +0200
 
-bcm5974 (0.42) unstable; urgency=low
+bcm5974-dkms (0.42) unstable; urgency=low
 
   * First button click registered.
   * Hooks pre/post-reset added.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Tue, 01 Jul 2008 20:59:39 +0200
 
-bcm5974 (0.41) unstable; urgency=low
+bcm5974-dkms (0.41) unstable; urgency=low
 
   * The reset_resume kernel function added.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sun, 29 Jun 2008 20:59:39 +0200
         
-bcm5974 (0.4) unstable; urgency=low
+bcm5974-dkms (0.4) unstable; urgency=low
 
   * Both finger pressure and width reported.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Sun, 29 Jun 2008 18:59:39 +0200
 
-bcm5974 (0.31) unstable; urgency=low
+bcm5974-dkms (0.31) unstable; urgency=low
 
   * Administrative changes for kernel.org.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Fri, 27 Jun 2008 20:59:39 +0200
 
-bcm5974 (0.3) unstable; urgency=low
+bcm5974-dkms (0.3) unstable; urgency=low
 
   * Explicit device structure, use all packages.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Fri, 27 Jun 2008 18:59:39 +0200
 
-bcm5974 (0.23) unstable; urgency=low
+bcm5974-dkms (0.23) unstable; urgency=low
 
   * Finger release not reported properly.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Fri, 27 Jun 2008 17:59:39 +0200
 
-bcm5974 (0.22) unstable; urgency=low
+bcm5974-dkms (0.22) unstable; urgency=low
 
   * ABS coordinates more stable with synaptics.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Thu, 26 Jun 2008 20:59:39 +0200
 
-bcm5974 (0.21) unstable; urgency=low
+bcm5974-dkms (0.21) unstable; urgency=low
 
   * Fixed the relative coordinate scaling.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Wed, 25 Jun 2008 20:59:39 +0200
 
-bcm5974 (0.2) unstable; urgency=low
+bcm5974-dkms (0.2) unstable; urgency=low
 
   * Misinterpreted pressure input, noise reduction.
 
  -- Henrik Rydberg <rydberg@euromail.se>  Wed, 25 Jun 2008 20:59:39 +0200
 
-bcm5974 (0.1) unstable; urgency=low
+bcm5974-dkms (0.1) unstable; urgency=low
 
   * First version.
 
diff --git a/bcm5974-dkms-mkdeb/debian/compat b/debian/compat
index 7ed6ff8..7ed6ff8 100644
--- a/bcm5974-dkms-mkdeb/debian/compat
+++ b/debian/compat
diff --git a/bcm5974-dkms-mkdeb/debian/control b/debian/control
index c5497bf..07c8bcb 100644
--- a/bcm5974-dkms-mkdeb/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
-Source: MODULE_NAME-dkms
-Section: linux-input
+Source: bcm5974-dkms
+Section: misc
 Priority: optional
 Maintainer: Henrik Rydberg <rydberg@euromail.se>
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.2
 Homepage: http://web.comhem.se/rydberg/Bits/
 
-Package: MODULE_NAME-dkms
+Package: bcm5974-dkms
 Architecture: all
 Depends: dkms (>= 1.95), bash (>> 1.99)
 Description: Apple USB BCM5974 Multitouch trackpad support (DKMS)
diff --git a/bcm5974-dkms-mkdeb/debian/copyright b/debian/copyright
index e00b447..e00b447 100644
--- a/bcm5974-dkms-mkdeb/debian/copyright
+++ b/debian/copyright
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..fee20a1
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+etc/modprobe.d
+usr/src
diff --git a/bcm5974-dkms-mkdeb/debian/postinst b/debian/postinst
index 65b16ae..3bc6c41 100644
--- a/bcm5974-dkms-mkdeb/debian/postinst
+++ b/debian/postinst
@@ -2,8 +2,8 @@
 
 set -e
 
-NAME=MODULE_NAME
-VERSION=MODULE_VERSION
+NAME=bcm5974
+VERSION=0.99
 
 case "$1" in
     configure)
diff --git a/bcm5974-dkms-mkdeb/debian/postrm b/debian/postrm
index 78221c8..9a4ef29 100644
--- a/bcm5974-dkms-mkdeb/debian/postrm
+++ b/debian/postrm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-NAME=MODULE_NAME
-VERSION=MODULE_VERSION
+NAME=bcm5974
+VERSION=0.99
 
 set -e
 
diff --git a/bcm5974-dkms-mkdeb/debian/prerm b/debian/prerm
index f42d293..7c34eaa 100644
--- a/bcm5974-dkms-mkdeb/debian/prerm
+++ b/debian/prerm
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-NAME=MODULE_NAME
-VERSION=MODULE_VERSION
+NAME=bcm5974
+VERSION=0.99
 
 set -e
 
diff --git a/bcm5974-dkms-mkdeb/debian/rules b/debian/rules
index 385aa1c..649ebba 100644..100755
--- a/bcm5974-dkms-mkdeb/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-NAME=MODULE_NAME
-VERSION=MODULE_VERSION
+NAME=bcm5974
+VERSION=0.99
 
 configure: configure-stamp
 configure-stamp:
diff --git a/scripts/patch-name-version.sh b/scripts/patch-name-version.sh
new file mode 100755
index 0000000..d1a7796
--- /dev/null
+++ b/scripts/patch-name-version.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+#1: name
+#2: version
+#3: file
+cat $3 \
+| sed "s/^NAME=.*/NAME=$1/" \
+| sed "s/^VERSION=.*/VERSION=$2/" \
+> /tmp/$1.$$
+mv /tmp/$1.$$ $3
diff --git a/usr/src/dkms_main_tree/dkms_dbversion b/usr/src/dkms_main_tree/dkms_dbversion
new file mode 100644
index 0000000..227cea2
--- /dev/null
+++ b/usr/src/dkms_main_tree/dkms_dbversion
@@ -0,0 +1 @@
+2.0.0
diff --git a/usr/src/dkms_source_tree/Makefile b/usr/src/dkms_source_tree/Makefile
new file mode 100644
index 0000000..6a04556
--- /dev/null
+++ b/usr/src/dkms_source_tree/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for input/mouse drivers
+#
+
+obj-m   := bcm5974.o
diff --git a/bcm5974.c b/usr/src/dkms_source_tree/bcm5974.c
index e858f0b..e858f0b 100644
--- a/bcm5974.c
+++ b/usr/src/dkms_source_tree/bcm5974.c
diff --git a/dkms.conf b/usr/src/dkms_source_tree/dkms.conf
index 4be76c4..df7925c 100644
--- a/dkms.conf
+++ b/usr/src/dkms_source_tree/dkms.conf
@@ -1,5 +1,7 @@
-PACKAGE_NAME="bcm5974"
-PACKAGE_VERSION="0.66"
+NAME=bcm5974
+VERSION=0.99
+PACKAGE_NAME="$NAME"
+PACKAGE_VERSION="$VERSION"
 MAKE[0]="make -C ${kernel_source_dir}
   SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 BUILT_MODULE_NAME[0]="bcm5974"
diff --git a/scripts/bcm5974-diagnostics b/usr/src/dkms_source_tree/scripts/bcm5974-diagnostics
index acd0bf4..acd0bf4 100755
--- a/scripts/bcm5974-diagnostics
+++ b/usr/src/dkms_source_tree/scripts/bcm5974-diagnostics
diff --git a/scripts/bcm5974-post-install b/usr/src/dkms_source_tree/scripts/bcm5974-post-install
index de5094c..de5094c 100755
--- a/scripts/bcm5974-post-install
+++ b/usr/src/dkms_source_tree/scripts/bcm5974-post-install
diff --git a/scripts/bcm5974-post-remove b/usr/src/dkms_source_tree/scripts/bcm5974-post-remove
index 21977de..21977de 100755
--- a/scripts/bcm5974-post-remove
+++ b/usr/src/dkms_source_tree/scripts/bcm5974-post-remove
diff --git a/scripts/bcm5974-pre-install b/usr/src/dkms_source_tree/scripts/bcm5974-pre-install
index 1e2b864..1e2b864 100755
--- a/scripts/bcm5974-pre-install
+++ b/usr/src/dkms_source_tree/scripts/bcm5974-pre-install