rev 9436 - in trunk/packages/kdebase/debian: . man patches
Fathi Boudra
fabo at alioth.debian.org
Tue Feb 19 07:06:45 UTC 2008
Author: fabo
Date: 2008-02-19 07:06:44 +0000 (Tue, 19 Feb 2008)
New Revision: 9436
Added:
trunk/packages/kdebase/debian/patches/71_kio_man_utf8.diff
Removed:
trunk/packages/kdebase/debian/patches/00_detect-autoconf.diff
trunk/packages/kdebase/debian/patches/02_kdm-kdmlib_branch_r752071.diff
trunk/packages/kdebase/debian/patches/03_nsplugins_branch_r754402.diff
trunk/packages/kdebase/debian/patches/04_nsplugins_regression_fix_branch_r757345.diff
trunk/packages/kdebase/debian/patches/44_klipper_ignore_gecko.diff
trunk/packages/kdebase/debian/patches/47_nsplugins_viewer_64bit_fix.diff
trunk/packages/kdebase/debian/patches/71_ksysguard_lm-sensors-3.diff
trunk/packages/kdebase/debian/patches/98_buildprep.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/compat
trunk/packages/kdebase/debian/control
trunk/packages/kdebase/debian/control.in
trunk/packages/kdebase/debian/kcontrol.preinst
trunk/packages/kdebase/debian/man/kfmclient.1
trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
trunk/packages/kdebase/debian/patches/12_genkdm_make.diff
trunk/packages/kdebase/debian/patches/13_kdm_sessions_fixes.diff
trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff
trunk/packages/kdebase/debian/patches/15_cups_docroot.diff
trunk/packages/kdebase/debian/patches/16_kdm_X_path.diff
trunk/packages/kdebase/debian/patches/17_logitechmouse.diff
trunk/packages/kdebase/debian/patches/18_default_fonts.diff
trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff
trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff
trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff
trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff
trunk/packages/kdebase/debian/patches/26_face_load.diff
trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff
trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
trunk/packages/kdebase/debian/patches/34_japanese_konsole_fix.diff
trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff
trunk/packages/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff
trunk/packages/kdebase/debian/patches/40_kdm_override_docs.diff
trunk/packages/kdebase/debian/patches/43_kdeprintfax_addquotes.diff
trunk/packages/kdebase/debian/patches/45_klipper_backreferences.diff
trunk/packages/kdebase/debian/patches/54_seli_xinerama.diff
trunk/packages/kdebase/debian/patches/61_khelpcenter_max_results.diff
trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff
Log:
1st pass :
* Refresh patches.
* Remove patches merged upstream:
* 00_detect-autoconf
* 02_kdm-kdmlib_branch_r752071
* 03_nsplugins_branch_r754402
* 04_nsplugins_regression_fix_branch_r757345
* 44_klipper_ignore_gecko
* 47_nsplugins_viewer_64bit_fix
* Remove obsolete conffiles on upgrade. Thanks to Ra?\195?\186l S?\195?\161nchez Siles.
(Closes: #461401)
* Add 71_kio_man_utf8 patch to support the recode feature of man-db.
This allows the man kio slave's rendering code to work regardless of the
source encoding of the manual page.
Thanks to Colin Watson. (Closes: #449554)
* Add man-db dependency to kdebase kio plugins.
TODO: review the ~300 bugs ;)
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/changelog 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,18 +1,32 @@
-kdebase (4:3.5.8.dfsg.1-8) UNRELEASED; urgency=low
+kdebase (4:3.5.9.dfsg.1-1) UNRELEASED; urgency=low
+ * New upstream release. (Closes: #458989)
+
+++ Changes by Fathi Boudra:
* Add Vcs-Browser and Vcs-Svn fields.
* Update ConsoleKit support patch.
- * Add patch to support lm-sensors 3.x series. (Closes: #458989)
- Build-depends on libsensors4-dev. Thanks to Aurelien Jarno.
+ * Add build-dependency on libsensors4-dev. Thanks to Aurelien Jarno.
+ * Remove patches merged upstream:
+ * 00_detect-autoconf
+ * 02_kdm-kdmlib_branch_r752071
+ * 03_nsplugins_branch_r754402
+ * 04_nsplugins_regression_fix_branch_r757345
+ * 44_klipper_ignore_gecko
+ * 47_nsplugins_viewer_64bit_fix
+ * Remove obsolete conffiles on upgrade. Thanks to Raúl Sánchez Siles.
+ (Closes: #461401)
+ * Add 71_kio_man_utf8 patch to support the recode feature of man-db.
+ This allows the man kio slave's rendering code to work regardless of the
+ source encoding of the manual page.
+ Thanks to Colin Watson. (Closes: #449554)
+ * Add man-db dependency to kdebase kio plugins.
+++ Changes by Ana Beatriz Guerrero Lopez:
- * Bump compat/debhelper to 6.
* Add Homepage to source field.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 08 Jan 2008 11:35:31 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 18 Feb 2008 19:20:30 +0100
kdebase (4:3.5.8.dfsg.1-7) unstable; urgency=low
Modified: trunk/packages/kdebase/debian/compat
===================================================================
--- trunk/packages/kdebase/debian/compat 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/compat 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1 +1 @@
-6
+5
Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/control 2008-02-19 07:06:44 UTC (rev 9436)
@@ -3,7 +3,16 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Armin Berres <trigger+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>, Sune Vuorela <debian at pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8-5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 5.0.42), autotools-dev, gawk,
+ gettext, sharutils, texinfo, xutils, kdelibs4-dev (>= 4:3.5.8-5),
+ libavahi-compat-libdnssd-dev (>= 0.4), libdbus-qt-1-dev (>= 0.60),
+ libfontenc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev,
+ libsmbclient-dev, libusb-dev, libxcomposite-dev, libxdamage-dev,
+ libxkbfile-dev, libxxf86misc-dev, libxss-dev, libxtst-dev,
+ libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.7.3
@@ -177,7 +186,7 @@
Package: kdebase-kio-plugins
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}, libsasl2-modules, psmisc, kdeeject
+Depends: ${shlibs:Depends}, libsasl2-modules, psmisc, kdeeject, man-db (>= 2.5.1-1)
Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins
Suggests: khelpcenter, mtools
Conflicts: kdebase-libs (<< 4:3.0.0)
Modified: trunk/packages/kdebase/debian/control.in
===================================================================
--- trunk/packages/kdebase/debian/control.in 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/control.in 2008-02-19 07:06:44 UTC (rev 9436)
@@ -3,7 +3,16 @@
Priority: optional
Maintainer: @@@MAINTAINER@@@
Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8-5), libdbus-qt-1-dev (>= 0.60), libldap2-dev, libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, libxss-dev, libxxf86misc-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xutils, sharutils, texinfo, libavahi-compat-libdnssd-dev (>= 0.4)
+Build-Depends: cdbs (>= 0.4.48), debhelper (>= 5.0.42), autotools-dev, gawk,
+ gettext, sharutils, texinfo, xutils, kdelibs4-dev (>= 4:3.5.8-5),
+ libavahi-compat-libdnssd-dev (>= 0.4), libdbus-qt-1-dev (>= 0.60),
+ libfontenc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev,
+ libsmbclient-dev, libusb-dev, libxcomposite-dev, libxdamage-dev,
+ libxkbfile-dev, libxxf86misc-dev, libxss-dev, libxtst-dev,
+ libhal-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libhal-storage-dev (>= 0.5.5.1-2) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.7.3
@@ -177,7 +186,7 @@
Package: kdebase-kio-plugins
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}, libsasl2-modules, psmisc, kdeeject
+Depends: ${shlibs:Depends}, libsasl2-modules, psmisc, kdeeject, man-db (>= 2.5.1-1)
Recommends: hal, pmount, kamera, kdemultimedia-kio-plugins
Suggests: khelpcenter, mtools
Conflicts: kdebase-libs (<< 4:3.0.0)
Modified: trunk/packages/kdebase/debian/kcontrol.preinst
===================================================================
--- trunk/packages/kdebase/debian/kcontrol.preinst 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/kcontrol.preinst 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,12 +1,37 @@
#! /bin/sh -e
+# Remove a no-longer used conffile
+rm_conffile() {
+ PKGNAME="$1"
+ CONFFILE="$2"
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+#4:3.5.7-4 Last deployed hotplug and hence
+# /etc/hotplug/usb/logitechmouse{,.usermap}
+#are not provided anymore. Remove them from future packages.
case "$1" in
- upgrade)
- rm -f /etc/kde3/kuriikwsfilterrc
- ;;
+ install|upgrade)
+ if [ -e /etc/kde3/kuriikwsfilterrc ]; then
+ rm -f /etc/kde3/kuriikwsfilterrc
+ fi
+ if dpkg --compare-versions "$2" le "4:3.5.7-4"; then
+ rm_conffile kcontrol "/etc/hotplug/usb/logitechmouse"
+ rm_conffile kcontrol "/etc/hotplug/usb/logitechmouse.usermap"
+ fi
- install)
;;
abort-upgrade)
Modified: trunk/packages/kdebase/debian/man/kfmclient.1
===================================================================
--- trunk/packages/kdebase/debian/man/kfmclient.1 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/man/kfmclient.1 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
.\" This file was generated by kdemangen.pl
-.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
+.\" Further edits by Adeodato Simó. COMMANDS and EXAMPLES sections added.
.TH KFMCLIENT 1 "Jan 2005" "K Desktop Environment" "KDE tool for opening URLs from the command line"
.SH NAME
kfmclient
Deleted: trunk/packages/kdebase/debian/patches/00_detect-autoconf.diff
Deleted: trunk/packages/kdebase/debian/patches/02_kdm-kdmlib_branch_r752071.diff
Deleted: trunk/packages/kdebase/debian/patches/03_nsplugins_branch_r754402.diff
Deleted: trunk/packages/kdebase/debian/patches/04_nsplugins_regression_fix_branch_r757345.diff
Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,6 @@
---- kde.orig/kcontrol/kdm/kdm-appear.cpp
-+++ kde.patched/kcontrol/kdm/kdm-appear.cpp
-@@ -440,7 +440,7 @@
+--- a/kcontrol/kdm/kdm-appear.cpp
++++ b/kcontrol/kdm/kdm-appear.cpp
+@@ -442,7 +442,7 @@
config->setGroup("X-*-Greeter");
// Read the greeting string
@@ -9,7 +9,7 @@
// Regular logo or clock
QString logoArea = config->readEntry("LogoArea", "Logo" );
-@@ -483,7 +483,7 @@
+@@ -485,7 +485,7 @@
void KDMAppearanceWidget::defaults()
{
@@ -18,8 +18,8 @@
logoRadio->setChecked( true );
slotAreaRadioClicked( KdmLogo );
setLogo( "" );
---- kde.orig/kdm/config.def
-+++ kde.patched/kdm/config.def
+--- a/kdm/config.def
++++ b/kdm/config.def
@@ -47,11 +47,11 @@
#endif
Modified: trunk/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/11_genkdmconf.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/11_genkdmconf.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kdm/kfrontend/genkdmconf.c
-+++ kde.patched/kdm/kfrontend/genkdmconf.c
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
@@ -531,7 +531,7 @@
"# right hand sides can match.\n"
"#\n"
@@ -30,7 +30,6 @@
-"# This is not required if you use PAM with the pam_console module.\n"
-"#\n"
-"#chown $USER /dev/console\n"
-+"\n"
"\n"
-#ifdef _AIX
-"# We create a pseudodevice for finger. (host:0 becomes xdm/host_0)\n"
@@ -52,6 +51,7 @@
-#endif /* _AIX */
-" $USER\n"
-"\n# NOTE: The session is aborted if the last command returns non-zero.\n";
++"\n"
+"if [ -e /etc/nologin ]; then\n"
+" # always display the nologin message, if possible\n"
+" if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
Modified: trunk/packages/kdebase/debian/patches/12_genkdm_make.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/12_genkdm_make.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/12_genkdm_make.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kdm/kfrontend/Makefile.am
-+++ kde.patched/kdm/kfrontend/Makefile.am
+--- a/kdm/kfrontend/Makefile.am
++++ b/kdm/kfrontend/Makefile.am
@@ -1,5 +1,5 @@
# use 'make GENKDMCONF_FLAGS=... install' to override
-GENKDMCONF_FLAGS =
Modified: trunk/packages/kdebase/debian/patches/13_kdm_sessions_fixes.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/13_kdm_sessions_fixes.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/13_kdm_sessions_fixes.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kdm/kfrontend/sessions/matchbox.desktop
-+++ kde.patched/kdm/kfrontend/sessions/matchbox.desktop
+--- a/kdm/kfrontend/sessions/matchbox.desktop
++++ b/kdm/kfrontend/sessions/matchbox.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
@@ -11,8 +11,8 @@
Name=Matchbox
Name[bn]=ম্যাচবক্স
Name[eo]=Alumetujo
---- kde.orig/kdm/kfrontend/sessions/olvwm.desktop
-+++ kde.patched/kdm/kfrontend/sessions/olvwm.desktop
+--- a/kdm/kfrontend/sessions/olvwm.desktop
++++ b/kdm/kfrontend/sessions/olvwm.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
@@ -24,8 +24,8 @@
Name=OLVWM
Name[br]=OVLWM
Name[eo]=OLVFA
---- kde.orig/kdm/kfrontend/sessions/pwm.desktop
-+++ kde.patched/kdm/kfrontend/sessions/pwm.desktop
+--- a/kdm/kfrontend/sessions/pwm.desktop
++++ b/kdm/kfrontend/sessions/pwm.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
@@ -37,8 +37,8 @@
Name=PWM
Name[eo]=UnuFA
Name[hi]=पीडबल्यूएम
---- kde.orig/kdm/kfrontend/sessions/ude.desktop
-+++ kde.patched/kdm/kfrontend/sessions/ude.desktop
+--- a/kdm/kfrontend/sessions/ude.desktop
++++ b/kdm/kfrontend/sessions/ude.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
@@ -50,8 +50,8 @@
Name=UDE
Name[eo]=ULĈ
Name[hi]=यूडीई
---- kde.orig/kdm/kfrontend/sessions/olwm.desktop
-+++ kde.patched/kdm/kfrontend/sessions/olwm.desktop
+--- a/kdm/kfrontend/sessions/olwm.desktop
++++ b/kdm/kfrontend/sessions/olwm.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Modified: trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/14_kdm_no_custom.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,6 @@
---- kdebase.orig/kdm/kfrontend/kgreeter.cpp
-+++ kdebase/kdm/kfrontend/kgreeter.cpp
-@@ -330,7 +330,6 @@
+--- a/kdm/kfrontend/kgreeter.cpp
++++ b/kdm/kfrontend/kgreeter.cpp
+@@ -364,7 +364,6 @@
KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
{
int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
!strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
for (uint i = 0; i < sessionTypes.size(); i++)
if (sessionTypes[i].type == type) {
-@@ -358,7 +357,6 @@
+@@ -392,7 +391,6 @@
}
}
putSession( "default", i18n("Default"), false, "default" );
Modified: trunk/packages/kdebase/debian/patches/15_cups_docroot.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/15_cups_docroot.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/15_cups_docroot.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/doc/kdeprint/cups-config.docbook
-+++ kde.patched/doc/kdeprint/cups-config.docbook
+--- a/doc/kdeprint/cups-config.docbook
++++ b/doc/kdeprint/cups-config.docbook
@@ -487,11 +487,11 @@
<term><guilabel>Server group</guilabel></term>
<listitem>
@@ -7,7 +7,7 @@
-<systemitem class="groupname">sys</systemitem>, however you can
+<systemitem class="groupname">lpadmin</systemitem>, however you can
configure things for another group as needed.</para>
-
+
<informalexample>
-<para>Enter for example <userinput>sys</userinput>.</para>
+<para>Enter for example <userinput>lpadmin</userinput>.</para>
Modified: trunk/packages/kdebase/debian/patches/16_kdm_X_path.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/16_kdm_X_path.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/16_kdm_X_path.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kdm/backend/server.c
-+++ kde.patched/kdm/backend/server.c
+--- a/kdm/backend/server.c
++++ b/kdm/backend/server.c
@@ -41,6 +41,7 @@
#include <X11/Xlib.h>
@@ -30,8 +30,8 @@
exit( 47 );
case -1:
LogError( "X server fork failed\n" );
---- kde.orig/kdm/backend/dm.c
-+++ kde.patched/kdm/backend/dm.c
+--- a/kdm/backend/dm.c
++++ b/kdm/backend/dm.c
@@ -39,6 +39,7 @@
#include "dm_error.h"
Modified: trunk/packages/kdebase/debian/patches/17_logitechmouse.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/17_logitechmouse.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/17_logitechmouse.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kcontrol/input/consoleUserPerms
-+++ kde.patched/kcontrol/input/consoleUserPerms
+--- a/kcontrol/input/consoleUserPerms
++++ b/kcontrol/input/consoleUserPerms
@@ -1,42 +1,16 @@
-#!/bin/bash
-#
Modified: trunk/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/18_default_fonts.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/18_default_fonts.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kcontrol/krdb/themes/Plastik/Plastik.xml
-+++ kde.patched/kcontrol/krdb/themes/Plastik/Plastik.xml
+--- a/kcontrol/krdb/themes/Plastik/Plastik.xml
++++ b/kcontrol/krdb/themes/Plastik/Plastik.xml
@@ -113,12 +113,12 @@
</panel>
<widgets name="Plastik" />
@@ -19,8 +19,8 @@
<StandardFont value="" object="FMSettings" />
</fonts>
</ktheme>
---- kde.orig/kcontrol/kdm/kdm-font.cpp
-+++ kde.patched/kcontrol/kdm/kdm-font.cpp
+--- a/kcontrol/kdm/kdm-font.cpp
++++ b/kcontrol/kdm/kdm-font.cpp
@@ -92,7 +92,7 @@
{
stdFontChooser->setFont(QFont("Sans Serif", 10));
@@ -39,8 +39,8 @@
}
#include "kdm-font.moc"
---- kde.orig/kdm/config.def
-+++ kde.patched/kdm/config.def
+--- a/kdm/config.def
++++ b/kdm/config.def
@@ -2096,19 +2096,19 @@
# This needs to come _in front_ of the font settings to be effective!
Key: AntiAliasing
@@ -65,9 +65,9 @@
Comment: &
Description:
The font for the greeter headline.
---- kde.orig/kcontrol/fonts/fonts.cpp
-+++ kde.patched/kcontrol/fonts/fonts.cpp
-@@ -321,7 +321,7 @@
+--- a/kcontrol/fonts/fonts.cpp
++++ b/kcontrol/fonts/fonts.cpp
+@@ -331,7 +331,7 @@
kglobals.setReadDefaults( useDefaults );
kglobals.setGroup("General");
@@ -76,7 +76,7 @@
xft.setHintStyle(hStyle);
xft.apply(); // Save this setting
kglobals.writeEntry("XftHintStyle", KXftConfig::toStr(hStyle));
-@@ -439,7 +439,7 @@
+@@ -449,7 +449,7 @@
if(hintingStyle->currentText()==KXftConfig::description((KXftConfig::Hint::Style)s))
return (KXftConfig::Hint::Style)s;
@@ -85,7 +85,7 @@
}
#endif
-@@ -504,13 +504,13 @@
+@@ -527,13 +527,13 @@
QFont f0("Sans Serif", 10);
QFont f1("Monospace", 10);
QFont f2("Sans Serif", 10);
@@ -101,9 +101,9 @@
f4.setPointSize(10);
defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
---- kdebase/kcontrol/krdb/krdb.cpp
-+++ kdebase/kcontrol/krdb/krdb.cpp
-@@ -523,7 +523,7 @@
+--- a/kcontrol/krdb/krdb.cpp
++++ b/kcontrol/krdb/krdb.cpp
+@@ -524,7 +524,7 @@
if (kglobals.hasKey("XftHintStyle"))
{
@@ -112,7 +112,7 @@
contents += "Xft.hinting: ";
if(hintStyle.isEmpty())
contents += "-1\n";
-@@ -539,7 +539,7 @@
+@@ -540,7 +540,7 @@
if (kglobals.hasKey("XftSubPixel"))
{
Modified: trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/19_kcontrol_only_in_kde.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,13 +1,13 @@
---- kde.orig/kcontrol/kcontrol/KControl.desktop
-+++ kde.patched/kcontrol/kcontrol/KControl.desktop
-@@ -86,3 +86,4 @@
+--- a/kcontrol/kcontrol/KControl.desktop
++++ b/kcontrol/kcontrol/KControl.desktop
+@@ -90,3 +90,4 @@
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;Core;
+OnlyShowIn=KDE;
---- kde.orig/kcontrol/kcontrol/kinfocenter.desktop
-+++ kde.patched/kcontrol/kcontrol/kinfocenter.desktop
-@@ -92,3 +92,4 @@
+--- a/kcontrol/kcontrol/kinfocenter.desktop
++++ b/kcontrol/kcontrol/kinfocenter.desktop
+@@ -105,3 +105,4 @@
X-DCOP-ServiceType=Unique
Categories=Qt;KDE;System;
Modified: trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/20_applications_menu_move.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/doc/userguide/kde-for-admins.docbook
-+++ kde.patched/doc/userguide/kde-for-admins.docbook
+--- a/doc/userguide/kde-for-admins.docbook
++++ b/doc/userguide/kde-for-admins.docbook
@@ -1669,7 +1669,7 @@
</para>
Modified: trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/23_startkde_kpersonalizer.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,6 @@
---- kde.orig/startkde
-+++ kde.patched/startkde
-@@ -284,17 +284,21 @@
+--- a/startkde
++++ b/startkde
+@@ -287,17 +287,21 @@
# run KPersonalizer before the session, if this is the first login
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
Modified: trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/25_khelp_htdig.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,5 @@
-diff -uNr kdebase.unpatched/khelpcenter/searchhandlers/khc_docbookdig.pl.in kdebase/khelpcenter/searchhandlers/khc_docbookdig.pl.in
---- kdebase.unpatched/khelpcenter/searchhandlers/khc_docbookdig.pl.in 2007-02-08 10:58:26.000000000 +0200
-+++ kdebase/khelpcenter/searchhandlers/khc_docbookdig.pl.in 2007-02-08 11:02:29.000000000 +0200
+--- a/khelpcenter/searchhandlers/khc_docbookdig.pl.in
++++ b/khelpcenter/searchhandlers/khc_docbookdig.pl.in
@@ -26,10 +26,12 @@
use Getopt::Long;
@@ -42,9 +41,8 @@
local_urls_only: true
limit_urls_to: file:// help:/
ignore_noindex: true
-diff -uNr kdebase.unpatched/khelpcenter/searchhandlers/khc_htdig.pl.in kdebase/khelpcenter/searchhandlers/khc_htdig.pl.in
---- kdebase.unpatched/khelpcenter/searchhandlers/khc_htdig.pl.in 2007-02-08 10:58:26.000000000 +0200
-+++ kdebase/khelpcenter/searchhandlers/khc_htdig.pl.in 2007-02-08 11:02:51.000000000 +0200
+--- a/khelpcenter/searchhandlers/khc_htdig.pl.in
++++ b/khelpcenter/searchhandlers/khc_htdig.pl.in
@@ -26,7 +26,7 @@
use Getopt::Long;
@@ -54,9 +52,8 @@
my $htdigbin = "/usr/bin";
my $kdeprefix = "@prefix@";
chomp $kdeprefix;
-diff -uNr kdebase.unpatched/khelpcenter/searchhandlers/khc_htsearch.pl kdebase/khelpcenter/searchhandlers/khc_htsearch.pl
---- kdebase.unpatched/khelpcenter/searchhandlers/khc_htsearch.pl 2007-02-08 10:58:26.000000000 +0200
-+++ kdebase/khelpcenter/searchhandlers/khc_htsearch.pl 2007-02-08 11:00:47.000000000 +0200
+--- a/khelpcenter/searchhandlers/khc_htsearch.pl
++++ b/khelpcenter/searchhandlers/khc_htsearch.pl
@@ -8,7 +8,7 @@
use open IO => ':utf8';
use open ':std';
Modified: trunk/packages/kdebase/debian/patches/26_face_load.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/26_face_load.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/26_face_load.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,6 @@
---- kde.orig/kdm/kfrontend/kgreeter.cpp
-+++ kde.patched/kdm/kfrontend/kgreeter.cpp
-@@ -167,6 +167,13 @@
+--- a/kdm/kfrontend/kgreeter.cpp
++++ b/kdm/kfrontend/kgreeter.cpp
+@@ -173,6 +173,13 @@
KGreeter::insertUser( const QImage &default_pix,
const QString &username, struct passwd *ps )
{
@@ -14,7 +14,7 @@
if (userList)
userList->append( username );
if (!userView)
-@@ -202,6 +209,9 @@
+@@ -236,6 +243,9 @@
realname.append( "\n" ).append( username );
new UserListViewItem( userView, realname, QPixmap( p ), username );
}
@@ -24,7 +24,7 @@
}
class KCStringList : public QValueList<QCString> {
-@@ -248,15 +258,8 @@
+@@ -282,15 +292,8 @@
{
struct passwd *ps;
@@ -40,7 +40,7 @@
QImage default_pix;
if (userView) {
-@@ -320,10 +323,6 @@
+@@ -354,10 +357,6 @@
if (userList)
userList->sort();
}
Modified: trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,6 @@
---- kde/configure.in 2005-08-29 01:43:19.000000000 +0200
-+++ kde.patched/configure.in 2005-08-29 01:43:55.000000000 +0200
-@@ -1816,6 +1816,7 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1928,6 +1928,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
@@ -8,9 +8,9 @@
*-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
---- kde/configure 2005-08-29 01:42:54.000000000 +0200
-+++ kde.patched/configure 2005-08-29 01:44:36.000000000 +0200
-@@ -52915,6 +52915,7 @@
+--- a/configure
++++ b/configure
+@@ -54545,6 +54545,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
@@ -18,8 +18,8 @@
*-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
---- kde/ksysguard/configure.in.in 2005-08-29 09:59:21.000000000 +0200
-+++ kde.patched/ksysguard/configure.in.in 2005-08-29 10:00:05.000000000 +0200
+--- a/ksysguard/configure.in.in
++++ b/ksysguard/configure.in.in
@@ -3,6 +3,7 @@
case "$host" in
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
Modified: trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/28_kdebase_rubberband.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/kcontrol/style/kcmstyle.cpp
-+++ kde.patched/kcontrol/style/kcmstyle.cpp
+--- a/kcontrol/style/kcmstyle.cpp
++++ b/kcontrol/style/kcmstyle.cpp
@@ -229,6 +229,14 @@
containerLayout->addWidget( lblTooltipEffect, 1, 0 );
containerLayout->addWidget( comboTooltipEffect, 1, 1 );
@@ -61,7 +61,7 @@
item = comboMenuHandle->currentItem();
config.writeEntry( "InsertTearOffHandle", item );
item = comboMenuEffect->currentItem();
-@@ -887,7 +902,11 @@
+@@ -887,7 +901,11 @@
comboTooltipEffect->setCurrentItem( 2 );
else
comboTooltipEffect->setCurrentItem( 0 );
@@ -74,7 +74,7 @@
if ( config.readBoolEntry( "EffectAnimateMenu", false) )
comboMenuEffect->setCurrentItem( 1 );
else if ( config.readBoolEntry( "EffectFadeMenu", false) )
-@@ -898,7 +917,7 @@
+@@ -898,7 +916,7 @@
comboMenuHandle->setCurrentItem(config.readNumEntry("InsertTearOffHandle", 0));
// KStyle Menu transparency and drop-shadow options...
@@ -83,7 +83,7 @@
QString effectEngine = settings.readEntry("/KStyle/Settings/MenuTransparencyEngine", "Disabled");
#ifdef HAVE_XRENDER
-@@ -1027,6 +1046,8 @@
+@@ -1027,6 +1045,8 @@
QWhatsThis::add( comboTooltipEffect, i18n( "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
"<b>Fade: </b>Fade in tooltips using alpha-blending.") );
@@ -92,8 +92,8 @@
QWhatsThis::add( comboMenuEffect, i18n( "<p><b>Disable: </b>do not use any menu effects.</p>\n"
"<p><b>Animate: </b>Do some animation.</p>\n"
"<p><b>Fade: </b>Fade in menus using alpha-blending.</p>\n"
---- kde.orig/kcontrol/style/kcmstyle.h
-+++ kde.patched/kcontrol/style/kcmstyle.h
+--- a/kcontrol/style/kcmstyle.h
++++ b/kcontrol/style/kcmstyle.h
@@ -126,11 +126,13 @@
QFrame* containerFrame;
QGridLayout* containerLayout;
@@ -108,8 +108,8 @@
QLabel* lblComboEffect;
QLabel* lblMenuEffect;
QLabel* lblMenuHandle;
---- kde.orig/konqueror/listview/konq_listviewwidget.cc
-+++ kde.patched/konqueror/listview/konq_listviewwidget.cc
+--- a/konqueror/listview/konq_listviewwidget.cc
++++ b/konqueror/listview/konq_listviewwidget.cc
@@ -405,9 +405,11 @@
{
if ( m_rubber )
@@ -330,8 +330,8 @@
}
void KonqBaseListViewWidget::viewportResizeEvent(QResizeEvent * e)
---- kde.orig/konqueror/listview/konq_listviewwidget.h
-+++ kde.patched/konqueror/listview/konq_listviewwidget.h
+--- a/konqueror/listview/konq_listviewwidget.h
++++ b/konqueror/listview/konq_listviewwidget.h
@@ -206,7 +206,7 @@
virtual void viewportPaintEvent( QPaintEvent *e );
virtual void viewportResizeEvent( QResizeEvent *e );
@@ -351,8 +351,8 @@
bool m_bTopLevelComplete:1;
bool m_showIcons:1;
bool m_bCaseInsensitive:1;
---- kde.orig/kdesktop/kfileividesktop.cpp
-+++ kde.patched/kdesktop/kfileividesktop.cpp
+--- a/kdesktop/kfileividesktop.cpp
++++ b/kdesktop/kfileividesktop.cpp
@@ -134,40 +134,11 @@
return false;
}
@@ -413,8 +413,8 @@
}
else {
// use shadow
---- kde.orig/kdesktop/kfileividesktop.h
-+++ kde.patched/kdesktop/kfileividesktop.h
+--- a/kdesktop/kfileividesktop.h
++++ b/kdesktop/kfileividesktop.h
@@ -80,12 +80,7 @@
virtual void paintItem(QPainter *p, const QColorGroup &cg);
Modified: trunk/packages/kdebase/debian/patches/34_japanese_konsole_fix.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/34_japanese_konsole_fix.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/34_japanese_konsole_fix.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kde.orig/konsole/konsole/konsole_wcwidth.cpp
-+++ kde.patched/konsole/konsole/konsole_wcwidth.cpp
+--- a/konsole/konsole/konsole_wcwidth.cpp
++++ b/konsole/konsole/konsole_wcwidth.cpp
@@ -9,6 +9,10 @@
#include "konsole_wcwidth.h"
@@ -11,7 +11,7 @@
struct interval {
unsigned short first;
unsigned short last;
-@@ -65,7 +69,7 @@ static int bisearch(Q_UINT16 ucs, const
+@@ -65,7 +69,7 @@
* in ISO 10646.
*/
@@ -20,7 +20,7 @@
{
/* sorted list of non-overlapping intervals of non-spacing characters */
static const struct interval combining[] = {
-@@ -131,7 +135,6 @@ int konsole_wcwidth(Q_UINT16 ucs)
+@@ -131,7 +135,6 @@
(ucs >= 0x20000 && ucs <= 0x2ffff) */));
}
@@ -28,7 +28,7 @@
/*
* The following function is the same as konsole_wcwidth(), except that
* spacing characters in the East Asian Ambiguous (A) category as
-@@ -202,15 +205,31 @@ int konsole_wcwidth_cjk(Q_UINT16 ucs)
+@@ -202,15 +205,31 @@
sizeof(ambiguous) / sizeof(struct interval) - 1))
return 2;
@@ -64,8 +64,8 @@
+}
+
+
---- kde.orig/konsole/konsole/konsole_wcwidth.h
-+++ kde.patched/konsole/konsole/konsole_wcwidth.h
+--- a/konsole/konsole/konsole_wcwidth.h
++++ b/konsole/konsole/konsole_wcwidth.h
@@ -10,9 +10,7 @@
#include <qstring.h>
Modified: trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/38_furry_frosted_animals_support.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,5 @@
-diff -Nur kdebase-3.5.8/kcontrol/konqhtml/pluginopts.cpp kdebase-3.5.8.new/kcontrol/konqhtml/pluginopts.cpp
---- kdebase-3.5.8/kcontrol/konqhtml/pluginopts.cpp 2007-10-08 11:51:16.000000000 +0200
-+++ kdebase-3.5.8.new/kcontrol/konqhtml/pluginopts.cpp 2007-10-09 22:40:59.000000000 +0200
+--- a/kcontrol/konqhtml/pluginopts.cpp
++++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -376,6 +376,8 @@
else {//keep sync with kdebase/nsplugins
paths.append("$HOME/.mozilla/plugins");
@@ -10,9 +9,8 @@
paths.append("/usr/lib/firefox/plugins");
paths.append("/usr/lib64/browser-plugins");
paths.append("/usr/lib/browser-plugins");
-diff -Nur kdebase-3.5.8/nsplugins/plugin_paths.cpp kdebase-3.5.8.new/nsplugins/plugin_paths.cpp
---- kdebase-3.5.8/nsplugins/plugin_paths.cpp 2007-10-08 11:51:24.000000000 +0200
-+++ kdebase-3.5.8.new/nsplugins/plugin_paths.cpp 2007-10-09 22:39:57.000000000 +0200
+--- a/nsplugins/plugin_paths.cpp
++++ b/nsplugins/plugin_paths.cpp
@@ -41,6 +41,8 @@
// keep sync with kdebase/kcontrol/konqhtml
paths.append("$HOME/.mozilla/plugins");
Modified: trunk/packages/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/39_be_better_at_honouring_user_kdm_theming.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,8 +1,6 @@
-Index: kdebase/kdm/config.def
-===================================================================
---- kdebase/kdm/config.def (revision 629110)
-+++ kdebase/kdm/config.def (working copy)
-@@ -2608,7 +2608,7 @@
+--- a/kdm/config.def
++++ b/kdm/config.def
+@@ -2607,7 +2607,7 @@
Type: string
Default: ""
User: greeter
Modified: trunk/packages/kdebase/debian/patches/40_kdm_override_docs.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/40_kdm_override_docs.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/40_kdm_override_docs.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kdm/config.def.orig 2007-01-27 13:37:13.000000000 +0100
-+++ kdm/config.def 2007-01-27 13:39:53.000000000 +0100
+--- a/kdm/config.def
++++ b/kdm/config.def
@@ -91,6 +91,12 @@
<kdmrc>
&kdm; master configuration file
Modified: trunk/packages/kdebase/debian/patches/43_kdeprintfax_addquotes.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/43_kdeprintfax_addquotes.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/43_kdeprintfax_addquotes.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kdebase-3.5.5a.dfsg.1/kdeprint/kdeprintfax/defcmds.h_old 2007-01-25 15:44:38.000000000 +0100
-+++ kdebase-3.5.5a.dfsg.1/kdeprint/kdeprintfax/defcmds.h 2007-01-25 15:45:03.000000000 +0100
+--- a/kdeprint/kdeprintfax/defcmds.h
++++ b/kdeprint/kdeprintfax/defcmds.h
@@ -23,7 +23,7 @@
#include <qstring.h>
Deleted: trunk/packages/kdebase/debian/patches/44_klipper_ignore_gecko.diff
Modified: trunk/packages/kdebase/debian/patches/45_klipper_backreferences.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/45_klipper_backreferences.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/45_klipper_backreferences.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,6 +1,5 @@
-diff -Nru kdebase-3.5.7/klipper/urlgrabber.cpp kdebase-3.5.7.sean/klipper/urlgrabber.cpp
---- kdebase-3.5.7/klipper/urlgrabber.cpp 2005-10-10 17:03:59.000000000 +0200
-+++ kdebase-3.5.7.sean/klipper/urlgrabber.cpp 2007-06-07 21:03:21.000000000 +0200
+--- a/klipper/urlgrabber.cpp
++++ b/klipper/urlgrabber.cpp
@@ -51,7 +51,6 @@
{
if( m_config == NULL )
@@ -56,9 +55,8 @@
QString cmdLine = KMacroExpander::expandMacrosShellQuote( command->command, map );
if ( cmdLine.isEmpty() )
-diff -Nru kdebase-3.5.7/klipper/urlgrabber.h kdebase-3.5.7.sean/klipper/urlgrabber.h
---- kdebase-3.5.7/klipper/urlgrabber.h 2005-10-10 17:03:59.000000000 +0200
-+++ kdebase-3.5.7.sean/klipper/urlgrabber.h 2007-06-07 20:58:48.000000000 +0200
+--- a/klipper/urlgrabber.h
++++ b/klipper/urlgrabber.h
@@ -72,7 +72,8 @@
private:
Deleted: trunk/packages/kdebase/debian/patches/47_nsplugins_viewer_64bit_fix.diff
Modified: trunk/packages/kdebase/debian/patches/54_seli_xinerama.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/54_seli_xinerama.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/54_seli_xinerama.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -639,7 +639,7 @@
if( !isShade()) // TODO
{
int old_diff_x = workarea_diff_x;
-@@ -1721,6 +1728,7 @@
+@@ -1722,6 +1729,7 @@
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -647,7 +647,7 @@
}
void Client::plainResize( int w, int h, ForceGeometry_t force )
-@@ -1774,6 +1782,7 @@
+@@ -1775,6 +1783,7 @@
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
@@ -655,7 +655,7 @@
}
/*!
-@@ -1794,6 +1803,7 @@
+@@ -1795,6 +1804,7 @@
sendSyntheticConfigureNotify();
updateWindowRules();
checkMaximizeGeometry();
Modified: trunk/packages/kdebase/debian/patches/61_khelpcenter_max_results.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/61_khelpcenter_max_results.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/61_khelpcenter_max_results.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -1,5 +1,5 @@
---- kdebase/khelpcenter/searchhandlers/khc_htsearch.pl
-+++ kdebase/khelpcenter/searchhandlers/khc_htsearch.pl
+--- a/khelpcenter/searchhandlers/khc_htsearch.pl
++++ b/khelpcenter/searchhandlers/khc_htsearch.pl
@@ -42,7 +42,7 @@
$words = encode( $charset, $words );
Modified: trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff 2008-02-18 21:27:52 UTC (rev 9435)
+++ trunk/packages/kdebase/debian/patches/70_kdm_consolekit.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -780,9 +780,9 @@
dm.c \
--- a/kdm/backend/client.c
+++ b/kdm/backend/client.c
-@@ -82,6 +82,10 @@
- # include <shadow.h>
+@@ -83,6 +83,10 @@
#endif
+ #include <signal.h>
+#ifdef WITH_CONSOLE_KIT
+#include "consolekit.h"
@@ -791,7 +791,7 @@
/*
* Session data, mostly what struct verify_info was for
*/
-@@ -1120,8 +1124,13 @@
+@@ -1121,8 +1125,13 @@
static int removeCreds;
#endif
@@ -805,7 +805,7 @@
{
const char *home, *sessargs, *desksess;
char **env, *xma;
-@@ -1217,6 +1226,11 @@
+@@ -1218,6 +1227,11 @@
if (krbtkfile[0] != '\0')
env = setEnv( env, "KRBTKFILE", krbtkfile );
#endif
Added: trunk/packages/kdebase/debian/patches/71_kio_man_utf8.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/71_kio_man_utf8.diff (rev 0)
+++ trunk/packages/kdebase/debian/patches/71_kio_man_utf8.diff 2008-02-19 07:06:44 UTC (rev 9436)
@@ -0,0 +1,62 @@
+--- a/kioslave/man/kio_man.cpp
++++ b/kioslave/man/kio_man.cpp
+@@ -517,6 +517,11 @@
+ myStdStream += QString::fromLocal8Bit(s, len);
+ }
+
++void MANProtocol::slotGetStdOutputUtf8(KProcess* /* p */, char *s, int len)
++{
++ myStdStream += QString::fromUtf8(s, len);
++}
++
+ char *MANProtocol::readManPage(const char *_filename)
+ {
+ QCString filename = _filename;
+@@ -564,24 +569,20 @@
+ }
+ lastdir = filename.left(filename.findRev('/'));
+
+- QIODevice *fd= KFilterDev::deviceForFile(filename);
+-
+- if ( !fd || !fd->open(IO_ReadOnly))
+- {
+- delete fd;
+- return 0;
+- }
+- QByteArray array(fd->readAll());
+- kdDebug(7107) << "read " << array.size() << endl;
+- fd->close();
+- delete fd;
+-
+- if (array.isEmpty())
+- return 0;
+-
+- const int len = array.size();
++ myStdStream = QString::null;
++ KProcess proc;
++ /* TODO: detect availability of 'man --recode' so that this can go
++ * upstream */
++ proc << "man" << "--recode" << "UTF-8" << filename;
++
++ QApplication::connect(&proc, SIGNAL(receivedStdout (KProcess *, char *, int)),
++ this, SLOT(slotGetStdOutputUtf8(KProcess *, char *, int)));
++ proc.start(KProcess::Block, KProcess::All);
++
++ const QCString cstr=myStdStream.utf8();
++ const int len = cstr.size()-1;
+ buf = new char[len + 4];
+- qmemmove(buf + 1, array.data(), len);
++ qmemmove(buf + 1, cstr.data(), len);
+ buf[0]=buf[len]='\n'; // Start and end with a end of line
+ buf[len+1]=buf[len+2]='\0'; // Two NUL characters at end
+ }
+--- a/kioslave/man/kio_man.h
++++ b/kioslave/man/kio_man.h
+@@ -61,6 +61,7 @@
+
+ private slots:
+ void slotGetStdOutput(KProcess*, char*, int);
++ void slotGetStdOutputUtf8(KProcess*, char*, int);
+
+ private:
+ void checkManPaths();
Deleted: trunk/packages/kdebase/debian/patches/71_ksysguard_lm-sensors-3.diff
Deleted: trunk/packages/kdebase/debian/patches/98_buildprep.diff
More information about the pkg-kde-commits
mailing list