Hello Mark:
Thanks for caring about this.
El Miércoles 29 Octubre 2008, Mark Purcell escribió:
> On Monday 27 October 2008 09:17:22 Debian Qt/KDE Maintainers wrote:
> > kdelibs (4:3.5.10.dfsg.1-1) unstable; urgency=low
> > +++ Changes by Ana Beatriz Guerrero Lopez:
>
> [...]
>
> > +++ Changes by Raúl Sánchez Siles:
> > * konqueror: Crash on eBay page (Closes: #502459) with recently added
> >
> > > 63_fixed-layout-table.diff
>
> Ana, Raúl et al,
>
> While the RC bug (#502459) has been fixed in sid via the upload of kdelibs
> 4:3.5.10.dfsg.1-1, this still leaves open the resolution of this RC bug for
> lenny. (4:3.5.9.dfsg.1-6)
>
> Options for resolution in lenny:
>
> 1. Upload a new kdelibs 3.5.9, say -7, with 63_fixed-layout-table.diff
> targeted at testing-proposed-updates, or
>
> 2. Convince debian-release that lenny should be released with kdelibs
> 3.5.10 - currently in experimental.
>
> I suspect that option 1 maybe more successful.
>
> Mark
As we all KDE users know, kdelibs plays a major role in the stability and
usability of whole KDE3, the one to be released on Lenny. It is true that
changing the released version from current Lenny's apparent 3.5.9 to sid's
3.5.10 may startle anyone, but there isn't that striking change.
Lenny's kdelibs version includes a branch pull which makes it almost 3.5.10,
except some minor details as, e.g.: version number. This was included before
the freeze. You can check out that in the move some "big" patches had been
removed by the fact of providing 3.5.10.
I've done some work in order to show the differences between the lenny and
sid versions. I took both sources, applied patches and analysed differences.
The whole diffstat is attached as 9-10.diffstat where you can see all the
file changes done. As you can see there changes haven't been very impressive.
But after that, I refined the information, I used this command:
ff -rNup kdelibs-3.5.9.dfsg.1/ kdelibs-3.5.10.dfsg.1/ |
filterdiff -p1 -x '*debian*' |filterdiff -x '*.desktop' |
filterdiff -x "*Makefile.in" |filterdiff -p1 -x "kdeui/kdepackages.h"
>9-10.diff
So I took out debian dir changes, desktop file changes, autotools generated
Makefile.in and kdepackages.h file which is a file used as a helper to bug
tracking, where versions and applications are defined. The result off all of
this is easily readable and is attached as 9-10.diff.
The changelog between sid and Lenny versions is also attached as
9-10.changelog. As well as the modifications implied when providing real
3.5.10 and not 3.5.10 pretending to be 3.5.9, there are 3 groups of changes
we may break down:
· Major:
#502459 fix
62_fix_googlemaps_backport.diff, IMHO as serious the previous one.
· Relevant:
libcups build-deps update
cups init script name fix, which prevented restarting cups from KDE
buildprep fix which prevented double-compilation works (release goal).
· Minor.
The rest. Altough some of them quite interesting to have.
In summary, I think not only #502459 should be provided in Lenny but also
the rest of changes should be studied/included.
Feel free to answer whatever doubt you may have about this issue. Comments
are also welcome.
Regards,
--
Raúl Sánchez Siles
----->Proud Debian user<-----
Linux registered user #416098
README | 2 admin/cvs.sh | 2 configure | 2 configure.in | 2 dcop/dcopidl/Makefile.in | 2 dcop/dcopidl2cpp/Makefile.in | 2 debian/changelog | 33 debian/control | 6 debian/control.in | 4 debian/control.tmp | 6 debian/patches/01_kdelibs_branch_r828883.diff |19934 ---------- debian/patches/01_kdelibs_branch_r828883.diff.log | 492 debian/patches/02_kate_regression_r777286.diff | 14 debian/patches/02_kate_regression_r777286.diff.level-1.log | 1 debian/patches/03_start_kdeinit_integer_overflow.diff | 117 debian/patches/03_start_kdeinit_integer_overflow.diff.level-1.log | 1 debian/patches/05_kate_debianchangelog_default_context_r799980.diff | 106 debian/patches/05_kate_debianchangelog_default_context_r799980.diff.level-1.log | 2 debian/patches/06_khtml_rendering_r786289.diff | 436 debian/patches/06_khtml_rendering_r786289.diff.level-1.log | 7 debian/patches/34_cups12_init_script.diff | 2 debian/patches/61_httpheader_backport.diff | 13 debian/patches/61_httpheader_backport.diff.level-1.log | 2 debian/patches/62_fix_googlemaps_backport.diff | 39 debian/patches/62_fix_googlemaps_backport.diff.level-1.log | 1 debian/patches/63_fixed-layout-table.diff | 24 debian/patches/63_fixed-layout-table.diff.level-1.log | 1 debian/patches/98_buildprep.diff | 1143 debian/patches/98_buildprep.diff.level-1.log | 1 kate/data/debianchangelog.xml | 54 kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop | 2 kdecore/all_languages.desktop | 21 kdecore/eventsrc | 2 kdecore/kapplication.cpp | 4 kdecore/kdeversion.h | 4 kdecore/ktempfile.cpp | 2 kdelibs.lsm | 4 kdeprint/cups/cupsdconf2/cupsddialog.cpp | 2 kdeprint/filters/pdf2ps.desktop | 1 kdeprint/management/kmjobviewer.cpp | 2 kdesu/process.cpp | 2 kdesu/process.h | 2 kdeui/Makefile.am | 2 kdeui/Makefile.in | 2 kdeui/kdepackages.h | 69 kdeui/kdetrayproxy/kdetrayproxy.desktop | 4 khtml/ecma/kjs_dom.cpp | 16 khtml/rendering/table_layout.cpp | 6 kio/kpasswdserver/kpasswdserver.cpp | 4 kio/misc/kpac/eventsrc | 10 kio/misc/kpac/proxyscout.desktop | 2 kioslave/http/http.cc | 2 kstyles/themes/light-v2.themerc | 2 kstyles/themes/light-v3.themerc | 2 mimetypes/application/pgp-encrypted.desktop | 2 mimetypes/application/pgp.desktop | 2 mimetypes/application/sieve.desktop | 2 mimetypes/application/vnd.ms-asf.desktop | 2 mimetypes/application/x-bz2dvi.desktop | 2 mimetypes/application/x-bzip.desktop | 2 mimetypes/application/x-bzip2.desktop | 2 mimetypes/application/x-compress.desktop | 2 mimetypes/application/x-gzdvi.desktop | 2 mimetypes/application/x-gzip.desktop | 2 mimetypes/application/x-gzpostscript.desktop | 2 mimetypes/application/x-lzop.desktop | 2 mimetypes/application/x-tarz.desktop | 2 mimetypes/application/x-tbz.desktop | 2 mimetypes/application/x-tex-pk.desktop | 2 mimetypes/application/x-tgz.desktop | 2 mimetypes/application/x-tzo.desktop | 2 mimetypes/message/rfc822.desktop | 2 mimetypes/video/x-ms-asf.desktop | 2 pics/crystalsvg/Makefile.in | 2 74 files changed, 272 insertions(+), 22388 deletions(-)
diff -rNup kdelibs-3.5.9.dfsg.1/admin/cvs.sh kdelibs-3.5.10.dfsg.1/admin/cvs.sh
--- kdelibs-3.5.9.dfsg.1/admin/cvs.sh 2008-02-13 14:21:20.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/admin/cvs.sh 2008-08-19 22:28:39.000000000 +0200
@@ -316,7 +316,7 @@ if test -f configure.in.in; then
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.9\""
+ VERSION="\"3.5.10\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
diff -rNup kdelibs-3.5.9.dfsg.1/configure kdelibs-3.5.10.dfsg.1/configure
--- kdelibs-3.5.9.dfsg.1/configure 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/configure 2008-10-30 00:06:04.000000000 +0100
@@ -2852,7 +2852,7 @@ fi
# Define the identity of the package.
PACKAGE=kdelibs.dfsg.1
- VERSION="3.5.9"
+ VERSION="3.5.10"
cat >>confdefs.h <<_ACEOF
diff -rNup kdelibs-3.5.9.dfsg.1/configure.in kdelibs-3.5.10.dfsg.1/configure.in
--- kdelibs-3.5.9.dfsg.1/configure.in 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/configure.in 2008-10-30 00:06:04.000000000 +0100
@@ -21,7 +21,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kdelibs.dfsg.1, "3.5.9") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kdelibs.dfsg.1, "3.5.10") dnl searches for some needed programs
AM_MAINTAINER_MODE
diff -rNup kdelibs-3.5.9.dfsg.1/dcop/dcopidl/Makefile.in kdelibs-3.5.10.dfsg.1/dcop/dcopidl/Makefile.in
diff -rNup kdelibs-3.5.9.dfsg.1/dcop/dcopidl2cpp/Makefile.in kdelibs-3.5.10.dfsg.1/dcop/dcopidl2cpp/Makefile.in
diff -rNup kdelibs-3.5.9.dfsg.1/debian/changelog kdelibs-3.5.10.dfsg.1/debian/changelog
diff -rNup kdelibs-3.5.9.dfsg.1/debian/control kdelibs-3.5.10.dfsg.1/debian/control
diff -rNup kdelibs-3.5.9.dfsg.1/debian/control.in kdelibs-3.5.10.dfsg.1/debian/control.in
diff -rNup kdelibs-3.5.9.dfsg.1/debian/control.tmp kdelibs-3.5.10.dfsg.1/debian/control.tmp
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/01_kdelibs_branch_r828883.diff kdelibs-3.5.10.dfsg.1/debian/patches/01_kdelibs_branch_r828883.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/01_kdelibs_branch_r828883.diff.log kdelibs-3.5.10.dfsg.1/debian/patches/01_kdelibs_branch_r828883.diff.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/02_kate_regression_r777286.diff kdelibs-3.5.10.dfsg.1/debian/patches/02_kate_regression_r777286.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/02_kate_regression_r777286.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/02_kate_regression_r777286.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/03_start_kdeinit_integer_overflow.diff kdelibs-3.5.10.dfsg.1/debian/patches/03_start_kdeinit_integer_overflow.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/03_start_kdeinit_integer_overflow.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/03_start_kdeinit_integer_overflow.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/05_kate_debianchangelog_default_context_r799980.diff kdelibs-3.5.10.dfsg.1/debian/patches/05_kate_debianchangelog_default_context_r799980.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/05_kate_debianchangelog_default_context_r799980.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/05_kate_debianchangelog_default_context_r799980.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/06_khtml_rendering_r786289.diff kdelibs-3.5.10.dfsg.1/debian/patches/06_khtml_rendering_r786289.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/06_khtml_rendering_r786289.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/06_khtml_rendering_r786289.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/34_cups12_init_script.diff kdelibs-3.5.10.dfsg.1/debian/patches/34_cups12_init_script.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/61_httpheader_backport.diff kdelibs-3.5.10.dfsg.1/debian/patches/61_httpheader_backport.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/61_httpheader_backport.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/61_httpheader_backport.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/62_fix_googlemaps_backport.diff kdelibs-3.5.10.dfsg.1/debian/patches/62_fix_googlemaps_backport.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/62_fix_googlemaps_backport.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/62_fix_googlemaps_backport.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/63_fixed-layout-table.diff kdelibs-3.5.10.dfsg.1/debian/patches/63_fixed-layout-table.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/63_fixed-layout-table.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/63_fixed-layout-table.diff.level-1.log
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/98_buildprep.diff kdelibs-3.5.10.dfsg.1/debian/patches/98_buildprep.diff
diff -rNup kdelibs-3.5.9.dfsg.1/debian/patches/98_buildprep.diff.level-1.log kdelibs-3.5.10.dfsg.1/debian/patches/98_buildprep.diff.level-1.log
Los ficheros binarios kdelibs-3.5.9.dfsg.1/doc/kspell/index.cache.bz2 y kdelibs-3.5.10.dfsg.1/doc/kspell/index.cache.bz2 son distintos
diff -rNup kdelibs-3.5.9.dfsg.1/kate/data/debianchangelog.xml kdelibs-3.5.10.dfsg.1/kate/data/debianchangelog.xml
diff -rNup kdelibs-3.5.9.dfsg.1/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop kdelibs-3.5.10.dfsg.1/kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/kdecore/all_languages.desktop kdelibs-3.5.10.dfsg.1/kdecore/all_languages.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/kdecore/eventsrc kdelibs-3.5.10.dfsg.1/kdecore/eventsrc
--- kdelibs-3.5.9.dfsg.1/kdecore/eventsrc 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdecore/eventsrc 2008-08-19 20:18:18.000000000 +0200
@@ -1323,7 +1323,7 @@ Comment[nb]=Det var en feil i programmet
Comment[nds]=Dat geev en Fehler in dat Programm, villicht treckt he Problemen na sik
Comment[ne]=समस्या आउनुमा कार्यक्रममा त्रुटि कारण थियो
Comment[nl]=Er zat een fout in het programma die voor problemen kon zorgen
-Comment[nn]=Ein feil oppstod i programmet og kan føra til problem
+Comment[nn]=Det oppstod ein feil i programmet og kan føra til problem
Comment[pa]=ਕਾਰਜ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ, ਜੋ ਕਿ ਸਮੱਸਿਆ ਪੈਦਾ ਕਰ ਰਹੀ ਹੈ
Comment[pl]=Wystąpił błąd, który może spowodować zakłócenia w pracy
Comment[pt]=Ocorreu um erro grave no programa que pode causar problemas
diff -rNup kdelibs-3.5.9.dfsg.1/kdecore/kapplication.cpp kdelibs-3.5.10.dfsg.1/kdecore/kapplication.cpp
--- kdelibs-3.5.9.dfsg.1/kdecore/kapplication.cpp 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdecore/kapplication.cpp 2008-08-19 20:18:18.000000000 +0200
@@ -1251,12 +1251,12 @@ static void checkRestartVersion( QSessio
int format;
unsigned long nitems, after;
unsigned char* data;
- if( XGetWindowProperty( dpy, DefaultRootWindow( dpy ), XInternAtom( dpy, "KDE_FULL_SESSION", False ),
+ if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "KDE_FULL_SESSION", False ),
0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
if( data != NULL )
XFree( data );
if( type == XA_STRING && format == 8 ) { // session set, check if KDE_SESSION_VERSION is not set (meaning KDE3)
- if( XGetWindowProperty( dpy, DefaultRootWindow( dpy ), XInternAtom( dpy, "KDE_SESSION_VERSION", False ),
+ if( XGetWindowProperty( dpy, RootWindow( dpy, 0 ), XInternAtom( dpy, "KDE_SESSION_VERSION", False ),
0, 1, False, AnyPropertyType, &type, &format, &nitems, &after, &data ) == Success ) {
if( data != NULL )
XFree( data ); // KDE4 or newer
diff -rNup kdelibs-3.5.9.dfsg.1/kdecore/kdeversion.h kdelibs-3.5.10.dfsg.1/kdecore/kdeversion.h
--- kdelibs-3.5.9.dfsg.1/kdecore/kdeversion.h 2008-02-13 10:50:28.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdecore/kdeversion.h 2008-08-19 21:57:18.000000000 +0200
@@ -22,10 +22,10 @@
#include "kdelibs_export.h"
-#define KDE_VERSION_STRING "3.5.9"
+#define KDE_VERSION_STRING "3.5.10"
#define KDE_VERSION_MAJOR 3
#define KDE_VERSION_MINOR 5
-#define KDE_VERSION_RELEASE 9
+#define KDE_VERSION_RELEASE 10
#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
#define KDE_VERSION \
diff -rNup kdelibs-3.5.9.dfsg.1/kdecore/ktempfile.cpp kdelibs-3.5.10.dfsg.1/kdecore/ktempfile.cpp
--- kdelibs-3.5.9.dfsg.1/kdecore/ktempfile.cpp 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdecore/ktempfile.cpp 2008-08-19 20:18:18.000000000 +0200
@@ -3,7 +3,7 @@
* This file is part of the KDE libraries
* Copyright (c) 1999 Waldo Bastian <bastian@kde.org>
*
- * $Id: ktempfile.cpp 465272 2005-09-29 09:47:40Z mueller $
+ * $Id: ktempfile.cpp 800078 2008-04-23 09:01:56Z lunakl $
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff -rNup kdelibs-3.5.9.dfsg.1/kdelibs.lsm kdelibs-3.5.10.dfsg.1/kdelibs.lsm
--- kdelibs-3.5.9.dfsg.1/kdelibs.lsm 2008-02-13 10:52:06.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdelibs.lsm 2008-08-19 21:44:12.000000000 +0200
@@ -1,7 +1,7 @@
Begin4
Title: kdelibs
-Version: 3.5.9
-Entered-date: 2008-02-13
+Version: 3.5.10
+Entered-date: 2008-08-26
Description: libraries for the K Desktop Environment (KDE)
Keywords: KDE X11 desktop Qt
Author: http://bugs.kde.org/ (KDE Bugtracking System)
diff -rNup kdelibs-3.5.9.dfsg.1/kdeprint/cups/cupsdconf2/cupsddialog.cpp kdelibs-3.5.10.dfsg.1/kdeprint/cups/cupsdconf2/cupsddialog.cpp
--- kdelibs-3.5.9.dfsg.1/kdeprint/cups/cupsdconf2/cupsddialog.cpp 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdeprint/cups/cupsdconf2/cupsddialog.cpp 2008-10-30 00:06:03.000000000 +0100
@@ -207,7 +207,7 @@ bool CupsdDialog::restartServer(QString&
{
bool success = false;
KProcess proc;
- proc << "kdesu" << "-c" << "/etc/init.d/cupsys restart";
+ proc << "kdesu" << "-c" << "/etc/init.d/cups restart";
success = proc.start( KProcess::Block ) && proc.normalExit();
if( !success )
msg = i18n("Unable to restart CUPS server (pid = %1)").arg(serverPid);
diff -rNup kdelibs-3.5.9.dfsg.1/kdeprint/filters/pdf2ps.desktop kdelibs-3.5.10.dfsg.1/kdeprint/filters/pdf2ps.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/kdeprint/management/kmjobviewer.cpp kdelibs-3.5.10.dfsg.1/kdeprint/management/kmjobviewer.cpp
--- kdelibs-3.5.9.dfsg.1/kdeprint/management/kmjobviewer.cpp 2005-10-10 17:06:32.000000000 +0200
+++ kdelibs-3.5.10.dfsg.1/kdeprint/management/kmjobviewer.cpp 2008-08-19 20:18:19.000000000 +0200
@@ -655,7 +655,7 @@ void KMJobViewer::reload()
void KMJobViewer::closeEvent(QCloseEvent *e)
{
- if (m_standalone)
+ if (m_standalone && !kapp->sessionSaving())
{
hide();
e->ignore();
diff -rNup kdelibs-3.5.9.dfsg.1/kdesu/process.cpp kdelibs-3.5.10.dfsg.1/kdesu/process.cpp
--- kdelibs-3.5.9.dfsg.1/kdesu/process.cpp 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdesu/process.cpp 2008-08-19 20:18:14.000000000 +0200
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * $Id: process.cpp 592751 2006-10-05 16:22:44Z coolo $
+ * $Id: process.cpp 802658 2008-04-30 08:30:03Z lunakl $
*
* This file is part of the KDE project, module kdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff -rNup kdelibs-3.5.9.dfsg.1/kdesu/process.h kdelibs-3.5.10.dfsg.1/kdesu/process.h
--- kdelibs-3.5.9.dfsg.1/kdesu/process.h 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdesu/process.h 2008-08-19 20:18:14.000000000 +0200
@@ -1,6 +1,6 @@
/* vi: ts=8 sts=4 sw=4
*
- * $Id: process.h 669012 2007-05-28 10:36:22Z mueller $
+ * $Id: process.h 802657 2008-04-30 08:22:54Z lunakl $
*
* This file is part of the KDE project, module kdesu.
* Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org>
diff -rNup kdelibs-3.5.9.dfsg.1/kdeui/kdepackages.h kdelibs-3.5.10.dfsg.1/kdeui/kdepackages.h
diff -rNup kdelibs-3.5.9.dfsg.1/kdeui/kdetrayproxy/kdetrayproxy.desktop kdelibs-3.5.10.dfsg.1/kdeui/kdetrayproxy/kdetrayproxy.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/kdeui/Makefile.am kdelibs-3.5.10.dfsg.1/kdeui/Makefile.am
--- kdelibs-3.5.9.dfsg.1/kdeui/Makefile.am 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kdeui/Makefile.am 2008-10-30 00:06:03.000000000 +0100
@@ -148,7 +148,7 @@ EXTRA_DIST = CHANGES.kdatepicker USERS.k
kdepackages:
-rm $(srcdir)/kdepackages.h
- curl "http://bugs.kde.org/xml.cgi?data=versiontable"; > tmp_download
+ curl "http://bugsold.kde.org/xml.cgi?data=versiontable"; > tmp_download
echo "// DO NOT EDIT - EDIT bugs/Maintainers instead" > $(srcdir)/kdepackages.h
echo "const char * const packages[] = {" >> $(srcdir)/kdepackages.h
cat tmp_download | egrep "product|component" | grep -v "</product>" | \
diff -rNup kdelibs-3.5.9.dfsg.1/kdeui/Makefile.in kdelibs-3.5.10.dfsg.1/kdeui/Makefile.in
diff -rNup kdelibs-3.5.9.dfsg.1/khtml/ecma/kjs_dom.cpp kdelibs-3.5.10.dfsg.1/khtml/ecma/kjs_dom.cpp
--- kdelibs-3.5.9.dfsg.1/khtml/ecma/kjs_dom.cpp 2007-05-14 09:52:40.000000000 +0200
+++ kdelibs-3.5.10.dfsg.1/khtml/ecma/kjs_dom.cpp 2008-10-30 00:06:03.000000000 +0100
@@ -335,26 +335,26 @@ Value DOMNode::getValueProperty(ExecStat
switch (token) {
case OffsetLeft:
- return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Undefined();
+ return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Number(0);
case OffsetTop:
- return rend ? static_cast<Value>( Number( rend->offsetTop() ) ) : Undefined();
+ return rend ? static_cast<Value>( Number( rend->offsetTop() ) ) : Number(0);
case OffsetWidth:
- return rend ? static_cast<Value>( Number( rend->offsetWidth() ) ) : Undefined();
+ return rend ? static_cast<Value>( Number( rend->offsetWidth() ) ) : Number(0);
case OffsetHeight:
- return rend ? static_cast<Value>( Number( rend->offsetHeight() ) ) : Undefined();
+ return rend ? static_cast<Value>( Number( rend->offsetHeight() ) ) : Number(0);
case OffsetParent:
{
khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
return getDOMNode( exec, par ? par->element() : 0 );
}
case ClientWidth:
- return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Undefined();
+ return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Number(0);
case ClientHeight:
- return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Undefined();
+ return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Number(0);
case ScrollWidth:
- return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Undefined();
+ return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Number(0);
case ScrollHeight:
- return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Undefined();
+ return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Number(0);
case ScrollLeft:
if (rend && rend->layer()) {
if (rend->isRoot() && !rend->style()->hidesOverflow())
diff -rNup kdelibs-3.5.9.dfsg.1/khtml/rendering/table_layout.cpp kdelibs-3.5.10.dfsg.1/khtml/rendering/table_layout.cpp
--- kdelibs-3.5.9.dfsg.1/khtml/rendering/table_layout.cpp 2007-01-15 12:33:57.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/khtml/rendering/table_layout.cpp 2008-10-30 00:06:03.000000000 +0100
@@ -297,7 +297,8 @@ void FixedTableLayout::layout()
#endif
for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
if ( width[i].isPercent() ) {
- int w = base * width[i].value() / totalPercent;
+ // totalPercent may be 0 below if all %-width specifed are 0%. (#172557)
+ int w = totalPercent ? base * width[i].value() / totalPercent : 0;
available -= w;
calcWidth[i] = w;
}
@@ -313,7 +314,8 @@ void FixedTableLayout::layout()
for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
if ( width[i].isVariable() ) {
- int w = available / totalVariable;
+ // totalVariable may be 0 below if all the variable widths specified are 0.
+ int w = totalVariable ? available / totalVariable : 0;
available -= w;
calcWidth[i] = w;
totalVariable--;
diff -rNup kdelibs-3.5.9.dfsg.1/kio/kpasswdserver/kpasswdserver.cpp kdelibs-3.5.10.dfsg.1/kio/kpasswdserver/kpasswdserver.cpp
--- kdelibs-3.5.9.dfsg.1/kio/kpasswdserver/kpasswdserver.cpp 2007-01-15 12:34:11.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kio/kpasswdserver/kpasswdserver.cpp 2008-08-19 20:18:13.000000000 +0200
@@ -21,7 +21,7 @@
//----------------------------------------------------------------------------
//
// KDE Password Server
-// $Id: kpasswdserver.cpp 614636 2006-12-18 14:31:59Z lunakl $
+// $Id: kpasswdserver.cpp 849216 2008-08-19 09:08:55Z duffeck $
#include "kpasswdserver.h"
@@ -344,7 +344,7 @@ KPasswdServer::processRequest()
{
QString prompt = request->errorMsg;
prompt += i18n(" Do you want to retry?");
- int dlgResult = KMessageBox::warningContinueCancel(0, prompt,
+ int dlgResult = KMessageBox::warningContinueCancelWId(request->windowId, prompt,
i18n("Authentication"), i18n("Retry"));
if (dlgResult != KMessageBox::Continue)
askPw = false;
diff -rNup kdelibs-3.5.9.dfsg.1/kio/misc/kpac/eventsrc kdelibs-3.5.10.dfsg.1/kio/misc/kpac/eventsrc
--- kdelibs-3.5.9.dfsg.1/kio/misc/kpac/eventsrc 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kio/misc/kpac/eventsrc 2008-08-19 20:18:13.000000000 +0200
@@ -21,7 +21,7 @@ Comment[et]=Automaatne proxy konfigureer
Comment[eu]=Proxy-aren konfigurazio automatikoa
Comment[fa]=پیکربندی خودکار پیشکار
Comment[fi]=Automaattiset proxy-asetukset
-Comment[fr]=Configuration automatique du proxy
+Comment[fr]=Configuration automatique du serveur mandataire
Comment[fy]=Automatyske proxy ynstelling
Comment[ga]=Uathchumraíocht an tSeachfhreastalaí
Comment[gl]=Configuración Automática do Proxy
@@ -98,7 +98,7 @@ Name[et]=Vigane proxy skript
Name[eu]=Proxy-aren script baliogabea
Name[fa]=دستنوشتۀ پیشکار نامعتبر
Name[fi]=Virheellinen proxy-skripti
-Name[fr]=Script de proxy non valable
+Name[fr]=Script de serveur mandataire non valable
Name[fy]=Unjildich proxy skript
Name[ga]=Script neamhbhailí seachfhreastalaí
Name[gl]=Guión de proxy inválido
@@ -172,7 +172,7 @@ Comment[et]=Allalaaditud proxy seadistus
Comment[eu]=Deskargatutako proxy-aren konfigurazioko script-a baliogabea da
Comment[fa]=دستنوشتۀ پیکربندی پیشکار بارگیریشده، نامعتبر است
Comment[fi]=Ladattu proxy-asetusskripti on virheellinen
-Comment[fr]=Le script téléchargé de configuration du proxy n'est pas valable
+Comment[fr]=Le script téléchargé de configuration du serveur mandataire n'est pas valable
Comment[fy]=It ynladen proxy ynstellings skript is ûnjildich
Comment[ga]=Is neamhbhailí í script chumraíocht an tseachfhreastalaí a íosluchtaíodh
Comment[gl]=O guión de configuración descarregado do proxy non é válido
@@ -325,7 +325,7 @@ Comment[et]=Proxy seadistuse skripti ei
Comment[eu]=Proxy-aren konfigurazioko script-a ezin izan da deskargatu
Comment[fa]=دستنوشتۀ پیکربندی پیشکار بارگیری نشد
Comment[fi]=Proxyn asetusskriptiä ei voitu ladata
-Comment[fr]=Le script de configuration du proxy n'a pas pu être téléchargé
+Comment[fr]=Le script de configuration du serveur mandataire n'a pas pu être téléchargé
Comment[fy]=It ynladen fan de proxy ynstellings skript is net slagge
Comment[ga]=Níorbh fhéidir script chumraíochta an tseachfhreastalaí a íoslódáil
Comment[gl]=Non se pudo descarregar o guión de configuración do proxy
@@ -474,7 +474,7 @@ Comment[et]=Ilmnes tõsine viga proxy se
Comment[eu]=Errorea gertatu da proxy-a konfiguratzeko script-ean
Comment[fa]=هنگام اجرای دستنوشتۀ پیکربندی پیشکار، خطایی وجود داشت
Comment[fi]=Proxy-skriptin suorittamisessa tapahtui virhe
-Comment[fr]=Une erreur s'est produite lors de l'exécution du script de configuration du proxy
+Comment[fr]=Une erreur s'est produite lors de l'exécution du script de configuration du serveur mandataire
Comment[fy]=Der wie in flater by it útfoeren fan de proxy ynstellings skript
Comment[ga]=Tharla earráid agus script chumraíocht an tseachfhreastalaí á rith
Comment[gl]=Houbo un erro executando o guión de configuración do proxi
diff -rNup kdelibs-3.5.9.dfsg.1/kio/misc/kpac/proxyscout.desktop kdelibs-3.5.10.dfsg.1/kio/misc/kpac/proxyscout.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/kioslave/http/http.cc kdelibs-3.5.10.dfsg.1/kioslave/http/http.cc
--- kdelibs-3.5.9.dfsg.1/kioslave/http/http.cc 2008-02-13 10:41:06.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kioslave/http/http.cc 2008-10-30 00:06:03.000000000 +0100
@@ -2842,7 +2842,7 @@ try_again:
// calling application later
m_responseHeader << QString::fromLatin1(buf);
- if ((strncasecmp(buf, "HTTP", 4) == 0) ||
+ if ((strncasecmp(buf, "HTTP/", 5) == 0) ||
(strncasecmp(buf, "ICY ", 4) == 0)) // Shoutcast support
{
if (strncasecmp(buf, "ICY ", 4) == 0)
diff -rNup kdelibs-3.5.9.dfsg.1/kstyles/themes/light-v2.themerc kdelibs-3.5.10.dfsg.1/kstyles/themes/light-v2.themerc
--- kdelibs-3.5.9.dfsg.1/kstyles/themes/light-v2.themerc 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/light-v2.themerc 2008-08-19 20:18:14.000000000 +0200
@@ -98,7 +98,7 @@ Comment[et]=Lihtsa ja elegantse 'Light'
Comment[eu]='Argi' trepetaren estilo sinple eta dotorearen 2. berrikuspena.
Comment[fa]=دومین بازبینی سبک عنصر ساده و زیبای نور
Comment[fi]=Toinen versio yksinkertaisesta ja elegantista Light-tyylistä
-Comment[fr]=Deuxième version du style graphique « Lumière », simple et élégant.
+Comment[fr]=Deuxième version du style graphique « Lumière », simple et élégant.
Comment[fy]=Twadde revyzje fan de ienfâldige en elegante widgetstyl 'Light'
Comment[ga]=An dara leasú de stíl shimplí fhíneálta giuirléidí 'Light'.
Comment[gl]=Segunda revisión do simple e elegante estilo de widgets 'Light'.
diff -rNup kdelibs-3.5.9.dfsg.1/kstyles/themes/light-v3.themerc kdelibs-3.5.10.dfsg.1/kstyles/themes/light-v3.themerc
--- kdelibs-3.5.9.dfsg.1/kstyles/themes/light-v3.themerc 2008-10-30 00:05:53.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/kstyles/themes/light-v3.themerc 2008-08-19 20:18:14.000000000 +0200
@@ -98,7 +98,7 @@ Comment[et]=Lihtsa ja elegantse 'Light'
Comment[eu]='Argi' trepetaren estilo sinple eta dotorearen 3. berrikuspena.
Comment[fa]=سومین بازبینی سبک عنصر ساده و زیبای نور
Comment[fi]=Kolmas versio yksinkertaisesta ja elegantista Light-tyylistä
-Comment[fr]=Troisième version du style graphique « Lumière », simple et élégant.
+Comment[fr]=Troisième version du style graphique « Lumière », simple et élégant.
Comment[fy]=Tredde revyzje fan de ienfâldige en elegante widgetstyl 'Light'
Comment[ga]=An tríú leasú de stíl shimplí fhíneálta giuirléidí 'Light'.
Comment[gl]=Terceira revisión do estilo elegante e simple de widgets 'Light'.
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/pgp.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/pgp.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/pgp-encrypted.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/pgp-encrypted.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/sieve.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/sieve.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/vnd.ms-asf.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/vnd.ms-asf.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-bz2dvi.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bz2dvi.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-bzip2.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bzip2.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-bzip.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-bzip.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-compress.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-compress.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-gzdvi.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gzdvi.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-gzip.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gzip.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-gzpostscript.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-gzpostscript.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-lzop.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-lzop.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-tarz.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tarz.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-tbz.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tbz.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-tex-pk.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tex-pk.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-tgz.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tgz.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/application/x-tzo.desktop kdelibs-3.5.10.dfsg.1/mimetypes/application/x-tzo.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/message/rfc822.desktop kdelibs-3.5.10.dfsg.1/mimetypes/message/rfc822.desktop
diff -rNup kdelibs-3.5.9.dfsg.1/mimetypes/video/x-ms-asf.desktop kdelibs-3.5.10.dfsg.1/mimetypes/video/x-ms-asf.desktop
Los ficheros binarios kdelibs-3.5.9.dfsg.1/pics/crystalsvg/cr32-key_enter.png y kdelibs-3.5.10.dfsg.1/pics/crystalsvg/cr32-key_enter.png son distintos
diff -rNup kdelibs-3.5.9.dfsg.1/pics/crystalsvg/Makefile.in kdelibs-3.5.10.dfsg.1/pics/crystalsvg/Makefile.in
diff -rNup kdelibs-3.5.9.dfsg.1/README kdelibs-3.5.10.dfsg.1/README
--- kdelibs-3.5.9.dfsg.1/README 2008-02-13 10:50:50.000000000 +0100
+++ kdelibs-3.5.10.dfsg.1/README 2008-08-19 21:57:27.000000000 +0200
@@ -10,7 +10,7 @@ In this file:
About kdelibs
-------------
-This is version 3.5.9 of the KDE libraries.
+This is version 3.5.10 of the KDE libraries.
This package includes libraries that are central to the development and
execution of a KDE program, as well as internationalization files for these
kdelibs (4:3.5.10.dfsg.1-1) unstable; urgency=low
+++ Changes by Ana Beatriz Guerrero Lopez:
* New upstream release.
- Most of the changes were already provided by the patches:
- 01_kdelibs_branch_r828883.diff
- 02_kate_regression_r777286.diff
- 03_start_kdeinit_integer_overflow.diff (provided for CVE-2008-1671)
- 05_kate_debianchangelog_default_context_r799980.diff
- 06_khtml_rendering_r786289.diff
that have been dropped now.
- New changes:
- Changes for showing KDE 3.5.10 instead of 3.5.9 in the KDE apps.
- Fix while saving sessions for multiple scripts. (KDE SVN r837226,
KDE bug 166598).
- Fix in kdeprint. (KDE SVN r848634)
- Avoid showing authentication-dialogue being put behind the application
window. (KDE SVN r849216, KDE bug 121803).
+++ Changes by Raúl Sánchez Siles:
* kdeprint: Wrong initscript name (cupsys instead of cups) (Closes:
#496110)
* Fixed 98_buildprep.patch so double compilation works.
* Fixed wrong http header parsing, added 61_httpheader_backport.diff
* Fixed wrong Google Maps rendering, added 62_fix_googlemaps_backport.diff
* Change dependencies from obsolete libcupsys2-dev to libcups2-dev.
* konqueror: Crash on eBay page (Closes: #502459) with recently added
63_fixed-layout-table.diff
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 26 Oct 2008 21:21:12 +0100
Attachment:
signature.asc
Description: This is a digitally signed message part.