diff -u kdbus-0.8.6/debian/changelog kdbus-0.8.6/debian/changelog
--- kdbus-0.8.6/debian/changelog
+++ kdbus-0.8.6/debian/changelog
@@ -1,3 +1,10 @@
+kdbus (0.8.6-0ubuntu3) feisty; urgency=low
+
+ * Added kubuntu_02_fix_crashes.diff from Ville Palo fixing a crash on
startup. This is in the
+ latest SVN. Closes malone #71967
+
+ -- Sarah Hobbs <[EMAIL PROTECTED]> Fri, 17 Nov 2006 23:28:54 +1100
+
kdbus (0.8.6-0ubuntu2) edgy; urgency=low
* Rebuild against dbus 0.90
only in patch2:
unchanged:
--- kdbus-0.8.6.orig/debian/patches/kubuntu_02_fix_crashes.diff
+++ kdbus-0.8.6/debian/patches/kubuntu_02_fix_crashes.diff
@@ -0,0 +1,31 @@
+diff -Nru /tmp/UmEr5XxZBT/kdbus-0.8.6/src/dbusobject.cpp
/tmp/ZYbknD8jCH/kdbus-0.8.6/src/dbusobject.cpp
+--- kdbus-0.8.6/src/dbusobject.cpp 2006-02-18 07:23:48.000000000 +0200
++++ kdbus-0.8.6/src/dbusobject.cpp 2006-11-16 20:47:02.000000000 +0200
+@@ -88,19 +88,19 @@
+
+ // Now iterate through self, enumerating interfaces, properties, and
+ // other objects.
+- myElem = myElem.firstChild().toElement();
++ QDomElement childElement = myElem.firstChild().toElement();
+
+ try {
+ do {
+- if ( myElem.tagName() == "node" )
+- new DBusObject( this, myElem, d->proxy );
+- else if ( myElem.tagName() == "interface" )
+- new DBusInterface( this, myElem );
++ if ( childElement.tagName() == "node" )
++ new DBusObject( this, childElement, d->proxy );
++ else if ( childElement.tagName() == "interface" )
++ new DBusInterface( this, childElement );
+ else
+ kdWarning() << "Unhandled node in introspect data: "
+- << myElem.tagName() << endl;
+- myElem = myElem.nextSibling().toElement();
+- } while ( !myElem.isNull() );
++ << childElement.tagName() << endl;
++ childElement = childElement.nextSibling().toElement();
++ } while ( !childElement.isNull() );
+ }
+ catch ( std::runtime_error const & e ) {
+ m_ok = false;
** Attachment added: "debdiff"
http://librarian.launchpad.net/5098565/debdif
--
kdbus crashes right away
https://launchpad.net/bugs/71967
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
