Changeset 5785

Timestamp:

09/10/09 04:15:02 (4 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 2.26.3-3

Location:

pkg/kev/main/evolution/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (7 diffs)
• evolution.preinst (modified) (1 diff)
• po/cs.po (added)
• po/de.po (added)
• po/es.po (added)
• po/fi.po (added)
• po/fr.po (added)
• po/it.po (added)
• po/ja.po (added)
• po/pt.po (added)
• po/ru.po (added)
• po/sv.po (added)
• po/templates.pot (modified) (4 diffs)
• rules (modified) (2 diffs)

pkg/kev/main/evolution/trunk/debian/changelog

@@ -1 @@
-evolution (2.26.3-parsix1) unstable; urgency=low
-
-  * New upstream bugfix release
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 12 Jul 2009 10:26:33 -0700
-
-evolution (2.26.2-parsix1) unstable; urgency=low
-
-  * New upstream bugfix release
-    - replace libtool with libltdl-dev
-
- -- Alan Baghumian <alan@technotux.org>  Wed, 20 May 2009 19:53:14 -0700
-
-evolution (2.26.1.1-parsix1) unstable; urgency=low
-
-  * Sync'd with Debian 2.26.1.1-1
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 03 May 2009 15:15:50 -0700
+evolution (2.26.3-parsix2) unstable; urgency=low
+
+  * Sync'd with Debian 2.26.3-3
+
+ -- Alan Baghumian <alan@technotux.org>  Wed, 09 Sep 2009 19:12:37 -0700
+
+evolution (2.26.3-3) unstable; urgency=low
+
+  * po:
+    - ja.po added, thanks Hideki Yamane.                        closes: #539596
+    - sv.po added, thanks Martin Bagge.                         closes: #522972
+    - de.po added, thanks Helge Kreutzmann.                     closes: #543728
+    - remove spurious spaces in templates. Thanks Christian Perrier for
+      patch against all translations.                           closes: #543725
+  * debian/control:
+    - update standards version to 3.8.3.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 08 Sep 2009 10:26:06 +0200
+
+evolution (2.26.3-2) unstable; urgency=low
+
+  * debian/control:
+    - bump build-deps for 2.26.3 release.                       closes: #536711
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 13 Jul 2009 08:03:05 +0200
+
+evolution (2.26.3-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream bugfix release.
+  * debian/control:
+    - update standards version to 3.8.2.
+  * po:
+    - cs.po: add czech, thanks to Martin Šín.                   closes: #532165
+    - fi.po: add finnish, thanks to Esko ArajÀrvi.              closes: #534610 
+
+  [ Josselin Mouette ]
+  * Stop suggesting gnome-spell, evolution uses enchant now.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 12 Jul 2009 18:03:16 +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

pkg/kev/main/evolution/trunk/debian/control

@@ -10 +10 @@
            Pedro Fragoso <emberez@gmail.com>,
            Yves-Alexis Perez <corsac@debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Dm-Upload-Allowed: yes
 Homepage: http://www.gnome.org/projects/evolution/
@@ -22 +22 @@
                bison,
                intltool (>= 0.35.0),
-               libltdl-dev,
+               libtool,
                pkg-config (>= 0.16.0),
                gnome-icon-theme (>= 2.19.91),
@@ -29 +29 @@
                libatk1.0-dev,
                libldap2-dev,
-               libgtkhtml3.14-dev (>= 3.26.0),
-               libgtkhtml-editor-dev (>= 3.26.0),
+               libgtkhtml3.14-dev (>= 3.26.3),
+               libgtkhtml-editor-dev (>= 3.26.3),
                libgnome-pilot2-dev (>= 2.0.15),
                libkrb5-dev,
@@ -38 +38 @@
                liborbit2-dev (>= 1:2.9.8),
                libbonobo2-dev (>= 2.20.3),
-               evolution-data-server-dev (>= 2.26.0),
+               evolution-data-server-dev (>= 2.26.3),
                evolution-data-server-dev (<< 2.27.0),
                libgtk2.0-dev (>= 2.12.0),
@@ -71 +71 @@
                pilot-link,
                automake,
+               libtool,
                libical-dev,
                libicu-dev,
-               libgail-dev
+               libgweather-dev (>= 2.24.5),
+               po-debconf
 
 Package: evolution
@@ -80 +82 @@
          ${misc:Depends},
          evolution-common (= ${source:Version}),
-         evolution-data-server (>= 2.26.0),
+         evolution-data-server (>= 2.26.3),
          evolution-data-server (<< 2.27.0),
          gnome-icon-theme (>= 2.19.91),
@@ -93 +95 @@
 Suggests: bug-buddy,
           gnupg,
-          gnome-spell (>= 1.0.4),
           network-manager,
           evolution-exchange,

pkg/kev/main/evolution/trunk/debian/evolution.preinst

@@ -13 +13 @@
 upgrade_check() {
   seen=0
-  while ps ax | egrep -q 'evolution( .*)?$'; do
+  while pgrep '^(/usr/lib/)?evolution' > /dev/null; do
     error_msg
     seen=$(($seen + 1))

pkg/kev/main/evolution/trunk/debian/po/templates.pot

@@ -9 +9 @@
 "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"
+"POT-Creation-Date: 2009-09-08 11:26+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -20 +20 @@
 #. Description
 #: ../evolution.templates:1001
-msgid "Running instances of evolution detected"
+msgid "Running instances of Evolution detected"
 msgstr ""
 
@@ -27 +27 @@
 #: ../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 "
+"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."
@@ -37 +37 @@
 #: ../evolution.templates:1001
 msgid ""
-"You need to shut down all running instances of evolution using the "
+"You need to shut down all running instances of Evolution using the "
 "\"evolution --force-shutdown\" command before the upgrade can proceed."
 msgstr ""

pkg/kev/main/evolution/trunk/debian/rules

@@ -35 +35 @@
         --enable-nntp \
         --libexecdir=/usr/lib \
-        --enable-plugins=experimental \
-        --without-weather
+        --enable-plugins=experimental
 
 configure:
@@ -43 +42 @@
 
 clean::
+        debconf-updatepo
         find -name '*.schemas' | xargs rm -f