r1010 - in /unstable/evolution/debian: changelog control evolution-plugins-experimental.install patches/35_fix_tnef_locale.patch

[heikkih-guest at users.alioth.debian.org]

Author: heikkih-guest
Date: Thu Apr  3 09:12:16 2008
New Revision: 1010

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1010
Log:
revert r1005 and add patch 35_fix_tnef_locale.patch to fix tnef-locale-bug

Added:
    unstable/evolution/debian/patches/35_fix_tnef_locale.patch
Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/control
    unstable/evolution/debian/evolution-plugins-experimental.install

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1010&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Thu Apr  3 09:12:16 2008
@@ -1,12 +1,13 @@
 evolution (2.22.0-3) UNRELEASED; urgency=low
 
   * Prepare upload to unstable
-  * Remove experimental plugin to handle tnef-attachments (closes: #464670)
+  * Add patch 35_fix_tnef_locale.patch
+    - fixes locale-bug in tnef-attachments (closes: #464670)
   * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump
     build-dep on dpkg-dev
   * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029)
 
- -- Heikki Henriksen <heikkih at gmail.com>  Wed, 02 Apr 2008 11:56:53 +0200
+ -- Heikki Henriksen <heikkih at gmail.com>  Thu, 03 Apr 2008 11:07:27 +0200
 
 evolution (2.22.0-2) experimental; urgency=low
 

Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1010&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Thu Apr  3 09:12:16 2008
@@ -62,6 +62,7 @@
                libexchange-storage1.2-dev (>= 2.21.92),
                gtkhtml3.14,
                libgstreamer0.10-dev,
+               libytnef0-dev,
                pilot-link
 
 Package: evolution
@@ -225,3 +226,4 @@
   - save-attachments
   - external-editor
   - ipod-sync
+  - tnef-attachments

Modified: unstable/evolution/debian/evolution-plugins-experimental.install
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/evolution-plugins-experimental.install?rev=1010&op=diff
==============================================================================
--- unstable/evolution/debian/evolution-plugins-experimental.install (original)
+++ unstable/evolution/debian/evolution-plugins-experimental.install Thu Apr  3 09:12:16 2008
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync}*.{so,eplug,xml}
+debian/tmp/usr/lib/evolution/2.22/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,ipod-sync,tnef-attachments}*.{so,eplug,xml}

Added: unstable/evolution/debian/patches/35_fix_tnef_locale.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/patches/35_fix_tnef_locale.patch?rev=1010&op=file
==============================================================================
--- unstable/evolution/debian/patches/35_fix_tnef_locale.patch (added)
+++ unstable/evolution/debian/patches/35_fix_tnef_locale.patch Thu Apr  3 09:12:16 2008
@@ -1,0 +1,12 @@
+diff -ruN evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am evolution-2.22.0/plugins/tnef-attachments/Makefile.am
+--- evolution-2.22.0.orig/plugins/tnef-attachments/Makefile.am	2007-10-23 12:06:06.000000000 +0200
++++ evolution-2.22.0/plugins/tnef-attachments/Makefile.am	2008-04-03 11:06:30.000000000 +0200
+@@ -1,7 +1,7 @@
+ INCLUDES =						\
+ 	-I$(top_srcdir)					\
+ 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
+-	-DLOCALEDIR="\"$(LOCALEDIR)\""			\
++	-DLOCALEDIR="\"$(localedir)\""			\
+ 	$(EVOLUTION_MAIL_CFLAGS)
+ 
+ @EVO_PLUGIN_RULE@