branch from current unstable sources

git-svn-id: file:///svn/pkg-evolution/experimental/evolution@1241 ed03ce00-e4f4-0310-9448-ee38221cb277
2009-06-24 11:50:30 +00:00
parent 28168ea15f 6321a6d642
commit bfded135eb
14 changed files with 522 additions and 12 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,16 +1,77 @@
-evolution (2.26.0-1) UNRELEASED; urgency=low
+evolution (2.26.2-3) UNRELEASED; urgency=low

+  * po:
+    - cs.po: add czech, thanks to Martin Šín.                   closes: #532165
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 07 Jun 2009 19:11:04 +0200
+
+evolution (2.26.2-2) unstable; urgency=low
+
+  * debian/control
+    - bump build-deps to 2.26.2.                                closes: #530746
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 27 May 2009 19:44:20 +0200
+
+evolution (2.26.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * po:
+    - es.po: add spanish, thanks Fernando González de Requena.  closes: #528970
+    - it.po: add italian, thanks Luca Monducci.                 closes: #529159
+    - ru.po: add russian, thanks Yuri Kozlov.                   closes: #529809 
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 26 May 2009 08:11:35 +0200
+
+evolution (2.26.1.1-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * evolution.preinst: use pgrep to match evolution processes instead of 
+    being so strict. Closes: #525985.
+
+  [ Yves-Alexis Perez ]
+  * Debconf translations:
+    - sv.po added, thanks to Martin Bagge.
+    - pt.po added, thanks to Miguel Figueiredo.
+    - fr.po added, Yoann Ciabaud.
+  * debian/rules:
+    - re-enable weather calendar.                               closes: #526827
+    - run debconf-updatepo at clean time.
+  * debian/control:
+    - build-dep on libgweather-dev and po-debconf.
+    - bump build deps on gtkhtml3.14 and evolution-data-server to be sure
+      to use the fixed ones.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 06 May 2009 23:18:32 +0200
+
+evolution (2.26.1.1-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
  * New upstream release.
+    - 2.26 finally available.                                   closes: #520766
  * debian/control:
    - update standards version to 3.8.1.
    - update (build-)deps for 2.26.
    - add build-dep on libical-dev and libicu-dev.
-  * debian/NEWS.Debian: warn user to make a backup and quit evolution
-    before upgrading.                                           closes: #519206
  * debian/*.install: upgrade paths to 2.26.
  * debian/lintian/*: upgrade paths to 2.26.

- -- Yves-Alexis Perez <corsac@debian.org>  Thu, 19 Mar 2009 19:21:01 +0100
+  [ Josselin Mouette ]
+  * Fix section for the debug package.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 26 Apr 2009 09:51:16 +0200
+
+evolution (2.24.5-3) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/NEWS.Debian: warn user to make a backup and quit evolution
+    before upgrading.
+
+  [ Josselin Mouette ]
+  * evolution.{preinst,templates): add a pre-upgrade check that prevents 
+    any upgrade if evolution is currently running. Closes: #519206.
+  * Add a Pre-Depends on debconf for the debconf use in preinst.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 01 Apr 2009 13:00:41 +0200

 evolution (2.24.5-2) unstable; urgency=low

--- a/debian/control
+++ b/debian/control
@ -28,8 +28,8 @@ Build-Depends: debhelper (>= 5.0.0),
               gtk-doc-tools (>= 0.6),
               libatk1.0-dev,
               libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.26.0),
-               libgtkhtml-editor-dev (>= 3.26.0),
+               libgtkhtml3.14-dev (>= 3.26.2),
+               libgtkhtml-editor-dev (>= 3.26.2),
               libgnome-pilot2-dev (>= 2.0.15),
               libkrb5-dev,
               libnss3-dev,
@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 5.0.0),
               libglib2.0-dev (>= 2.15.3),
               liborbit2-dev (>= 1:2.9.8),
               libbonobo2-dev (>= 2.20.3),
-               evolution-data-server-dev (>= 2.26.0),
+               evolution-data-server-dev (>= 2.26.2),
               evolution-data-server-dev (<< 2.27.0),
               libgtk2.0-dev (>= 2.12.0),
               libbonoboui2-dev (>= 2.4.2),
@ -72,17 +72,20 @@ Build-Depends: debhelper (>= 5.0.0),
               automake,
               libtool,
               libical-dev,
-               libicu-dev
+               libicu-dev,
+               libgweather-dev (>= 2.24.5),
+               po-debconf

 Package: evolution
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends},
         evolution-common (= ${source:Version}),
-         evolution-data-server (>= 2.26.0),
+         evolution-data-server (>= 2.26.2),
         evolution-data-server (<< 2.27.0),
         gnome-icon-theme (>= 2.19.91),
         dbus
+Pre-Depends: debconf (>= 1.4.69) | debconf-2.0
 Recommends: gnome-pilot-conduits (>= 2.0.9),
            gnome-desktop-data,
            evolution-plugins,
@ -165,6 +168,7 @@ Description: development library files for Evolution
 for developing Evolution components.

 Package: evolution-dbg
+Section: debug
 Priority: extra
 Architecture: any
 Depends: evolution (= ${binary:Version}),
--- a/debian/evolution.preinst
+++ b/debian/evolution.preinst
@ -0,0 +1,33 @@
+#! /bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+
+error_msg() {
+  db_title Upgrading evolution
+  db_fset evolution/needs_shutdown seen false
+  db_input high evolution/needs_shutdown || true
+  db_go
+}
+
+upgrade_check() {
+  seen=0
+  while pgrep '^(/usr/lib/)?evolution' > /dev/null; do
+    error_msg
+    seen=$(($seen + 1))
+    if [ $seen = 3 ]; then
+      db_stop
+      echo "Evolution is still running, aborting..."
+      exit 1
+    fi
+  done
+
+  db_stop
+  echo "No more Evolution instances running, proceeding with the upgrade..."
+}
+
+if dpkg --compare-versions "$2" lt-nl 2.24; then
+  upgrade_check
+fi
+
+#DEBHELPER#
--- a/debian/evolution.templates
+++ b/debian/evolution.templates
@ -0,0 +1,10 @@
+Template: evolution/needs_shutdown
+Type: error
+_Description: Running instances of Evolution detected
+ You are currently upgrading Evolution to a version with an incompatible 
+ index format.  However, it has been detected that Evolution is 
+ currently running.  Upgrading it before shutting it down could lead to 
+ crashes or to serious data loss in some cases.
+ .
+ You need to shut down all running instances of Evolution using the
+ "evolution --force-shutdown" command before the upgrade can proceed.
--- a/debian/po/POTFILES.in
+++ b/debian/po/POTFILES.in
@ -0,0 +1 @@
+[type: gettext/rfc822deb] evolution.templates
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the evolution package.
+# Martin Sin <martin.sin@zshk.cz>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution 2.6.2-2\n"
+"Report-Msgid-Bugs-To: evolution@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-27 19:44+0200\n"
+"PO-Revision-Date: 2009-06-07 10:33+0200\n"
+"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of Evolution detected"
+msgstr "Detekováno spuštění Evolution"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading Evolution to a version with an incompatible  "
+"index format.  However, it has been detected that Evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+"Nyní provádíte aktualizaci Evolution na novou verzi s nekompatibilním "
+"formátem rejstříku. Přesto detekuji, že máte Evolution nyní spuštěn. "
+"To může v některých případech vést k selhání aplikace nebo k vážné ztrátě "
+"dat."
+
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of Evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
+"Před aktualizací programu Evolution je třeba ukončit všechny spuštěné "
+"instance programu pomocí příkazu \"evolution --force-shutdown\"."
--- a/debian/po/es.po
+++ b/debian/po/es.po
@ -0,0 +1,69 @@
+# Evolution po-debconf translation to Spanish.
+# Copyright (C) 2009 Software in the Public Interest.
+# This file is distributed under the same license as the Evolution package.
+#
+#  Changes:
+# - Initial translation
+#       Fernando González de Requena <fgrequena@gmail.com>, 2009.
+#
+#
+#  Traductores, si no conoce el formato PO, merece la pena leer la
+#  documentación de gettext, especialmente las secciones dedicadas a este
+#  formato, por ejemplo ejecutando:
+#         info -n '(gettext)PO Files'
+#         info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+#   http://www.debian.org/intl/spanish/
+#   especialmente las notas y normas de traducción en
+#   http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+#   /usr/share/doc/po-debconf/README-trans
+#   o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Si tiene dudas o consultas sobre esta traducción consulte con el último
+# traductor (campo Last-Translator) y ponga en copia a la lista de
+# traducción de Debian al español (<debian-l10n-spanish@lists.debian.org>)
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Evolution 2.26.1.1-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-05-01 10:28+0200\n"
+"PO-Revision-Date: 2009-05-04 17:45+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena@gmail.com>\n"
+"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of Evolution detected"
+msgstr "Se ha detectado instancias de Evolution en ejecución"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading Evolution to a version with an incompatible  "
+"index format.  However, it has been detected that Evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr "Está actualizando Evolution a una versión con un formato de índice incompatible. Sin embargo, se ha detectado que Evolution se está ejecutando en este momento. Actualizar el programa sin cerrarlo antes podría provocar fallos, o la pérdida importante de datos en algunos casos."
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of Evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr "Debe cerrar todas las instancias en ejecución de Evolution utilizando la orden «evolution --force-shutdown» antes de proceder con la actualización."
+
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@ -0,0 +1,52 @@
+# French po-debconf translation of evolution
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the evolution package.
+#
+# Translators:
+#
+# Yoann Ciabaud <y.ciabaud@gmail.com>, 2009
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Evolution\n"
+"Report-Msgid-Bugs-To: evolution@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-01 15:24+0200\n"
+"PO-Revision-Date: 2009-04-07 08:02+0100\n"
+"Last-Translator: Yoann Ciabaud <y.ciabaud@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of evolution detected"
+msgstr "Evolution est actuellement utilisé"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading evolution to a version with an incompatible  "
+"index format.  However, it has been detected that evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+"Vous êtes en train de mettre à jour Evolution vers une version avec un "
+"format d'index incompatible avec celui que vous utilisez. Cependant, "
+"Evolution semble être actuellement en cours d'exécution. Effectuer sa mise à "
+"jour sans l'arrêter peut conduire à des instabilités ou parfois à "
+"d'importantes pertes de données."
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
+"Vous devez arrêter toutes les instances actuelles d'Evolution avec la "
+"commande « evolution --force-shutdown » avant d'effectuer la mise à jour."
--- a/debian/po/it.po
+++ b/debian/po/it.po
@ -0,0 +1,46 @@
+# Italian translation of the evolution debconf templates
+# This file is distributed under the same license as the evolution package
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# Luca Monducci <luca.mo@tiscali.it>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution 2.26.1.1\n"
+"Report-Msgid-Bugs-To: evolution@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-07 00:23+0200\n"
+"PO-Revision-Date: 2009-05-19 21:29+0200\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of Evolution detected"
+msgstr "Rilevate delle istanze attive di Evolution"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading Evolution to a version with an incompatible  "
+"index format.  However, it has been detected that Evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+"È in corso l'aggiornamento di Evolution a una versione con un formato degli "
+"indici non compatibile con l'attuale. Sono state rilevate delle istanze "
+"attive di Evolution, il loro aggiornamento senza chiuderle potrebbe causare "
+"dei crash oppure, in qualche caso, anche la perdita di dati."
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of Evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
+"È necessario chiudere tutte le istanze di Evolution attive usando il comando "
+"\"evolution --force-shutdown\" prima di procedere con l'aggiornamento."
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@ -0,0 +1,48 @@
+# translation of evolution debconf to Portuguese
+# Copyright (C) 2009 the evolution's copyright holder
+# This file is distributed under the same license as the evolution package.
+#
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution 2.24.5-3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-04-02 10:27+0200\n"
+"PO-Revision-Date: 2009-04-08 21:48+0100\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of Evolution detected"
+msgstr "Detectadas instâncias do Evolution em funcionamento"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading Evolution to a version with an incompatible  "
+"index format.  However, it has been detected that Evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+"Você está actualmente a actualizar o Evolution para uma versão com um "
+"formato de índice incompatível. No entanto, foi detectado que o Evolution "
+"está actualmente em funcionamento. Efectuar a actualização antes de o parar "
+"pode levar a crashes ou a perdas de dados sérias em alguns casos."
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of Evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
+"Você precisa de terminar todas as instâncias do Evolution em funcionamento "
+"usando o comando \"evolution --force-shutdown\" antes que a actualização "
+"possa prosseguir."
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@ -0,0 +1,50 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution 2.26.1.1-2\n"
+"Report-Msgid-Bugs-To: evolution@packages.debian.org\n"
+"POT-Creation-Date: 2009-05-07 00:23+0200\n"
+"PO-Revision-Date: 2009-05-10 10:38+0400\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of Evolution detected"
+msgstr "Обнаружены работающие экземпляры Evolution"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading Evolution to a version with an incompatible  "
+"index format.  However, it has been detected that Evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+"В данный момент выполняется обновление Evolution до версии, которая имеет "
+"несовместимый с предыдущими версиями формат индексов. Однако, обнаружено, "
+"что в системе есть работающий Evolution. Если его не остановить, то обновление приведёт "
+"к его падению или даже потере данных."
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of Evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
+"Перед тем как процесс обновления сможет продолжиться вам нужно остановить "
+"все запущенные экземпляры Evolution выполнив "
+"команду \"evolution --force-shutdown\"."
+
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@ -0,0 +1,48 @@
+# translation of evolution.po to swedish
+# Martin Bagge <brother@bsnet.se>, 2009.
+# Translation of evolution debconf template to Swedish
+# Copyright (C) 2009 Martin Bagge <brother@bsnet.se>
+# This file is distributed under the same license as the evolution package.
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-04-02 10:27+0200\n"
+"PO-Revision-Date: 2009-04-07 19:38+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: swedish\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of Evolution detected"
+msgstr "Det finns aktiva instanser av Evolution körandes"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading Evolution to a version with an incompatible  "
+"index format.  However, it has been detected that Evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+"Du uppgraderar nu Evolution till en version med ett indexformat som inte är "
+"kompatibel med tidigare versioner, dessutom körs minst en instans av "
+"Evolution. Om du genomför en uppgradering innan du stänger ned Evolution kan "
+"det leda till krascher eller stora dataförluster."
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of Evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
+"Du måste stänga ned alla instanser av Evolution som körs, använd \"evolution "
+"--force-shutdown\" innan du fortsätter med uppgraderingen."
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@ -0,0 +1,41 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: evolution@packages.debian.org\n"
+"POT-Creation-Date: 2009-04-01 15:24+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid "Running instances of evolution detected"
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You are currently upgrading evolution to a version with an incompatible  "
+"index format.  However, it has been detected that evolution is  currently "
+"running.  Upgrading it before shutting it down could lead to  crashes or to "
+"serious data loss in some cases."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../evolution.templates:1001
+msgid ""
+"You need to shut down all running instances of evolution using the "
+"\"evolution --force-shutdown\" command before the upgrade can proceed."
+msgstr ""
--- a/debian/rules
+++ b/debian/rules
@ -12,7 +12,7 @@ UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Ve

 ELIBDIR := usr/lib/evolution/2.26

-DEB_SHLIBDEPS_INCLUDE := debian/evolution/usr/lib/evolution/2.26
+DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
 DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
 DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins

@ -34,12 +34,12 @@ DEB_CONFIGURE_EXTRA_FLAGS += \
 	--sysconfdir=/etc \
 	--enable-nntp \
 	--libexecdir=/usr/lib \
-	--enable-plugins=experimental \
-	--without-weather
+	--enable-plugins=experimental

 configure:
 	dh_testdir
 	autoreconf -vfi

 clean::
+	debconf-updatepo
 	find -name '*.schemas' | xargs rm -f
				`@ -0,0 +1 @@`
				`[type: gettext/rfc822deb] evolution.templates`