[Bug 66701] Re: Please sync ksynaptics (universe) from unstable (main)

[Sarah Hobbs]

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 <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>, Arnaud Quette <aquette at debian.org>
+Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>,
+ Arnaud Quette <aquette at debian.org>
 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 <fboudra at free.fr>  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.conf\n"),
+             i18n("Touch pad configuration inaccessible")
+         );

-- 
Please sync ksynaptics (universe) from unstable (main)
https://launchpad.net/bugs/66701