Please sync ksynaptics (universe) from unstable (main)

[Sarah Kowalik]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 affects distros/ubuntu/ksynaptics
 status confirmed
 subscribe ubuntu-archive

Please sync ksynaptics (universe) from Debian unstable (main).

Changelog since current edgy version 0.3.1-1:

ksynaptics (0.3.1-2) unstable; urgency=low

  * Exclude s390 from the architecture list (xserver-xorg-input-synaptics not
    available on s390). Thanks to Olivier Trichet (Closes: #383698)
  * Fix hint for xorg.conf modification (Closes: #382833)

 -- Fathi Boudra <email address hidden> Sat, 14 Oct 2006 18:56:15 +0200

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFFNebg7/o1b30rzoURAjmBAKDRZMtgzZOoyWSLnmWxTN1PKF/P4wCgxr2Z
q7urQR2+T96xm6FeqnVHbhU=
=I5Pc
-----END PGP SIGNATURE-----

[Sarah Kowalik (hobbsee-deactivatedaccount)]

debdiff is trivial, will close #65268 as well.

diff -u ksynaptics-0.3.1/debian/control ksynaptics-0.3.1/debian/control
--- ksynaptics-0.3.1/debian/control
+++ ksynaptics-0.3.1/debian/control
@@ -3,16 +3,17 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <email address hidden>
-Uploaders: Fathi Boudra <email address hidden>, Mark Purcell <email address hidden>, Arnaud Quette <email address hidden>
+Uploaders: Fathi Boudra <email address hidden>, Mark Purcell <email address hidden>,
+ Arnaud Quette <email address hidden>
 Build-Depends: cdbs, debhelper (>= 5), kdelibs4-dev, libsynaptics-dev
 Standards-Version: 3.7.2

 Package: ksynaptics
-Architecture: any
+Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}, xserver-xorg-input-synaptics
 Description: Synaptics TouchPad configuration tool for KDE
- KSynaptics aims to help KDE users to configure their Synaptics
- TouchPad, that's commonly used in laptops, through the Synaptics
- TouchPad driver for XFree86 server. KSynaptics can be run in
- standalone mode or embedded into the KControl Center.
+ KSynaptics aims to help KDE users to configure their Synaptics TouchPad,
+ that's commonly used in laptops, through the Synaptics TouchPad driver for
+ x.org server. KSynaptics can be run in standalone mode or embedded into the
+ KControl Center.
  .
   Homepage: http://qsynaptics.sourceforge.net
diff -u ksynaptics-0.3.1/debian/rules ksynaptics-0.3.1/debian/rules
--- ksynaptics-0.3.1/debian/rules
+++ ksynaptics-0.3.1/debian/rules
@@ -2,6 +2,7 @@

 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk

 DEB_INSTALL_MANPAGES_ksynaptics := ksynaptics/man/ksynaptics.1x ksynaptics/man/syndock.1x

diff -u ksynaptics-0.3.1/debian/changelog ksynaptics-0.3.1/debian/changelog
--- ksynaptics-0.3.1/debian/changelog
+++ ksynaptics-0.3.1/debian/changelog
@@ -1,3 +1,11 @@
+ksynaptics (0.3.1-2) unstable; urgency=low
+
+ * Exclude s390 from the architecture list (xserver-xorg-input-synaptics not
+ available on s390). Thanks to Olivier Trichet (Closes: #383698)
+ * Fix hint for xorg.conf modification (Closes: #382833)
+
+ -- Fathi Boudra <email address hidden> Sat, 14 Oct 2006 18:56:15 +0200
+
 ksynaptics (0.3.1-1) unstable; urgency=low

   * New maintainer (Closes: #373896)
only in patch2:
unchanged:
--- ksynaptics-0.3.1.orig/debian/patches/10_proper_hint_xorg.diff
+++ ksynaptics-0.3.1/debian/patches/10_proper_hint_xorg.diff
@@ -0,0 +1,12 @@
+diff -Nur ksynaptics-0.3.1/ksynaptics/src/synconfigwidget.cpp ksynaptics-0.3.1.new/ksynaptics/src/synconfigwidget.cpp
+--- ksynaptics-0.3.1/ksynaptics/src/synconfigwidget.cpp 2006-03-11 16:03:50.000000000 +0100
++++ ksynaptics-0.3.1.new/ksynaptics/src/synconfigwidget.cpp 2006-10-14 19:02:56.000000000 +0200
+@@ -67,7 +67,7 @@
+ {
+ KMessageBox::information(this,
+ i18n("Shared Memory is not accessible.\n"
+- "Please add the option 'UseShm ''true''' into the "
++ "Please add the option 'SHMConfig ''on''' into the "
+ "touch pad section of /etc/X11/xorg.co...

[Colin Watson (cjwatson)]

This won't close bug 65268 - that's asking for the xorg.conf modification to be done automatically.

[Colin Watson (cjwatson)]

[Updating] ksynaptics (0.3.1-1 [Ubuntu] < 0.3.1-2 [Debian])
 * Trying to add ksynaptics...
  - <ksynaptics_0.3.1-2.diff.gz: downloading from http://ftp.uk.debian.org/debian/>
  - <ksynaptics_0.3.1.orig.tar.gz: already in distro - downloading from librarian>
  - <ksynaptics_0.3.1-2.dsc: downloading from http://ftp.uk.debian.org/debian/>
I: ksynaptics [universe] -> ksynaptics_0.3.1-1 [universe].

[Sarah Kowalik (hobbsee-deactivatedaccount)]

i got the bug number wrong :P