rev 11210 - trunk/packages/kdepim/debian/patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Sun Jun 29 18:04:48 UTC 2008
Author: ana
Date: 2008-06-29 18:04:48 +0000 (Sun, 29 Jun 2008)
New Revision: 11210
Modified:
trunk/packages/kdepim/debian/patches/13_mimelib_self_contained.diff
trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff
trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff
trunk/packages/kdepim/debian/patches/18_optimize_splitAddressInternal.diff
Log:
refresh patches for kdepim
Modified: trunk/packages/kdepim/debian/patches/13_mimelib_self_contained.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/13_mimelib_self_contained.diff 2008-06-29 17:36:01 UTC (rev 11209)
+++ trunk/packages/kdepim/debian/patches/13_mimelib_self_contained.diff 2008-06-29 18:04:48 UTC (rev 11210)
@@ -1,6 +1,7 @@
-diff -Nur kdepim-3.5.4/mimelib/Makefile.am kdepim-3.5.4.new/mimelib/Makefile.am
---- kdepim-3.5.4/mimelib/Makefile.am 2005-09-10 10:24:49.000000000 +0200
-+++ kdepim-3.5.4.new/mimelib/Makefile.am 2006-08-18 15:31:28.000000000 +0200
+Index: kdepim-3.5.9/mimelib/Makefile.am
+===================================================================
+--- kdepim-3.5.9.orig/mimelib/Makefile.am 2005-09-10 10:24:49.000000000 +0200
++++ kdepim-3.5.9/mimelib/Makefile.am 2008-06-29 20:06:20.000000000 +0200
@@ -57,7 +57,7 @@
uuencode.cpp \
binhex.cpp
@@ -10,10 +11,11 @@
check_PROGRAMS = test_boyermor
-diff -Nur kdepim-3.5.4/mimelib/mimelib/config.h kdepim-3.5.4.new/mimelib/mimelib/config.h
---- kdepim-3.5.4/mimelib/mimelib/config.h 2005-09-10 10:24:49.000000000 +0200
-+++ kdepim-3.5.4.new/mimelib/mimelib/config.h 2006-08-18 15:32:05.000000000 +0200
-@@ -125,8 +125,7 @@
+Index: kdepim-3.5.9/mimelib/mimelib/config.h
+===================================================================
+--- kdepim-3.5.9.orig/mimelib/mimelib/config.h 2007-05-14 09:54:54.000000000 +0200
++++ kdepim-3.5.9/mimelib/mimelib/config.h 2008-06-29 20:06:20.000000000 +0200
+@@ -123,8 +123,7 @@
# define DW_EXPORT __declspec(dllimport)
# endif
#else
Modified: trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff 2008-06-29 17:36:01 UTC (rev 11209)
+++ trunk/packages/kdepim/debian/patches/14_kmail_filter_icons.diff 2008-06-29 18:04:48 UTC (rev 11210)
@@ -1,6 +1,7 @@
-diff -Nur kdepim-3.5.4/kmail/kmail-3.5-filter-icons.pl kdepim-3.5.4.new/kmail/kmail-3.5-filter-icons.pl
---- kdepim-3.5.4/kmail/kmail-3.5-filter-icons.pl 1970-01-01 01:00:00.000000000 +0100
-+++ kdepim-3.5.4.new/kmail/kmail-3.5-filter-icons.pl 2006-08-18 15:46:03.000000000 +0200
+Index: kdepim-3.5.9/kmail/kmail-3.5-filter-icons.pl
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ kdepim-3.5.9/kmail/kmail-3.5-filter-icons.pl 2008-06-29 20:06:30.000000000 +0200
@@ -0,0 +1,22 @@
+#!/usr/bin/perl -w
+
@@ -24,9 +25,10 @@
+ print "# DELETE $currentGroup$key\n${currentGroup}\nIcon=mail_ham\n" if $value eq "mark_as_ham";
+ }
+}
-diff -Nur kdepim-3.5.4/kmail/kmail.upd kdepim-3.5.4.new/kmail/kmail.upd
---- kdepim-3.5.4/kmail/kmail.upd 2006-07-22 10:14:16.000000000 +0200
-+++ kdepim-3.5.4.new/kmail/kmail.upd 2006-08-18 15:47:36.000000000 +0200
+Index: kdepim-3.5.9/kmail/kmail.upd
+===================================================================
+--- kdepim-3.5.9.orig/kmail/kmail.upd 2008-02-13 10:39:37.000000000 +0100
++++ kdepim-3.5.9/kmail/kmail.upd 2008-06-29 20:06:30.000000000 +0200
@@ -158,6 +158,10 @@
Id=3.4.1
File=kmailrc
@@ -38,9 +40,10 @@
# Remove the stored size so that we get a reasonable default now that we have 2 columns in the folder selection dialog
Id=3.5.4
File=kmailrc
-diff -Nur kdepim-3.5.4/kmail/kmstartup.cpp kdepim-3.5.4.new/kmail/kmstartup.cpp
---- kdepim-3.5.4/kmail/kmstartup.cpp 2006-07-22 10:14:16.000000000 +0200
-+++ kdepim-3.5.4.new/kmail/kmstartup.cpp 2006-08-18 15:48:04.000000000 +0200
+Index: kdepim-3.5.9/kmail/kmstartup.cpp
+===================================================================
+--- kdepim-3.5.9.orig/kmail/kmstartup.cpp 2007-10-08 11:50:38.000000000 +0200
++++ kdepim-3.5.9/kmail/kmstartup.cpp 2008-06-29 20:06:30.000000000 +0200
@@ -116,6 +116,7 @@
"3.4a",
"3.4b",
@@ -49,14 +52,15 @@
"3.5.4",
"3.5.7-imap-flag-migration"
};
-diff -Nur kdepim-3.5.4/kmail/Makefile.am kdepim-3.5.4.new/kmail/Makefile.am
---- kdepim-3.5.4/kmail/Makefile.am 2006-08-18 15:39:43.000000000 +0200
-+++ kdepim-3.5.4.new/kmail/Makefile.am 2006-08-18 15:49:08.000000000 +0200
-@@ -191,6 +191,7 @@
+Index: kdepim-3.5.9/kmail/Makefile.am
+===================================================================
+--- kdepim-3.5.9.orig/kmail/Makefile.am 2008-02-13 10:39:37.000000000 +0100
++++ kdepim-3.5.9/kmail/Makefile.am 2008-06-29 20:06:30.000000000 +0200
+@@ -208,6 +208,7 @@
kmail-3.3b1-misc.pl \
kmail-3.4-misc.pl \
kmail-3.4.1-update-status-filters.pl \
+ kmail-3.5-filter-icons.pl \
kmail-3.5-trigger-flag-migration.pl
-
+
confdir = $(kde_confdir)
Modified: trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff 2008-06-29 17:36:01 UTC (rev 11209)
+++ trunk/packages/kdepim/debian/patches/17_add_popfile_headers_to_fancy_view_if_requested.diff 2008-06-29 18:04:48 UTC (rev 11210)
@@ -1,7 +1,7 @@
-Index: kdepim/kmail/headerstrategy.cpp
+Index: kdepim-3.5.9/kmail/headerstrategy.cpp
===================================================================
---- kdepim/kmail/headerstrategy.cpp (revision 701051)
-+++ kdepim/kmail/headerstrategy.cpp (working copy)
+--- kdepim-3.5.9.orig/kmail/headerstrategy.cpp 2007-05-14 09:54:39.000000000 +0200
++++ kdepim-3.5.9/kmail/headerstrategy.cpp 2008-06-29 20:07:14.000000000 +0200
@@ -61,7 +61,7 @@
static const char * richHeaders[] = {
"subject", "date", "from", "cc", "bcc", "to",
@@ -11,11 +11,11 @@
};
static const int numRichHeaders = sizeof richHeaders / sizeof *richHeaders;
-Index: kdepim/kmail/headerstyle.cpp
+Index: kdepim-3.5.9/kmail/headerstyle.cpp
===================================================================
---- kdepim/kmail/headerstyle.cpp (revision 701051)
-+++ kdepim/kmail/headerstyle.cpp (working copy)
-@@ -703,6 +703,20 @@
+--- kdepim-3.5.9.orig/kmail/headerstyle.cpp 2008-02-13 10:39:37.000000000 +0100
++++ kdepim-3.5.9/kmail/headerstyle.cpp 2008-06-29 20:07:14.000000000 +0200
+@@ -705,6 +705,20 @@
}
}
}
Modified: trunk/packages/kdepim/debian/patches/18_optimize_splitAddressInternal.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/18_optimize_splitAddressInternal.diff 2008-06-29 17:36:01 UTC (rev 11209)
+++ trunk/packages/kdepim/debian/patches/18_optimize_splitAddressInternal.diff 2008-06-29 18:04:48 UTC (rev 11210)
@@ -3,8 +3,8 @@
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=405867
Index: libemailfunctions/email.cpp
===================================================================
---- libemailfunctions/email.cpp (Revision 599840)
-+++ libemailfunctions/email.cpp (Arbeitskopie)
+--- libemailfunctions/email.cpp.orig 2008-02-13 10:39:42.000000000 +0100
++++ libemailfunctions/email.cpp 2008-06-29 20:07:35.000000000 +0200
@@ -111,7 +111,14 @@
displayName = "";
addrSpec = "";
@@ -53,7 +53,7 @@
else
return KPIM::UnexpectedEnd;
break;
-@@ -159,57 +166,57 @@
+@@ -160,57 +167,57 @@
return KPIM::UnexpectedComma;
}
else
@@ -124,7 +124,7 @@
}
break;
}
-@@ -223,9 +230,10 @@
+@@ -224,9 +231,10 @@
if ( context == InAngleAddress )
return KPIM::UnclosedAngleAddr;
More information about the pkg-kde-commits
mailing list