icedove-1:31.5.0.deb1-1{,.nonprism1}: updating version

3 files changed, 263 insertions, 14 deletions

diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index c69a94769..02f47cd45 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -3,8 +3,8 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=31.4.0
-_debrel=deb2
+_debver=31.5.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -26,16 +26,18 @@ install=${pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
         mozconfig
+        ${pkgname}.desktop
+        ${pkgname}-install-dir.patch
         vendor.js
-        rhbz-966424.patch
-        ${pkgname}.desktop)
+        rhbz-966424.patch)
 options=(!emptydirs)
-sha256sums=('7b47a053fe1f10097350d4a599a80b91eed1dc21dfcda1618b229f97493cb93c'
-            'ff0db7a63f3e0648131ca59e4e3c6ff911e795030a49bcf1edb8585a01b33437'
+sha256sums=('effadaefbb224c72415d7e53afb7ab6046cd56155fc4dce4346b71b9db4fc23f'
+            'cd4d6944c188ec87b1346a4a908bbd3dd694928f3d78a1c90ba73947a13b5b4f'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
+            'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b'
+            '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
             'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a'
-            '492fd3fd3442a07d2965ae69d97335c6b2c2889083c4b30c945256504ed0e585')
+            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
 
 prepare() {
   export DEBIAN_BUILD="comm-esr31"
@@ -111,6 +113,9 @@ prepare() {
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
 
+  # Install to /usr/lib/$pkgname
+  patch -Np1 -i "$srcdir/${pkgname}-install-dir.patch"
+
   # Add symlinks to use jquery files built for us
   ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery
   ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery
diff --git a/nonprism/icedove/icedove-install-dir.patch b/nonprism/icedove/icedove-install-dir.patch
new file mode 100644
index 000000000..0c7ffaa4a
--- /dev/null
+++ b/nonprism/icedove/icedove-install-dir.patch
@@ -0,0 +1,12 @@
+diff -upr comm-esr31.orig/mozilla/config/baseconfig.mk comm-esr31/mozilla/config/baseconfig.mk
+--- comm-esr31.orig/mozilla/config/baseconfig.mk	2014-07-22 09:44:22.000000000 +0300
++++ comm-esr31/mozilla/config/baseconfig.mk	2014-07-22 09:46:45.000000000 +0300
+@@ -4,7 +4,7 @@
+ # whether a normal build is happening or whether the check is running.
+ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
+ sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+ ifndef TOP_DIST
+ TOP_DIST = dist
diff --git a/nonprism/icedove/icedove.desktop b/nonprism/icedove/icedove.desktop
index ef2cd76e9..f39d5823c 100644
--- a/nonprism/icedove/icedove.desktop
+++ b/nonprism/icedove/icedove.desktop
@@ -1,13 +1,245 @@
 [Desktop Entry]
-Version=1.0
 Name=Icedove
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
+Name[ast]=Veceru de corréu Icedove
+Name[ca]=Client de correu Icedove
+Name[cs]=Poštovní klient Icedove
+Name[da]=Icedove - e-post/nyhedsgruppe
+Name[de]=Icedove-E-Mail und -Nachrichten
+Name[el]=Ηλεκτρονική αλληλογραφία Icedove
+Name[es]=Cliente de correo Icedove
+Name[fi]=Icedove-sähköposti
+Name[fr]=Messagerie Icedove
+Name[gl]=Cliente de correo Icedove
+Name[he]=Icedove דוא״ל/חדשות
+Name[hr]=Icedove e-pošta/novosti
+Name[hu]=Icedove levelezőkliens
+Name[it]=Email Icedove
+Name[ja]=Icedove メールクライアント
+Name[ko]=Icedove
+Name[nl]=Icedove e-mail/nieuws
+Name[pl]=Klient poczty Icedove
+Name[pt_BR]=Cliente de E-mail Icedove
+Name[ru]=Почтовый клиент Icedove
+Name[sk]=Icedove - poštový klient
+Name[sv]=E-postklienten Icedove
+Name[ug]=Icedove ئېلخەت/خەۋەر
+Name[uk]=Поштова програма Icedove
+Name[vi]=Trình điện thư Icedove
+Name[zh_CN]=Icedove 邮件/新闻
+Name[zh_TW]=Icedove 郵件
+Comment=Send and receive mail with Icedove
+Comment[ast]=Lleer y escribir corréu electrónicu
+Comment[ca]=Llegiu i escriviu correu
+Comment[cs]=Čtení a psaní pošty
+Comment[da]=Skriv/læs e-post/nyhedsgruppe med Icedove
+Comment[de]=E-Mails und Nachrichten mit Icedove lesen und schreiben
+Comment[el]=Διαβάστε και γράψτε γράμματα με το Icedove
+Comment[es]=Lea y escriba correos y noticias con Icedove
+Comment[fi]=Lue ja kirjoita sähköposteja
+Comment[fr]=Lire et écrire des courriels
+Comment[gl]=Lea e escriba correo electrónico
+Comment[he]=קריאה/כתיבה של דוא״ל/חדשות באמצעות Icedove
+Comment[hr]=Čitajte/šaljite e-poštu s Icedove
+Comment[hu]=Levelek írása és olvasása a Icedove
+Comment[it]=Per leggere e scrivere email
+Comment[ja]=メールの読み書き
+Comment[ko]=Icedove 메일/뉴스 읽기 및 쓰기 클라이언트
+Comment[nl]=E-mail/nieuws lezen en schrijven met Icedove
+Comment[pl]=Czytanie i wysyłanie e-maili
+Comment[pt_BR]=Leia e escreva suas mensagens
+Comment[ru]=Читайте и пишите письма
+Comment[sk]=Čítajte a píšte poštu pomocou programu Icedove
+Comment[sv]=Läs och skriv e-post
+Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Icedove دا كۆرۈش ۋە يېزىش
+Comment[uk]=Читання та написання листів
+Comment[vi]=Đọc và soạn thư điện tử
+Comment[zh_CN]=阅读邮件或新闻
+Comment[zh_TW]=以 Icedove 讀寫郵件或新聞
+GenericName=Mail Client
+GenericName[ast]=Client de correu
+GenericName[ca]=Client de correu
+GenericName[cs]=Poštovní klient
+GenericName[da]=E-postklient
+GenericName[de]=E-Mail-Anwendung
+GenericName[el]=Λογισμικό αλληλογραφίας
+GenericName[es]=Cliente de correo
+GenericName[fi]=Sähköpostiohjelma
+GenericName[fr]=Client de messagerie
+GenericName[gl]=Cliente de correo electrónico
+GenericName[he]=לקוח דוא״ל
+GenericName[hr]=Klijent e-pošte
+GenericName[hu]=Levelezőkliens
+GenericName[it]=Client email
+GenericName[ja]=電子メールクライアント
+GenericName[ko]=메일 클라이언트
+GenericName[nl]=E-mailprogramma
+GenericName[pl]=Klient poczty
+GenericName[pt_BR]=Cliente de E-mail
+GenericName[ru]=Почтовый клиент
+GenericName[sk]=Poštový klient
+GenericName[ug]=ئېلخەت دېتالى
+GenericName[uk]=Поштова програма
+GenericName[vi]=Phần mềm khách quản lý thư điện tử
+GenericName[zh_CN]=邮件新闻客户端
+GenericName[zh_TW]=郵件用戶端
+Keywords=Email;E-mail;Newsgroup;Feed;RSS;
+Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS;
+Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS;
+Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS;
+Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS;
+Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben;
+Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα;
+Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS;
+Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte;
+Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Icedove;Lire;Écrire;
+Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל;
+Keywords[hr]=email;e-mail;e-pošta;pošta;RSS;
+Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS;
+Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS;
+Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS;
+Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Icedove;
+Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post;
+Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды;
+Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS;
+Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка;
+Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư;
+Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Icedove;tb;雷鸟;电邮;邮箱;阅读器;
 Exec=icedove %u
-TryExec=icedove
-Icon=icedove
 Terminal=false
+X-MultipleArgs=false
 Type=Application
+Icon=icedove
 Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
+MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
 StartupNotify=true
+Actions=Compose;Contacts;
+
+[Desktop Action Compose]
+Name=Compose New Message
+Name[af]=Skryf 'n nuwe boodskap
+Name[ar]=حرر رسالة جديدة
+Name[ast]=Redactar un mensaxe nuevu
+Name[be]=Напісаць ліст
+Name[bg]=Ново писмо
+Name[bn]=নতুন বার্তা লিখুন
+Name[br]=Sevel ur gemennadenn nevez
+Name[bs]=Napiši novu poruku
+Name[ca]=Redacta un missatge nou
+Name[cs]=Napsat novou zprávu
+Name[cy]=Cyfansoddi Neges Newydd
+Name[da]=Skriv en ny besked
+Name[de]=Neue Nachricht erstellen
+Name[el]=Σύνταξη νέου μηνύματος
+Name[eo]=Redakti novan mesaĝon
+Name[es]=Redactar un mensaje nuevo
+Name[et]=Koosta uus sõnum
+Name[eu]=Mezu Berria Idatzi
+Name[fi]=Luo uusi viesti
+Name[fr]=Rédiger un nouveau courriel
+Name[gd]=Co-chuir Teachdaireachd Ùr
+Name[gl]=Redactar unha nova mensaxe
+Name[he]=חיבור הודעה חדשה
+Name[hi]=नया संदेश लिखें
+Name[hr]=Nova poruka
+Name[hu]=Új üzenet írása
+Name[hy]=Նամակ գրել
+Name[id]=Buat Pesan Baru
+Name[is]=Skrifa nýtt bréf
+Name[it]=Componi nuovo messaggio
+Name[ja]=新しいメッセージの作成
+Name[kk]=Жаңа хат жазу
+Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು
+Name[ko]=새 메시지 쓰기
+Name[ku]=Peyameke nû biafirînê
+Name[lt]=Rašyti naują laišką
+Name[lv]=Sacerēt jaunu vēstuli
+Name[mk]=Состави нова порака
+Name[ml]=പുതിയ സന്ദേശം രചിക്കുക
+Name[mr]=नवीन संदेश लिहा.
+Name[nb]=Skriv en ny melding
+Name[nl]=Nieuw bericht opstellen
+Name[nn]=Skriv ei ny melding
+Name[pl]=Utwórz nową wiadomość
+Name[pt]=Criar nova mensagem
+Name[pt_BR]=Compor nova mensagem
+Name[ro]=Compune un mesaj nou
+Name[ru]=Написать письмо
+Name[si]=නව පණිවිඩයක් අරඹන්න
+Name[sk]=Napísať novú správu
+Name[sl]=Sestavi novo sporočilo
+Name[sq]=Krijo Mesazh të Ri
+Name[sr]=Састави нову поруку
+Name[sv]=Skriv nytt meddelande
+Name[ta]=புதிய செய்தியை உருவாக்கு
+Name[te]=కొత్త సందేశాన్ని రచించు
+Name[th]=สร้างข้อความใหม่
+Name[tr]=Yeni İleti Oluştur
+Name[uk]=Написати нове повідомлення
+Name[zh_CN]=撰写新消息
+Name[zh_TW]=撰寫新郵件
+Exec=icedove -compose
+
+[Desktop Action Contacts]
+Name=Contacts
+Name[af]=Kontakte
+Name[ar]=المتراسلين
+Name[ast]=Contautos
+Name[be]=Кантакты
+Name[bg]=Контакти
+Name[bn]=পরিচিতি সমূহ
+Name[br]=Darempredoù
+Name[bs]=Kontakti
+Name[ca]=Contactes
+Name[cs]=Kontakty
+Name[cy]=Cysylltiadau
+Name[da]=Kontakter
+Name[de]=Kontakte
+Name[el]=Επαφές
+Name[eo]=Kontaktoj
+Name[es]=Contactos
+Name[et]=Kontaktid
+Name[eu]=Kontaktuak
+Name[fi]=Yhteystiedot
+Name[fr]=Carnet d'adresses
+Name[gd]=Buntanasan
+Name[gl]=Contactos
+Name[he]=אנשי קשר
+Name[hi]=संपर्क
+Name[hr]=Kontakti
+Name[hu]=Névjegyek
+Name[hy]=Կապորդներ
+Name[id]=Kontak
+Name[is]=Tengiliðir
+Name[it]=Contatti
+Name[ja]=連絡先
+Name[kk]=Байланыс жазулары
+Name[kn]=ಸಂಪರ್ಕಗಳು
+Name[ko]=연락처
+Name[ku]=Tekilî
+Name[lt]=Kontaktai
+Name[lv]=Kontakti
+Name[mk]=Контакти
+Name[ml]=വിലാസങ്ങള്‍
+Name[mr]=संपर्क
+Name[nb]=Kontakter
+Name[nl]=Contacten
+Name[nn]=Kontaktar
+Name[pl]=Kontakty
+Name[pt]=Contactos
+Name[pt_BR]=Contatos
+Name[ro]=Contacte
+Name[ru]=Контакты
+Name[si]=සබඳතා
+Name[sk]=Kontakty
+Name[sl]=Stiki
+Name[sq]=Kontaktet
+Name[sr]=Контакти
+Name[sv]=Kontakter
+Name[ta]=தொடர்புகள்
+Name[te]=పరిచయాలు
+Name[th]=รายชื่อติดต่อ
+Name[tr]=Kişiler
+Name[uk]=Контакти
+Name[zh_CN]=联系人
+Name[zh_TW]=連絡人
+Exec=icedove -addressbook