rev 9409 - in trunk/packages/kdelibs/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Thu Feb 14 08:48:28 UTC 2008
Author: fabo
Date: 2008-02-14 08:48:26 +0000 (Thu, 14 Feb 2008)
New Revision: 9409
Removed:
trunk/packages/kdelibs/debian/patches/00_detect-autoconf.diff
trunk/packages/kdelibs/debian/patches/01_qxembed-create-fix_branch_r757346.diff
trunk/packages/kdelibs/debian/patches/50_handle_timestamps.diff
trunk/packages/kdelibs/debian/patches/51_fix_http_regression.diff
trunk/packages/kdelibs/debian/patches/52_kselectaction_fix_upstream.diff
trunk/packages/kdelibs/debian/patches/56_fix_acid3_test_segfault.diff
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode_extra.diff
trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
trunk/packages/kdelibs/debian/patches/11_applications_menu.diff
trunk/packages/kdelibs/debian/patches/12_cups_docroot.diff
trunk/packages/kdelibs/debian/patches/13_cups_sysgroup.diff
trunk/packages/kdelibs/debian/patches/14_kaccel.diff
trunk/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff
trunk/packages/kdelibs/debian/patches/16_qtmotifplus.diff
trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff
trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff
trunk/packages/kdelibs/debian/patches/20_no_libadd_in_convenience_libs.diff
trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff
trunk/packages/kdelibs/debian/patches/23_libtool_workaround_buildfix.diff
trunk/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff
trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff
trunk/packages/kdelibs/debian/patches/34_cups12_init_script.diff
trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff
trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff
trunk/packages/kdelibs/debian/patches/45_gmail_spoof.diff
trunk/packages/kdelibs/debian/patches/47_better_tty_err_msg_kdeinit.diff
trunk/packages/kdelibs/debian/patches/49_hurd_support.diff
trunk/packages/kdelibs/debian/patches/53_kdelibs_ltdl_ext.diff
trunk/packages/kdelibs/debian/patches/54_seli_xinerama.diff
Log:
* Remove patches merged upstream.
* Refresh other patches.
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/changelog 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,11 +1,23 @@
-kdelibs (4:3.5.8.dfsg.1-8) UNRELEASED; urgency=low
+kdelibs (4:3.5.9.dfsg.1-1) UNRELEASED; urgency=low
+ * New upstream release.
+
+++ Changes by Sune Vuorela:
* Remove hspell from kdelibs4-dev dependencies. It is not needed (anymore?)
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 03 Feb 2008 16:57:06 +0100
+ +++ Changes by Fathi Boudra:
+ * Remove patches merged upstream:
+ * 00_detect-autoconf.diff
+ * 01_qxembed-create-fix_branch_r757346.diff
+ * 50_handle_timestamps.diff
+ * 51_fix_http_regression.diff
+ * 52_kselectaction_fix_upstream.diff
+ * 56_fix_acid3_test_segfault.diff
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 14 Feb 2008 09:22:13 +0100
+
kdelibs (4:3.5.8.dfsg.1-7) unstable; urgency=low
+++ Changes by Matthew Rosewarne:
Deleted: trunk/packages/kdelibs/debian/patches/00_detect-autoconf.diff
Deleted: trunk/packages/kdelibs/debian/patches/01_qxembed-create-fix_branch_r757346.diff
Modified: trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode_extra.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode_extra.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/04_am_maintainer_mode_extra.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-orig/configure.in.in
-+++ kdelibs-patched/configure.in.in
+--- a/configure.in.in
++++ b/configure.in.in
@@ -19,6 +19,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
Modified: trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,6 +1,5 @@
-diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp
---- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp 2005-01-14 21:46:57.964666000 -0800
-+++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp 2005-01-14 21:49:53.043136983 -0800
+--- a/kdecore/kstandarddirs.cpp
++++ b/kdecore/kstandarddirs.cpp
@@ -834,6 +834,10 @@
if ((local || testdir.exists()) && !candidates->contains(path))
candidates->append(path);
Modified: trunk/packages/kdelibs/debian/patches/11_applications_menu.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_applications_menu.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/11_applications_menu.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,6 +1,7 @@
---- kdelibs-orig/kded/applications.menu
-+++ kdelibs-patched/kded/applications.menu
-@@ -466,4 +466,11 @@
+--- a/kded/applications.menu
++++ b/kded/applications.menu
+@@ -465,5 +465,12 @@
+ </And>
</Include>
<DefaultMergeDirs/>
+
Modified: trunk/packages/kdelibs/debian/patches/12_cups_docroot.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/12_cups_docroot.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/12_cups_docroot.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsd.conf.template
-+++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsd.conf.template
+--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template
@@ -100,9 +100,9 @@
# The root directory for HTTP documents that are served.
# By default the compiled-in directory.</p>
@@ -12,8 +12,8 @@
@@
%%errorlog
---- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
-+++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+--- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -66,7 +66,7 @@
<< "/usr/local/share/cups"
<< "/opt/share/cups"
Modified: trunk/packages/kdelibs/debian/patches/13_cups_sysgroup.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/13_cups_sysgroup.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/13_cups_sysgroup.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsd.conf.template
-+++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsd.conf.template
+--- a/kdeprint/cups/cupsdconf2/cupsd.conf.template
++++ b/kdeprint/cups/cupsdconf2/cupsd.conf.template
@@ -272,12 +272,12 @@
# <b>Group (Group)</b>
# <p>
@@ -28,8 +28,8 @@
@@
%%servercertificate
---- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp
-+++ kdelibs-patched/kdeprint/cups/cupsdconf2/cupsdconf.cpp
+--- a/kdeprint/cups/cupsdconf2/cupsdconf.cpp
++++ b/kdeprint/cups/cupsdconf2/cupsdconf.cpp
@@ -90,7 +90,7 @@
printcap_ = "/etc/printcap";
printcapformat_ = PRINTCAP_BSD;
Modified: trunk/packages/kdelibs/debian/patches/14_kaccel.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_kaccel.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/14_kaccel.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-orig/kdecore/kaccel.cpp
-+++ kdelibs-patched/kdecore/kaccel.cpp
+--- a/kdecore/kaccel.cpp
++++ b/kdecore/kaccel.cpp
@@ -127,7 +127,10 @@
return false;
Modified: trunk/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/15_dcopidlng_jfs-patch.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs.orig/dcop/dcopidlng/dcopidlng
-+++ kdelibs/dcop/dcopidlng/dcopidlng
+--- a/dcop/dcopidlng/dcopidlng
++++ b/dcop/dcopidlng/dcopidlng
@@ -1,15 +1,16 @@
#!/bin/sh
Modified: trunk/packages/kdelibs/debian/patches/16_qtmotifplus.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/16_qtmotifplus.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/16_qtmotifplus.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,6 +1,6 @@
---- kde.orig/kstyles/themes/qtmotifplus.themerc
-+++ kde.patched/kstyles/themes/qtmotifplus.themerc
-@@ -91,5 +91,3 @@
+--- a/kstyles/themes/qtmotifplus.themerc
++++ b/kstyles/themes/qtmotifplus.themerc
+@@ -98,5 +98,3 @@
Comment[zu]=Isitayela se-Mofit esenziwe ngcono
[KDE]
WidgetStyle=MotifPlus
Modified: trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kde.orig/kdefx/kstyle.cpp
-+++ kde.patched/kdefx/kstyle.cpp
+--- a/kdefx/kstyle.cpp
++++ b/kdefx/kstyle.cpp
@@ -154,6 +154,7 @@
bool menuAltKeyNavigation : 1;
bool menuDropShadow : 1;
@@ -74,8 +74,8 @@
} else
QCommonStyle::drawPrimitive( pe, p, r, cg, flags, opt );
}
---- kde.orig/kdeui/kiconview.cpp
-+++ kde.patched/kdeui/kiconview.cpp
+--- a/kdeui/kiconview.cpp
++++ b/kdeui/kiconview.cpp
@@ -548,7 +548,7 @@
r = m_wordWrap->boundingRect();
Modified: trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kde.orig/kio/kio/kprotocolmanager.cpp
-+++ kde.patched/kio/kio/kprotocolmanager.cpp
+--- a/kio/kio/kprotocolmanager.cpp
++++ b/kio/kio/kprotocolmanager.cpp
@@ -450,14 +450,19 @@
return d->useragent;
Modified: trunk/packages/kdelibs/debian/patches/20_no_libadd_in_convenience_libs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/20_no_libadd_in_convenience_libs.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/20_no_libadd_in_convenience_libs.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-3.4.2/kdoctools/Makefile.am
-+++ kdelibs-3.4.2/kdoctools/Makefile.am
+--- a/kdoctools/Makefile.am
++++ b/kdoctools/Makefile.am
@@ -5,18 +5,17 @@
noinst_LTLIBRARIES = libkbzipfilter_dummy.la
@@ -30,8 +30,8 @@
meinproc_SOURCES = meinproc.cpp
xslt_pure.o: xslt.cpp
---- kdelibs-3.4.2/kspell2/Makefile.am 2005-05-23 14:16:10.000000000 +0200
-+++ kdelibs-3.4.2/kspell2/Makefile.am 2005-08-18 13:13:22.000000000 +0200
+--- a/kspell2/Makefile.am
++++ b/kspell2/Makefile.am
@@ -17,7 +17,6 @@
defaultdictionary.cpp
@@ -40,16 +40,16 @@
servicetype_DATA = kspellclient.desktop
servicetypedir = $(kde_servicetypesdir)
---- kdelibs-3.4.2/kspell2/ui/Makefile.am 2005-07-20 11:19:24.000000000 +0200
-+++ kdelibs-3.4.2/kspell2/ui/Makefile.am 2005-08-18 13:11:02.000000000 +0200
+--- a/kspell2/ui/Makefile.am
++++ b/kspell2/ui/Makefile.am
@@ -18,4 +18,4 @@
libkspell2_la_SOURCES = dialog.cpp
libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la
+libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la $(LIB_KPARTS) ../../kutils/libkutils.la
---- kdelibs-3.4.2/kspell2/tests/Makefile.am 2005-07-20 11:19:24.000000000 +0200
-+++ kdelibs-3.4.2/kspell2/tests/Makefile.am 2005-08-18 13:12:01.000000000 +0200
+--- a/kspell2/tests/Makefile.am
++++ b/kspell2/tests/Makefile.am
@@ -18,7 +18,7 @@
test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
Modified: trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kde.orig/configure.in.in 2005-05-23 14:17:19.000000000 +0200
-+++ kde.patched/configure.in.in 2005-08-27 23:48:59.000000000 +0200
+--- a/configure.in.in
++++ b/configure.in.in
@@ -48,7 +48,7 @@
KDE_CHECK_STL
AC_HEADER_DIRENT
@@ -18,8 +18,8 @@
AH_BOTTOM([
/* provide a definition for a 32 bit entity, usable as a typedef, possibly
---- kde.orig/kdecore/kpty.cpp 2005-05-23 14:16:21.000000000 +0200
-+++ kde.patched/kdecore/kpty.cpp 2005-08-27 15:15:37.000000000 +0200
+--- a/kdecore/kpty.cpp
++++ b/kdecore/kpty.cpp
@@ -95,24 +95,24 @@
# endif
#endif
@@ -57,8 +57,8 @@
#endif
#if defined (_HPUX_SOURCE)
---- kde.orig/kinit/kinit.cpp 2005-07-20 11:19:21.000000000 +0200
-+++ kde.patched/kinit/kinit.cpp 2005-08-27 15:15:37.000000000 +0200
+--- a/kinit/kinit.cpp
++++ b/kinit/kinit.cpp
@@ -60,7 +60,7 @@
#include <kapplication.h>
#include <klocale.h>
@@ -77,9 +77,9 @@
/* set the process name, so that killall works like intended */
r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
if ( r == 0 )
---- kde.orig/kio/kfile/kpropertiesdialog.cpp
-+++ kde.patched/kio/kfile/kpropertiesdialog.cpp
-@@ -1864,7 +1864,14 @@
+--- a/kio/kfile/kpropertiesdialog.cpp
++++ b/kio/kfile/kpropertiesdialog.cpp
+@@ -1881,7 +1881,14 @@
fileSystemSupportsACLs = ( statfs( pathCString.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
Modified: trunk/packages/kdelibs/debian/patches/23_libtool_workaround_buildfix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_libtool_workaround_buildfix.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/23_libtool_workaround_buildfix.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kde.orig/kdoctools/Makefile.am
-+++ kde.patched/kdoctools/Makefile.am
+--- a/kdoctools/Makefile.am
++++ b/kdoctools/Makefile.am
@@ -24,7 +24,7 @@
kdelnkdir = $(kde_servicesdir)
Modified: trunk/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/24_libkdefakes_pic.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kde.orig/kdecore/Makefile.am
-+++ kde.patched/kdecore/Makefile.am
+--- a/kdecore/Makefile.am
++++ b/kdecore/Makefile.am
@@ -34,7 +34,7 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
Modified: trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kde.orig/dnssd/configure.in.in 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/configure.in.in 2006-01-24 13:54:50.000000000 -0500
+--- a/dnssd/configure.in.in
++++ b/dnssd/configure.in.in
@@ -1,38 +1,17 @@
#MIN_CONFIG
@@ -53,8 +53,8 @@
+AC_SUBST(AVAHI_CFLAGS)
+AC_SUBST(AVAHI_LIBS)
+PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
---- kde.orig/dnssd/domainbrowser.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/domainbrowser.cpp 2005-12-15 15:28:03.000000000 -0500
+--- a/dnssd/domainbrowser.cpp
++++ b/dnssd/domainbrowser.cpp
@@ -27,46 +27,56 @@
#include "query.h"
#include "servicebrowser.h"
@@ -203,8 +203,8 @@
}
#include "domainbrowser.moc"
---- kde.orig/dnssd/Makefile.am 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/Makefile.am 2006-01-25 11:05:03.000000000 -0500
+--- a/dnssd/Makefile.am
++++ b/dnssd/Makefile.am
@@ -1,5 +1,5 @@
# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir) $(all_includes)
@@ -221,8 +221,8 @@
libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
#kde_kcfg_DATA = kcm_kdnssd.kcfg
---- kde.orig/dnssd/publicservice.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/publicservice.cpp 2006-01-24 17:31:34.000000000 -0500
+--- a/dnssd/publicservice.cpp
++++ b/dnssd/publicservice.cpp
@@ -30,6 +30,12 @@
#include <network/ksocketaddress.h>
#include <kurl.h>
@@ -506,8 +506,8 @@
}
}
---- kde.orig/dnssd/publicservice.h 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/publicservice.h 2005-10-14 05:00:19.000000000 -0400
+--- a/dnssd/publicservice.h
++++ b/dnssd/publicservice.h
@@ -23,6 +23,7 @@
#include <qobject.h>
@@ -527,8 +527,8 @@
protected:
virtual void customEvent(QCustomEvent* event);
---- kde.orig/dnssd/query.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/query.cpp 2005-12-15 15:28:03.000000000 -0500
+--- a/dnssd/query.cpp
++++ b/dnssd/query.cpp
@@ -22,26 +22,46 @@
#include "responder.h"
#include "remoteservice.h"
@@ -723,8 +723,8 @@
+
}
#include "query.moc"
---- kde.orig/dnssd/README 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/README 2005-09-01 08:58:05.000000000 -0400
+--- a/dnssd/README
++++ b/dnssd/README
@@ -1,12 +1,11 @@
Checklist to ensure that zeroconf will work:
@@ -741,8 +741,8 @@
5) for testing: use kpf kicker applet to publish a directory, then open 'zeroconf:/'
URL in konqueror. You should be able to see a local webserver with that published dir.
---- kde.orig/dnssd/remoteservice.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/remoteservice.cpp 2005-12-15 15:28:03.000000000 -0500
+--- a/dnssd/remoteservice.cpp
++++ b/dnssd/remoteservice.cpp
@@ -27,33 +27,39 @@
#include <sys/types.h>
#endif
@@ -903,8 +903,8 @@
}
---- kde.orig/dnssd/responder.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/responder.cpp 2005-12-15 15:28:03.000000000 -0500
+--- a/dnssd/responder.cpp
++++ b/dnssd/responder.cpp
@@ -20,62 +20,61 @@
#include "responder.h"
@@ -1024,8 +1024,8 @@
}
---- kde.orig/dnssd/responder.h 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/responder.h 2005-12-15 15:28:03.000000000 -0500
+--- a/dnssd/responder.h
++++ b/dnssd/responder.h
@@ -25,12 +25,7 @@
#include <qsocketnotifier.h>
#include <qsignal.h>
@@ -1091,8 +1091,8 @@
}
#endif
---- kde.orig/dnssd/sdevent.h 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/sdevent.h 2005-10-14 05:00:19.000000000 -0400
+--- a/dnssd/sdevent.h
++++ b/dnssd/sdevent.h
@@ -41,24 +41,23 @@
public:
enum Operation { Add, Remove };
@@ -1122,8 +1122,8 @@
};
class ResolveEvent : public QCustomEvent
---- kde.orig/dnssd/servicebase.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/servicebase.cpp 2005-10-14 05:00:19.000000000 -0400
+--- a/dnssd/servicebase.cpp
++++ b/dnssd/servicebase.cpp
@@ -34,7 +34,7 @@
QString ServiceBase::encode()
@@ -1133,8 +1133,8 @@
QString(".") + m_domain;
}
---- kde.orig/dnssd/servicebrowser.cpp 2006-02-01 21:14:02.000000000 -0500
-+++ kde.patched/dnssd/servicebrowser.cpp 2005-11-18 15:34:40.000000000 -0500
+--- a/dnssd/servicebrowser.cpp
++++ b/dnssd/servicebrowser.cpp
@@ -23,14 +23,11 @@
#include <qstringlist.h>
#include <qfile.h>
Modified: trunk/packages/kdelibs/debian/patches/34_cups12_init_script.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/34_cups12_init_script.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/34_cups12_init_script.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,8 +1,6 @@
---- kde.orig/kdeprint/cups/cupsdconf2/cupsddialog.cpp
-+++ kde.patched/kdeprint/cups/cupsdconf2/cupsddialog.cpp
-@@ -204,18 +204,13 @@ bool CupsdDialog::restartServer(QString&
- msg = i18n("Unable to find a running CUPS server");
- }
+--- a/kdeprint/cups/cupsdconf2/cupsddialog.cpp
++++ b/kdeprint/cups/cupsdconf2/cupsddialog.cpp
+@@ -206,14 +206,9 @@
else
{
bool success = false;
@@ -20,5 +18,3 @@
if( !success )
msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
}
- return (msg.isEmpty());
- }
Modified: trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,6 +1,5 @@
-diff -Nur kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp kdelibs-3.5.5a.dfsg.1.new/kded/vfolder_menu.cpp
---- kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp 2006-11-08 17:51:51.000000000 +0100
-+++ kdelibs-3.5.5a.dfsg.1.new/kded/vfolder_menu.cpp 2006-11-08 17:57:37.000000000 +0100
+--- a/kded/vfolder_menu.cpp
++++ b/kded/vfolder_menu.cpp
@@ -774,7 +774,9 @@
QString result;
Modified: trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-3.5.5a.dfsg.1/kio/misc/kwalletd/kwalletd.cpp 2006-10-01 13:33:33.000000000 -0400
-+++ kdelibs-3.5.5a.dfsg.1/kio/misc/kwalletd/kwalletd.cpp 2007-01-17 09:50:00.000000000 -0500
+--- a/kio/misc/kwalletd/kwalletd.cpp
++++ b/kio/misc/kwalletd/kwalletd.cpp
@@ -829,6 +829,12 @@
if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
Modified: trunk/packages/kdelibs/debian/patches/45_gmail_spoof.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/45_gmail_spoof.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/45_gmail_spoof.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,6 +1,6 @@
---- kdelibs-3.5.7.dfsg.1/khtml/html/html_elementimpl.cpp.orig 2007-05-20 18:47:02.000000000 +0200
-+++ kdelibs-3.5.7.dfsg.1/khtml/html/html_elementimpl.cpp 2007-05-20 18:48:47.000000000 +0200
-@@ -562,6 +562,13 @@
+--- a/khtml/html/html_elementimpl.cpp
++++ b/khtml/html/html_elementimpl.cpp
+@@ -561,6 +561,13 @@
void HTMLElementImpl::setInnerHTML( const DOMString &html, int &exceptioncode )
{
Modified: trunk/packages/kdelibs/debian/patches/47_better_tty_err_msg_kdeinit.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/47_better_tty_err_msg_kdeinit.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/47_better_tty_err_msg_kdeinit.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,7 +1,5 @@
-Index: kdelibs/kinit/kinit.cpp
-===================================================================
---- kdelibs/kinit/kinit.cpp (revision 688275)
-+++ kdelibs/kinit/kinit.cpp (working copy)
+--- a/kinit/kinit.cpp
++++ b/kinit/kinit.cpp
@@ -256,18 +256,18 @@
int fd = open( tty, O_WRONLY );
if( fd < 0 )
Modified: trunk/packages/kdelibs/debian/patches/49_hurd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/49_hurd_support.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/49_hurd_support.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-3.5.7.dfsg.1/kio/kio/kurlcompletion.cpp.orig 2007-08-21 01:20:27.125594000 +0200
-+++ kdelibs-3.5.7.dfsg.1/kio/kio/kurlcompletion.cpp 2007-08-21 01:28:02.002981000 +0200
+--- a/kio/kio/kurlcompletion.cpp
++++ b/kio/kio/kurlcompletion.cpp
@@ -231,6 +231,9 @@
while ( !terminationRequested() &&
(dirEntry = ::readdir( dir)))
@@ -10,8 +10,8 @@
struct dirent *dirPosition = (struct dirent *) malloc( sizeof( struct dirent ) + MAXPATHLEN + 1 );
struct dirent *dirEntry = 0;
while ( !terminationRequested() &&
---- kdelibs-3.5.7.dfsg.1/kdoctools/meinproc.cpp.orig 2007-08-21 01:40:47.688059000 +0200
-+++ kdelibs-3.5.7.dfsg.1/kdoctools/meinproc.cpp 2007-08-21 01:46:17.833610000 +0200
+--- a/kdoctools/meinproc.cpp
++++ b/kdoctools/meinproc.cpp
@@ -136,9 +136,18 @@
}
@@ -52,8 +52,8 @@
}
xmlSubstituteEntitiesDefault(1);
---- kdelibs-3.5.7.dfsg.1/kioslave/file/file.cc.orig 2007-08-21 01:51:36.702504000 +0200
-+++ kdelibs-3.5.7.dfsg.1/kioslave/file/file.cc 2007-08-21 01:55:39.362966000 +0200
+--- a/kioslave/file/file.cc
++++ b/kioslave/file/file.cc
@@ -1234,8 +1234,13 @@
directories we keep as active directory. And
as the slave runs in the background, it's hard
@@ -78,8 +78,8 @@
finished();
}
---- kdelibs-3.5.7.dfsg.1/libkmid/fmout.cc.orig 2007-08-21 02:05:03.032474000 +0200
-+++ kdelibs-3.5.7.dfsg.1/libkmid/fmout.cc 2007-08-21 02:08:08.281128000 +0200
+--- a/libkmid/fmout.cc
++++ b/libkmid/fmout.cc
@@ -127,8 +127,8 @@
void FMOut::loadFMPatches(void)
{
@@ -120,8 +120,8 @@
}
fh=fopen(drumsfile,"rb");
---- kdelibs-3.5.7.dfsg.1/kinit/lnusertemp.c.orig 2007-08-21 02:16:31.074726000 +0200
-+++ kdelibs-3.5.7.dfsg.1/kinit/lnusertemp.c 2007-08-21 02:17:13.037686000 +0200
+--- a/kinit/lnusertemp.c
++++ b/kinit/lnusertemp.c
@@ -89,6 +89,9 @@
}
Deleted: trunk/packages/kdelibs/debian/patches/50_handle_timestamps.diff
Deleted: trunk/packages/kdelibs/debian/patches/51_fix_http_regression.diff
Deleted: trunk/packages/kdelibs/debian/patches/52_kselectaction_fix_upstream.diff
Modified: trunk/packages/kdelibs/debian/patches/53_kdelibs_ltdl_ext.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/53_kdelibs_ltdl_ext.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/53_kdelibs_ltdl_ext.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -1,5 +1,5 @@
---- kdelibs-3.5.8.dfsg.1.orig/libltdl/ltdl.c
-+++ kdelibs-3.5.8.dfsg.1/libltdl/ltdl.c
+--- a/libltdl/ltdl.c
++++ b/libltdl/ltdl.c
@@ -184,6 +184,7 @@
#define LT_DLSTRERROR(name) lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
Modified: trunk/packages/kdelibs/debian/patches/54_seli_xinerama.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/54_seli_xinerama.diff 2008-02-14 00:23:03 UTC (rev 9408)
+++ trunk/packages/kdelibs/debian/patches/54_seli_xinerama.diff 2008-02-14 08:48:26 UTC (rev 9409)
@@ -176,7 +176,7 @@
KStartupInfo::sendStartup( id, data );
}
pid_t pid = KProcessRunner::run( proc, binName, id );
-@@ -629,7 +638,8 @@
+@@ -635,7 +644,8 @@
return true;
}
@@ -186,7 +186,7 @@
{
if (!_urls.isEmpty()) {
kdDebug(7010) << "runTempService: first url " << _urls.first().url() << endl;
-@@ -648,7 +658,7 @@
+@@ -654,7 +664,7 @@
{
KURL::List singleUrl;
singleUrl.append(*it);
@@ -195,7 +195,7 @@
}
KURL::List singleUrl;
singleUrl.append(_urls.first());
-@@ -667,7 +677,7 @@
+@@ -673,7 +683,7 @@
proc->setWorkingDirectory(_service.path());
return runCommandInternal( proc, &_service, KRun::binaryName( _service.exec(), false ),
@@ -204,7 +204,7 @@
}
// WARNING: don't call this from processDesktopExec, since klauncher uses that too...
-@@ -728,11 +738,22 @@
+@@ -734,11 +744,22 @@
pid_t KRun::run( const KService& _service, const KURL::List& _urls, QWidget* window, bool tempFiles )
{
@@ -228,7 +228,7 @@
if (!_service.desktopEntryPath().isEmpty() &&
!KDesktopFile::isAuthorizedDesktopFile( _service.desktopEntryPath()))
{
-@@ -753,7 +774,7 @@
+@@ -759,7 +780,7 @@
if ( tempFiles || _service.desktopEntryPath().isEmpty() || !suggestedFileName.isEmpty() )
{
@@ -237,7 +237,7 @@
}
kdDebug(7010) << "KRun::run " << _service.desktopEntryPath() << endl;
-@@ -767,9 +788,25 @@
+@@ -773,9 +794,25 @@
QString error;
int pid = 0;
@@ -265,7 +265,7 @@
);
if (i != 0)
-@@ -794,33 +831,47 @@
+@@ -800,33 +837,47 @@
pid_t KRun::runCommand( QString cmd )
{
@@ -318,7 +318,7 @@
bool showProgressInfo )
{
m_bFault = false;
-@@ -836,6 +887,7 @@
+@@ -842,6 +893,7 @@
d = new KRunPrivate;
d->m_runExecutables = true;
d->m_window = window;
@@ -326,7 +326,7 @@
setEnableExternalBrowser(true);
// Start the timer. This means we will return to the event
-@@ -936,7 +988,7 @@
+@@ -942,7 +994,7 @@
KService::Ptr service = KService::serviceByStorageId( exec );
if (service)
{
@@ -335,7 +335,7 @@
ok = true;
}
}
-@@ -1229,7 +1281,7 @@
+@@ -1235,7 +1287,7 @@
{
KURL::List lst;
lst.append( m_strURL );
@@ -344,7 +344,7 @@
/// Note: the line above means that if that service failed, we'll
/// go to runURL to maybe find another service, even though a dialog
/// box was displayed. That's good if runURL tries another service,
-@@ -1244,7 +1296,7 @@
+@@ -1250,7 +1302,7 @@
m_strURL.setPath( d->m_localPath );
}
Deleted: trunk/packages/kdelibs/debian/patches/56_fix_acid3_test_segfault.diff
More information about the pkg-kde-commits
mailing list