diff -Nru adept-2.1.3ubuntu24/debian/changelog adept-2.1.3ubuntu25/debian/changelog --- adept-2.1.3ubuntu24/debian/changelog 2008-03-10 17:12:25.000000000 +0100 +++ adept-2.1.3ubuntu25/debian/changelog 2008-04-19 00:01:53.000000000 +0200 @@ -1,3 +1,17 @@ +adept (2.1.3ubuntu25) hardy; urgency=low + + [ Yuriy Kozlov ] + * Add kubuntu_32_i18n_contextmenu.diff to enable translation of context + menu items (LP: #204439) + + [ Daniel Hahler ] + * Update kubuntu_10_apport.diff to pickup Apport crash files by default. + (LP: #215100) + * Update kubuntu_03_translation_catalogues.diff to include translations from + libapt-front (LP: #204439) + + -- Daniel Hahler Fri, 18 Apr 2008 20:38:58 +0200 + adept (2.1.3ubuntu24) hardy; urgency=low * Add kubuntu_31_xdg_autostart_dir.diff to move to xdg autostart dir diff -Nru /tmp/UgKckYrm6K/adept-2.1.3ubuntu24/debian/patches/kubuntu_03_translation_catalogues.diff /tmp/5rmhoQ7WRf/adept-2.1.3ubuntu25/debian/patches/kubuntu_03_translation_catalogues.diff --- adept-2.1.3ubuntu24/debian/patches/kubuntu_03_translation_catalogues.diff 2007-09-18 21:07:09.000000000 +0200 +++ adept-2.1.3ubuntu25/debian/patches/kubuntu_03_translation_catalogues.diff 2008-04-18 23:42:45.000000000 +0200 @@ -54,11 +54,12 @@ putenv( "QT_IM_MODULE=xim" ); QString description = i18n("Adept Manager"); -@@ -42,6 +45,8 @@ +@@ -42,6 +45,9 @@ config->setGroup("General Settings"); QString version = config->readEntry("Version"); */ + KGlobal::locale()->insertCatalogue(QString::fromUtf8("libept")); ++ KGlobal::locale()->insertCatalogue(QString::fromUtf8("libapt-front")); + TestApp *ta = new TestApp(); diff -Nru /tmp/UgKckYrm6K/adept-2.1.3ubuntu24/debian/patches/kubuntu_10_apport.diff /tmp/5rmhoQ7WRf/adept-2.1.3ubuntu25/debian/patches/kubuntu_10_apport.diff --- adept-2.1.3ubuntu24/debian/patches/kubuntu_10_apport.diff 2007-10-10 17:32:01.000000000 +0200 +++ adept-2.1.3ubuntu25/debian/patches/kubuntu_10_apport.diff 2008-04-18 20:38:50.000000000 +0200 @@ -38,7 +38,7 @@ + + // if apport crash handler it installed, watch for crash reports appearing and run + // the apport frontend when they do -+ bool runApport = sharedConfig()->readBoolEntry( "Apport", false ); ++ bool runApport = sharedConfig()->readBoolEntry( "Apport", true ); + if ( QFile::exists(QString("/usr/share/apport/apport-qt")) && runApport ) { + m_dirWatch = new KDirWatch(this); + m_dirWatch->addDir(QString("/var/crash")); diff -Nru /tmp/UgKckYrm6K/adept-2.1.3ubuntu24/debian/patches/kubuntu_32_i18n_contextmenu.diff /tmp/5rmhoQ7WRf/adept-2.1.3ubuntu25/debian/patches/kubuntu_32_i18n_contextmenu.diff --- adept-2.1.3ubuntu24/debian/patches/kubuntu_32_i18n_contextmenu.diff 1970-01-01 01:00:00.000000000 +0100 +++ adept-2.1.3ubuntu25/debian/patches/kubuntu_32_i18n_contextmenu.diff 2008-04-18 20:49:35.000000000 +0200 @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' adept-2.1.3ubuntu24/adept/adept/lister.cpp adept-2.1.3ubuntu24.new/adept/adept/lister.cpp +--- adept-2.1.3ubuntu24/adept/adept/lister.cpp 2008-03-31 22:04:33.000000000 -0400 ++++ adept-2.1.3ubuntu24.new/adept/adept/lister.cpp 2008-03-31 22:04:57.000000000 -0400 +@@ -493,7 +493,7 @@ + try { + for (; r != r.end(); ++r) { + m->insertItem( SmallIconSet( m_icons[ u8( r->name() ) ] ), +- r->prettyName(), id ); ++ i18n(QString(r->prettyName()).ascii()), id ); + m->setItemEnabled( + id, r->possible( utils::upcastRange< entity::Package >( sel ) ) ); + ++id;