reverted: --- evolution-2.22.3.1/debian/evolution-2.2.desktop +++ evolution-2.22.3.1.orig/debian/evolution-2.2.desktop @@ -1,117 +0,0 @@ -[Desktop Entry] -Name=Evolution -Name[ar]=افُليوشِن -Name[az]=Evolution -Name[be]="Эвалюцыя" -Name[bg]=Evolution -Name[bn]=Evolution -Name[ca]=Evolution -Name[cs]=Evolution -Name[cy]=Evolution -Name[da]=Evolution -Name[de]=Evolution -Name[el]=Evolution -Name[en_CA]=Evolution -Name[en_GB]=Evolution -Name[es]=Evolution -Name[et]=Evolution -Name[eu]=Evolution -Name[fa]=Evolution -Name[fi]=Evolution -Name[fr]=Evolution -Name[ga]=Evolution -Name[gl]=Evolution -Name[gu]=ઈવોલ્યુશન -Name[hr]=Evolution -Name[hu]=Evolution -Name[id]=Evolution -Name[it]=Evolution -Name[ja]=Evolution -Name[ko]=Evolution -Name[lt]=Evolution -Name[lv]=Evolution -Name[mn]=Эволюшин -Name[ms]=Evolution -Name[nb]=Evolution -Name[ne]=इभुलोसन -Name[nl]=Evolution -Name[nn]=Evolution -Name[no]=Evolution -Name[pa]=ਈਵੇਲੂਸ਼ਨ -Name[pl]=Evolution -Name[pt]=Evolution -Name[pt_BR]=Evolution -Name[ro]=Evolution -Name[ru]=Evolution -Name[rw]=Impinduka -Name[sk]=Evolution -Name[sl]=Evolucija -Name[sq]=Evolution -Name[sr]=Еволуција -Name[sr@Latn]=Evolucija -Name[sv]=Evolution -Name[th]=Evolution -Name[tr]=Evolution -Name[uk]=Evolution -Name[vi]=Evolution -Name[wa]=Evolution -Name[xh]=I-Evolution -Name[zh_CN]=Evolution -Name[zh_TW]=Evolution -Comment=Manage email, calendar, contacts and tasks -Comment[bg]=Програма за работа в група Evolution -Comment[bn]=Evolution Groupware Suite -Comment[ca]=El paquet d'aplicacions de treball en grup Evolution -Comment[cs]=Sada nástrojů pro skupinovou spolupráci Evolution -Comment[cy]=Cyfres Meddalwedd Grŵp Evolution -Comment[da]=Samarbejdsprogrammellet Evolution -Comment[de]=Die Groupware-Suite Evolution -Comment[el]=Η σουίτα εφαρμογών του Evolution -Comment[en_CA]=The Evolution Groupware Suite -Comment[en_GB]=The Evolution Groupware Suite -Comment[es]=La suite de trabajo en grupo Evolution -Comment[et]=Evolution grupitarkvarakomplekt -Comment[eu]=Evolution-en talde-lanerako suitea -Comment[fi]=Evolution työryhmäohjelmisto -Comment[fr]=La suite de travail collaboratif Evolution -Comment[gu]=ઈવોલ્યુશન ગ્રુપવેર સેવા -Comment[hu]=Az Evolution csoportmunka-programcsomag -Comment[id]=The Evolution Groupware Suite -Comment[it]=La suite Evolution per il groupware -Comment[ja]=Evolution グループウェア・スイートです -Comment[ko]=Evolution 그룹웨어 모음 -Comment[lt]=Evolution grupinio darbo rinkinys -Comment[ms]=Sut perisian kumpulan Evolution -Comment[nb]=Gruppevaresuiten Evolution -Comment[ne]=इभोलुसन ग्रुपवेर सुट -Comment[nl]=De Evolution Groupware suite -Comment[nn]=Pakka Evolution Groupware -Comment[no]=Gruppevaresuiten Evolution -Comment[pa]=ਈਵੇਲੂਸ਼ਨ ਸਮੂਹਵੇਅਰ ਸਰੂਪ -Comment[pl]=Pakiet do pracy grupowej Evolution -Comment[pt]=O Pacote de Colaboração Evolution -Comment[pt_BR]=O Conjunto de Aplicações para Grupos de Trabalho Evolution -Comment[ro]=Suita Groupware Evolution -Comment[ru]=Набор приложений групповой работы Evolution -Comment[sq]=Suite Groupware e Evolution. -Comment[sr]=Пакет програма Еволуција -Comment[sr@Latn]=Paket programa Evolucija -Comment[sv]=Grupprogramvarusviten Evolution -Comment[th]=ชุดกรุ๊ปแวร์ Evolution -Comment[tr]=Evolution Groupware Programları -Comment[uk]=Набір програм для групової роботи Evolution -Comment[vi]=Bộ phần mềm nhóm Evolution -Comment[xh]=I-Groupware Suite ye-Evolution -Comment[zh_CN]=Evolution 群件套件 -Comment[zh_TW]=Evolution Groupware 套件 -Exec=evolution -Icon=evolution -Terminal=false -Type=Application -Categories=GNOME;Office;X-Red-Hat-Base; -NoDisplay=true -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=Evolution -X-GNOME-Bugzilla-Version=2.21.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-exchange-storage;evolution-alarm-notify; diff -u evolution-2.22.3.1/debian/evolution.install evolution-2.22.3.1/debian/evolution.install --- evolution-2.22.3.1/debian/evolution.install +++ evolution-2.22.3.1/debian/evolution.install @@ -12,7 +12,5 @@ debian/tmp/usr/lib/bonobo debian/tmp/usr/lib/evolution/2.22/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,startup-wizard,print-message,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,hula-account-setup,mail-account-disable,org-gnome-evolution-google,publish-calendar,caldav,imap-features,sa-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade} -debian/evolution-2.2.desktop usr/share/applications debian/evolution-alarm-notify.desktop etc/xdg/autostart -debian/evolution-mail.desktop usr/share/applications/ debian/evolution.xpm usr/share/pixmaps/ debian/lintian/evolution usr/share/lintian/overrides/ reverted: --- evolution-2.22.3.1/debian/patches/61_translate_menu_entry.patch +++ evolution-2.22.3.1.orig/debian/patches/61_translate_menu_entry.patch @@ -1,11 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' evolution-2.21.2/po/POTFILES.in evolution-2.21.2.new/po/POTFILES.in ---- evolution-2.21.2/po/POTFILES.in 2007-11-09 01:58:13.000000000 +0100 -+++ evolution-2.21.2.new/po/POTFILES.in 2007-11-13 17:48:59.000000000 +0100 -@@ -182,6 +182,7 @@ - composer/mail-composer.error.xml - data/evolution.desktop.in.in - data/evolution.keys.in.in -+debian/evolution-mail.desktop.in - e-util/e-categories-config.c - e-util/e-dialog-utils.c - e-util/e-error.c reverted: --- evolution-2.22.3.1/debian/evolution-mail.desktop.in +++ evolution-2.22.3.1.orig/debian/evolution-mail.desktop.in @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -_Name=Evolution Mail -_Comment=Read and write emails -Exec=evolution --component=mail -Icon=evolution -Terminal=false -Type=Application -Categories=GNOME;Application;Network; -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=Evolution -X-GNOME-Bugzilla-Component=Miscellaneous -X-GNOME-Bugzilla-Version=2.10.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-1.8;evolution-exchange-storage;evolution-alarm-notify; reverted: --- evolution-2.22.3.1/debian/evolution-mail.desktop +++ evolution-2.22.3.1.orig/debian/evolution-mail.desktop @@ -1,46 +0,0 @@ -[Desktop Entry] -Name=Evolution Mail -Name[da]=Evolution - e-post-program -Name[de]=Evolution eMail -Name[es]=Cliente de correo Evolution -Name[fi]=Evolution-sähköposti -Name[fr]=Lecteur de courrier Evolution -Name[he]=דואר אבולושיין -Name[is]=Evolution Póstur -Name[it]=Gestore di posta Evolution -Name[nb]=Evolution e-post -Name[nn]=Evolution e-post -Name[no]=Evolution e-post -Name[pt_BR]=Leitor de E-mail Evolution -Name[ro]=Evolution Mail -Name[sv]=Evolution e-post -Name[xh]=I-Imeyili ye-Evolution -Name[zh_CN]=Evolution 电子邮件 -Comment=Read and write emails -Comment[da]=Læs og skriv e-breve -Comment[de]=Emails lesen und schreiben -Comment[es]=Cliente de correo Evolution -Comment[fr]=Lire et écrire des courriers électroniques -Comment[he]=קרא דואר באמצעות אבולושיין -Comment[fi]=Evolution-sähköposti -Comment[is]=Evolution Póstur -Comment[it]=Leggi e scrivi email -Comment[nb]=Les og send e-post -Comment[nn]=Les og send e-post -Comment[no]=Les og send e-post -Comment[pt_BR]=Leia e envie e-mails -Comment[ro]=Evolution Mail -Comment[sv]=Läs och skriv e-post -Comment[xh]=I-Imeyili ye-Evolution -Comment[zh_CN]=Evolution 电子邮件 -Exec=evolution --component=mail -Icon=evolution -Terminal=false -Type=Application -Categories=GNOME;Network; -StartupNotify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=Evolution -X-GNOME-Bugzilla-Component=Miscellaneous -X-GNOME-Bugzilla-Version=2.21.x -X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.22;evolution-alarm-notify; diff -u evolution-2.22.3.1/debian/changelog evolution-2.22.3.1/debian/changelog --- evolution-2.22.3.1/debian/changelog +++ evolution-2.22.3.1/debian/changelog @@ -1,3 +1,9 @@ +evolution (2.22.3.1-0ubuntu2) intrepid; urgency=low + + * Don't generate an extra menu in the Internet application menu. + + -- Adam Petaccia Tue, 26 Aug 2008 22:03:06 -0400 + evolution (2.22.3.1-0ubuntu1) hardy-proposed; urgency=low * New upstream version: