[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-synaptics: Changes to 'debian-unstable'



 debian/NEWS      |   12 +++++-------
 debian/changelog |    1 +
 debian/control   |    6 ++++--
 debian/rules     |   17 ++++++++++++++++-
 4 files changed, 26 insertions(+), 10 deletions(-)

New commits:
commit 2a3dc9ce34b66147ebc65cfe221e65a19f0e7de8
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jan 9 16:38:45 2010 +0000

    Drop references to hal from debian/NEWS.

diff --git a/debian/NEWS b/debian/NEWS
index 3aecc1d..2a749ba 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,8 +4,7 @@ xserver-xorg-input-synaptics (1.2.0-1) unstable; urgency=low
     The SHMConfig option is still available but the only use is for monitoring
     the hardware state data.
     If you have any script that changes the synaptics driver configuration
-    make sure that you don't use the -s option to synclient. Or even better,
-    configure the driver via hal.
+    make sure that you don't use the -s option to synclient.
 
  -- Mattia Dongili <malattia@debian.org>  Fri, 20 Nov 2009 00:32:58 +0900
 
@@ -22,10 +21,9 @@ xserver-xorg-input-synaptics (1.1.1~git20090510-1) unstable; urgency=low
         $ synclient TapButton3=3
 
     Note that the configuration will not be permanently modified, to do
-    so assign the above option values in your xorg.conf or custom fdi file
-    (see the synaptics(4) manpage or the documents in
-    /usr/share/doc/xserver-xorg-input-synaptics for additional details).
-    Another alternative is to use desktop environment specific tools
-    like gpointing-device-settings or touchfreeze.
+    so assign the above option values in your xorg.conf (see the synaptics(4)
+    manpage or the documents in /usr/share/doc/xserver-xorg-input-synaptics
+    for additional details).  Another alternative is to use desktop
+    environment specific tools like gpointing-device-settings or touchfreeze.
 
  -- David Nusinow <dnusinow@debian.org>  Sat, 11 Apr 2009 16:23:11 -0400
diff --git a/debian/changelog b/debian/changelog
index 008915b..33f1dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xserver-xorg-input-synaptics (1.2.1-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Add hurd-i386 to the Architecture field.  Requested by Samuel Thibault.
+  * Drop references to hal from debian/NEWS.
 
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 08 Dec 2009 16:15:58 +0200
 

commit c9d571772d1c23a33a6e67a2a53adcb62ba92163
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Jan 8 14:50:05 2010 +0000

    Add dependency on x11proto-core-dev to synaptics-dev

diff --git a/debian/control b/debian/control
index 0522512..45d4a41 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,9 @@ Description: Synaptics TouchPad driver for X.Org server
 Package: xserver-xorg-input-synaptics-dev
 Section: libdevel
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ x11proto-core-dev,
+ ${misc:Depends},
 Description: Synaptics TouchPad driver for X.Org server (development headers)
  This package contains the development headers for the Synaptics input
  driver found in xserver-xorg-input-synaptics. Non-developers likely have

commit 562834c0c416fd52dc9a9dd6b31c367d67d547ac
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Jan 8 14:48:18 2010 +0000

    Make xserver-xorg-input-synaptics-dev arch:all

diff --git a/debian/control b/debian/control
index 9364730..0522512 100644
--- a/debian/control
+++ b/debian/control
@@ -58,8 +58,8 @@ Description: Synaptics TouchPad driver for X.Org server
 
 Package: xserver-xorg-input-synaptics-dev
 Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: all
+Depends: ${misc:Depends}
 Description: Synaptics TouchPad driver for X.Org server (development headers)
  This package contains the development headers for the Synaptics input
  driver found in xserver-xorg-input-synaptics. Non-developers likely have
diff --git a/debian/rules b/debian/rules
index 5c8cc5c..3d6de52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ install: build
 	cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Build architecture-dependent files here.
+binary-arch: DH_OPTIONS=-s
 binary-arch: build install serverabi
 	dh_testdir
 	dh_testroot
@@ -106,8 +107,22 @@ endif
 	dh_builddeb
 
 # Build architecture-independent files here.
+binary-indep: DH_OPTIONS=-i
 binary-indep: build install
-# Nothing to do
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs
+	dh_install --sourcedir=debian/tmp
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install


Reply to: