diff -u kde4libs-4.3.1/debian/changelog kde4libs-4.3.1/debian/changelog --- kde4libs-4.3.1/debian/changelog +++ kde4libs-4.3.1/debian/changelog @@ -1,3 +1,9 @@ +kde4libs (4:4.3.1-0ubuntu1~jaunty1~ppa2) jaunty; urgency=low + + * Don't use apport for the Report Bug menu item in Jaunty. + + -- Yuriy Kozlov Sat, 26 Sep 2009 12:45:12 -0400 + kde4libs (4:4.3.1-0ubuntu1~jaunty1~ppa1) jaunty; urgency=low * Jaunty backport diff -u kde4libs-4.3.1/debian/patches/kubuntu_51_launchpad_integration.diff kde4libs-4.3.1/debian/patches/kubuntu_51_launchpad_integration.diff --- kde4libs-4.3.1/debian/patches/kubuntu_51_launchpad_integration.diff +++ kde4libs-4.3.1/debian/patches/kubuntu_51_launchpad_integration.diff @@ -1,7 +1,7 @@ -Index: kde4libs-4.2.96/kdeui/widgets/khelpmenu.h +Index: kde4libs-4.3.1/kdeui/widgets/khelpmenu.h =================================================================== ---- kde4libs-4.2.96.orig/kdeui/widgets/khelpmenu.h 2008-09-26 09:57:12.000000000 -0500 -+++ kde4libs-4.2.96/kdeui/widgets/khelpmenu.h 2009-07-10 16:47:18.038795615 -0500 +--- kde4libs-4.3.1.orig/kdeui/widgets/khelpmenu.h 2008-09-26 10:57:12.000000000 -0400 ++++ kde4libs-4.3.1/kdeui/widgets/khelpmenu.h 2009-09-26 12:39:12.000000000 -0400 @@ -170,7 +170,9 @@ menuAboutApp = 2, menuAboutKDE = 3, @@ -30,10 +30,10 @@ * Opens the standard "About KDE" dialog box. */ void aboutKDE(); -Index: kde4libs-4.2.96/kdeui/widgets/khelpmenu.cpp +Index: kde4libs-4.3.1/kdeui/widgets/khelpmenu.cpp =================================================================== ---- kde4libs-4.2.96.orig/kdeui/widgets/khelpmenu.cpp 2008-12-04 02:36:05.000000000 -0600 -+++ kde4libs-4.2.96/kdeui/widgets/khelpmenu.cpp 2009-07-10 16:47:57.593786916 -0500 +--- kde4libs-4.3.1.orig/kdeui/widgets/khelpmenu.cpp 2008-12-04 03:36:05.000000000 -0500 ++++ kde4libs-4.3.1/kdeui/widgets/khelpmenu.cpp 2009-09-26 12:41:49.000000000 -0400 @@ -48,12 +48,15 @@ #include #include @@ -50,12 +50,7 @@ using namespace KDEPrivate; class KHelpMenuPrivate -@@ -66,10 +69,12 @@ - mMenu = 0; - mAboutApp = 0; - mAboutKDE = 0; -- mBugReport = 0; -+ //mBugReport = 0; +@@ -70,6 +73,8 @@ mHandBookAction = 0; mWhatsThisAction = 0; mReportBugAction = 0; @@ -64,23 +59,6 @@ mAboutAppAction = 0; mAboutKDEAction = 0; } -@@ -78,14 +83,14 @@ - delete mMenu; - delete mAboutApp; - delete mAboutKDE; -- delete mBugReport; -+ //delete mBugReport; - delete mSwitchApplicationLanguage; - } - - KMenu *mMenu; - KDialog *mAboutApp; - KAboutKdeDialog *mAboutKDE; -- KBugReport *mBugReport; -+ //KBugReport *mBugReport; - KSwitchLanguageDialog *mSwitchApplicationLanguage; - - // TODO evaluate if we use static_cast(parent()) instead of mParent to win that bit of memory @@ -95,6 +100,7 @@ bool mShowWhatsThis; @@ -166,45 +144,10 @@ void KHelpMenu::aboutKDE() { if( !d->mAboutKDE ) -@@ -300,12 +355,21 @@ - - void KHelpMenu::reportBug() - { -+ // Reimplement reportBug to utilize apport for Kubuntu -+ const KAboutData *aboutData = KGlobal::mainComponent().aboutData(); -+ QString pid = QString::number(getpid()); -+ KProcess *proc = new KProcess; -+ *proc << "/usr/share/apport/apport-kde" << "-f" << "-p" << pid; -+ proc->start(); -+ -+ /* - if( !d->mBugReport ) - { - d->mBugReport = new KBugReport( d->mParent, false, d->mAboutData ); - connect( d->mBugReport, SIGNAL(finished()),this,SLOT( dialogFinished()) ); - } - d->mBugReport->show(); -+ */ - } - - -@@ -333,10 +397,12 @@ - delete d->mAboutKDE; d->mAboutKDE = 0; - } - -+ /* - if( d->mBugReport && !d->mBugReport->isVisible() ) - { - delete d->mBugReport; d->mBugReport = 0; - } -+ */ - - if ( d->mSwitchApplicationLanguage && !d->mSwitchApplicationLanguage->isVisible() ) - { -Index: kde4libs-4.2.96/kdeui/actions/kstandardaction.h +Index: kde4libs-4.3.1/kdeui/actions/kstandardaction.h =================================================================== ---- kde4libs-4.2.96.orig/kdeui/actions/kstandardaction.h 2008-11-28 09:40:11.000000000 -0600 -+++ kde4libs-4.2.96/kdeui/actions/kstandardaction.h 2009-07-10 16:47:18.038795615 -0500 +--- kde4libs-4.3.1.orig/kdeui/actions/kstandardaction.h 2008-11-28 10:40:11.000000000 -0500 ++++ kde4libs-4.3.1/kdeui/actions/kstandardaction.h 2009-09-26 12:39:12.000000000 -0400 @@ -160,7 +160,9 @@ FullScreen, Clear, @@ -233,10 +176,10 @@ * Display the application's About box. */ KDEUI_EXPORT KAction *aboutApp(const QObject *recvr, const char *slot, QObject *parent); -Index: kde4libs-4.2.96/kdeui/actions/kstandardaction_p.h +Index: kde4libs-4.3.1/kdeui/actions/kstandardaction_p.h =================================================================== ---- kde4libs-4.2.96.orig/kdeui/actions/kstandardaction_p.h 2009-07-08 09:42:13.000000000 -0500 -+++ kde4libs-4.2.96/kdeui/actions/kstandardaction_p.h 2009-07-10 16:47:18.042794657 -0500 +--- kde4libs-4.3.1.orig/kdeui/actions/kstandardaction_p.h 2009-07-08 10:42:13.000000000 -0400 ++++ kde4libs-4.3.1/kdeui/actions/kstandardaction_p.h 2009-09-26 12:39:13.000000000 -0400 @@ -113,6 +113,8 @@ { TipofDay, KStandardShortcut::TipofDay, "help_show_tip", I18N_NOOP("Tip of the &Day"), 0, "help-hint" }, { ReportBug, KStandardShortcut::ReportBug, "help_report_bug", I18N_NOOP("&Report Bug..."), 0, "tools-report-bug" }, @@ -246,11 +189,11 @@ { AboutApp, KStandardShortcut::AccelNone, "help_about_app", I18N_NOOP("&About %1"), 0, 0 }, { AboutKDE, KStandardShortcut::AccelNone, "help_about_kde", I18N_NOOP("About &KDE"), 0, "kde" }, { ActionNone, KStandardShortcut::AccelNone, 0, 0, 0, 0 } -Index: kde4libs-4.2.96/kdeui/actions/kstandardaction.cpp +Index: kde4libs-4.3.1/kdeui/actions/kstandardaction.cpp =================================================================== ---- kde4libs-4.2.96.orig/kdeui/actions/kstandardaction.cpp 2009-01-01 10:28:08.000000000 -0600 -+++ kde4libs-4.2.96/kdeui/actions/kstandardaction.cpp 2009-07-10 16:47:18.042794657 -0500 -@@ -614,6 +614,16 @@ +--- kde4libs-4.3.1.orig/kdeui/actions/kstandardaction.cpp 2009-08-27 04:19:10.000000000 -0400 ++++ kde4libs-4.3.1/kdeui/actions/kstandardaction.cpp 2009-09-26 12:39:13.000000000 -0400 +@@ -617,6 +617,16 @@ return KStandardAction::create( SwitchApplicationLanguage, recvr, slot, parent ); } @@ -267,10 +210,10 @@ KAction *aboutApp( const QObject *recvr, const char *slot, QObject *parent ) { return KStandardAction::create( AboutApp, recvr, slot, parent ); -Index: kde4libs-4.2.96/kdeui/xmlgui/ui_standards.rc +Index: kde4libs-4.3.1/kdeui/xmlgui/ui_standards.rc =================================================================== ---- kde4libs-4.2.96.orig/kdeui/xmlgui/ui_standards.rc 2009-05-19 07:06:58.000000000 -0500 -+++ kde4libs-4.2.96/kdeui/xmlgui/ui_standards.rc 2009-07-10 16:47:18.042794657 -0500 +--- kde4libs-4.3.1.orig/kdeui/xmlgui/ui_standards.rc 2009-05-19 08:06:58.000000000 -0400 ++++ kde4libs-4.3.1/kdeui/xmlgui/ui_standards.rc 2009-09-26 12:39:13.000000000 -0400 @@ -185,6 +185,9 @@