rev 11336 - in trunk/packages/kdepim/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Sun Jul 6 12:41:21 UTC 2008


Author: ana
Date: 2008-07-06 12:41:20 +0000 (Sun, 06 Jul 2008)
New Revision: 11336

Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff
Log:
 Remove changes on libkmime/libemailfunctions/libkdepim that should have
 not been pulled. (Closes: #489095 and friends)



Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2008-07-05 20:34:54 UTC (rev 11335)
+++ trunk/packages/kdepim/debian/changelog	2008-07-06 12:41:20 UTC (rev 11336)
@@ -1,3 +1,10 @@
+kdepim (4:3.5.9-4) unstable; urgency=medium
+
+  * Remove changes on libkmime/libemailfunctions/libkdepim that should have
+    not been pulled. (Closes: #489095)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sun, 06 Jul 2008 14:33:31 +0200
+
 kdepim (4:3.5.9-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:

Modified: trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff	2008-07-05 20:34:54 UTC (rev 11335)
+++ trunk/packages/kdepim/debian/patches/01_kdepim_branch_r825749.diff	2008-07-06 12:41:20 UTC (rev 11336)
@@ -1244,38 +1244,8 @@
  
 Index: libkmime/kmime_util.cpp
 ===================================================================
---- libkmime/kmime_util.cpp.orig	2007-05-14 09:54:33.000000000 +0200
-+++ libkmime/kmime_util.cpp	2008-06-29 20:10:36.000000000 +0200
-@@ -235,6 +235,11 @@
-   return codec->toUnicode(result.data(), result.length());
- }
- 
-+QString decodeRFC2047String(const QCString &src)
-+{
-+  const char *usedCS;
-+  return decodeRFC2047String(src, &usedCS, "utf-8", false);
-+}
- 
- QCString encodeRFC2047String(const QString &src, const char *charset,
- 			     bool addressHeader, bool allow8BitHeaders)
 Index: libkmime/kmime_util.h
 ===================================================================
---- libkmime/kmime_util.h.orig	2005-09-10 10:23:52.000000000 +0200
-+++ libkmime/kmime_util.h	2008-06-29 20:10:36.000000000 +0200
-@@ -77,6 +77,13 @@
-   extern QString decodeRFC2047String(const QCString &src, const char **usedCS,
- 				     const QCString &defaultCS, bool forceCS) KDE_EXPORT;
- 
-+  /** Decode string @p src according to RFC2047 (ie. the
-+      =?charset?[qb]?encoded?= construct).
-+      @param src       source string.
-+      @return the decoded string.
-+  */
-+  extern QString decodeRFC2047String(const QCString &src) KDE_EXPORT;
-+
-   /** Encode string @p src according to RFC2047 using charset
-       @p charset.
-       @param src           source string.
 Index: karm/idletimedetector.cpp
 ===================================================================
 --- karm/idletimedetector.cpp.orig	2007-05-14 09:54:33.000000000 +0200
@@ -8444,94 +8414,12 @@
  	layout->addWidget(mSubRepetition);
 Index: libemailfunctions/tests/testemail.cpp
 ===================================================================
---- libemailfunctions/tests/testemail.cpp.orig	2007-10-08 11:50:45.000000000 +0200
-+++ libemailfunctions/tests/testemail.cpp	2008-06-29 20:10:36.000000000 +0200
-@@ -144,6 +144,13 @@
-   return true;
- }
- 
-+static bool checkNormalizeAddressesAndDecodeIDNs( const QString& input, const QString& expResult )
-+{
-+  QString result = KPIM::normalizeAddressesAndDecodeIDNs( input );
-+  check( "normalizeAddressesAndDecodeIDNs( \"" + input + "\" ) result ", result, expResult );
-+  return true;
-+}
-+
- static bool checkQuoteIfNecessary( const QString& input, const QString& expResult )
- {
-   QString result = quoteNameIfNecessary( input );
-@@ -458,6 +465,10 @@
-   checkNormalizeAddressesAndEncodeIDNs( "matt at fruitsalad.org (jongel,fibbel)", "\"jongel,fibbel\" <matt at fruitsalad.org>" );
-   checkNormalizeAddressesAndEncodeIDNs( "matt at fruitsalad.org (\"jongel,fibbel\")", "\"jongel,fibbel\" <matt at fruitsalad.org>" );
- 
-+  // check checkNormalizeAddressesAndDecodeIDNs
-+  checkNormalizeAddressesAndDecodeIDNs( "=?us-ascii?Q?Surname=2C=20Name?= <nobody at example.org>", "\"Surname, Name\" <nobody at example.org>" );
-+  checkNormalizeAddressesAndDecodeIDNs( "=?iso-8859-1?B?5Hf8b2xmLPZBbmRyZWFz?= <nobody at example.org>", QString::fromUtf8("\"äwüolf,öAndreas\" <nobody at example.org>") );
-+
-   // check the "quote if necessary" method
-   checkQuoteIfNecessary( "Matt Douhan", "Matt Douhan");
-   checkQuoteIfNecessary( "Douhan, Matt", "\"Douhan, Matt\"");
 Index: libemailfunctions/tests/Makefile.am
 ===================================================================
---- libemailfunctions/tests/Makefile.am.orig	2005-09-10 10:24:14.000000000 +0200
-+++ libemailfunctions/tests/Makefile.am	2008-06-29 20:10:36.000000000 +0200
-@@ -1,5 +1,5 @@
- AM_CPPFLAGS = -I$(top_srcdir)/libemailfunctions $(all_includes)
--LDADD = ../libemailfunctions.la $(LIB_KDECORE)
-+LDADD = ../libemailfunctions.la ../../libkmime/libkmime.la $(LIB_KDECORE)
- 
- check_PROGRAMS = testidmapper testemail
- TESTS = testemail
 Index: libemailfunctions/email.cpp
 ===================================================================
---- libemailfunctions/email.cpp.orig	2008-06-29 20:07:35.000000000 +0200
-+++ libemailfunctions/email.cpp	2008-06-29 20:10:36.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <kdebug.h>
- #include <klocale.h>
- #include <kidna.h>
-+#include <kmime_util.h>
- 
- #include <qregexp.h>
- 
-@@ -811,7 +812,7 @@
-   if ( displayName.isEmpty() && comment.isEmpty() )
-     return addrSpec;
-   else if ( comment.isEmpty() )
--    return displayName + " <" + addrSpec + ">";
-+    return quoteNameIfNecessary( displayName ) + " <" + addrSpec + ">";
-   else if ( displayName.isEmpty() ) {
-     QString commentStr = comment;
-     return quoteNameIfNecessary( commentStr ) + " <" + addrSpec + ">";
-@@ -871,6 +872,9 @@
-       if ( KPIM::splitAddress( (*it).utf8(), displayName, addrSpec, comment )
-            == AddressOk ) {
- 
-+        displayName = KMime::decodeRFC2047String(displayName).utf8();
-+        comment = KMime::decodeRFC2047String(comment).utf8();
-+
-         normalizedAddressList <<
-           normalizedAddress( QString::fromUtf8( displayName ),
-                              decodeIDN( QString::fromUtf8( addrSpec ) ),
 Index: libemailfunctions/Makefile.am
 ===================================================================
---- libemailfunctions/Makefile.am.orig	2005-09-10 10:24:14.000000000 +0200
-+++ libemailfunctions/Makefile.am	2008-06-29 20:10:36.000000000 +0200
-@@ -1,4 +1,4 @@
--INCLUDES = $(all_includes)
-+INCLUDES = $(all_includes) -I$(srcdir)/../libkmime/
- 
- noinst_LTLIBRARIES = libemailfunctions.la
- libemailfunctions_la_SOURCES = email.cpp idmapper.cpp kasciistricmp.cpp \
-@@ -7,7 +7,7 @@
- libemailfunctions_la_LDFLAGS = $(all_libraries) -no-undefined
- ## Since this is a noinst library, in case of --enable-closure we need
- ## to link it explicitly to the libraries that it uses.
--libemailfunctions_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
-+libemailfunctions_la_LIBADD = ../libkmime/libkmime.la $(LIB_QT) $(LIB_KDECORE)
- 
- emailfunctionsincludedir = $(includedir)/libemailfunctions
- emailfunctionsinclude_HEADERS = idmapper.h
 Index: korn/KOrn.desktop
 ===================================================================
 --- korn/KOrn.desktop.orig	2007-10-08 11:50:45.000000000 +0200
@@ -9786,16 +9674,6 @@
 +service_DATA = $(DISTRIBUTIONLISTNG_DESKTOPFILE) $(DISTRIBUTIONLIST_DESKTOPFILE)  resourceselection.desktop
 Index: Makefile.am.in
 ===================================================================
---- Makefile.am.in.orig	2007-05-14 09:54:54.000000000 +0200
-+++ Makefile.am.in	2008-06-29 20:10:36.000000000 +0200
-@@ -8,6 +8,7 @@
- # don't change these in Makefile.am, but rather in Makefile.am.in!
- #
- # Libraries and their upwards dependencies
-+COMPILE_AFTER_libkmime = libemailfunctions
- COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
- COMPILE_AFTER_libkholidays = korganizer kontact
- COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange kpilot libkdepim karm knotes kresources kfile-plugins
 Index: libkholidays/holidays/holiday_BelgiumFrench
 ===================================================================
 --- libkholidays/holidays/holiday_BelgiumFrench.orig	2005-10-10 17:02:25.000000000 +0200
@@ -10189,119 +10067,16 @@
  GenericName[lt]=Sinchronizacija
 Index: libkdepim/configure.in.in
 ===================================================================
---- libkdepim/configure.in.in.orig	2008-02-13 10:39:45.000000000 +0100
-+++ libkdepim/configure.in.in	2008-06-29 20:10:36.000000000 +0200
-@@ -1,20 +1,14 @@
- AC_MSG_CHECKING([whether to use new-style distribution lists])
- AC_ARG_ENABLE(newdistrlists,
--[AC_HELP_STRING([--enable-newdistrlists],
--                [Whether to use new distribution lists, to store them like normal contacts; useful for Kolab])],
--[case "${enableval}" in
--        yes)
--                AC_MSG_RESULT([yes])
--                AC_DEFINE(KDEPIM_NEW_DISTRLISTS, 1, [Define to 1 if you want to use the new distribution lists])
--                enable_new_distrlists="yes"
--                ;;
--        no)
--                AC_MSG_RESULT([no])
--                ;;
--        *)
--                AC_MSG_ERROR([bad value ${enableval} for --enable-newdistrlists])
--                ;;
--esac
--], [AC_MSG_RESULT([no])])
-+AC_HELP_STRING([--disable-newdistrlists],
-+                [Disables the new distribution lists (which are saved as addressee in the address book as normal contacts, useful for Kolab)]),
-+                [ enable_new_distrlists=$enableval], [enable_new_distrlists=yes])dnl
-+if test "$enable_new_distrlists" = "yes" ; then
-+  AC_DEFINE_UNQUOTED(KDEPIM_NEW_DISTRLISTS, 1, [Define if you want to use the new distribution lists])
-+  AC_MSG_RESULT(yes)
-+else
-+  AC_MSG_RESULT(no)
-+fi
- 
- AM_CONDITIONAL(compile_newdistrlists, test "x$enable_new_distrlists" = "xyes")
-+
 Index: libkdepim/komposer/plugins/default/defaulteditor.desktop
 ===================================================================
---- libkdepim/komposer/plugins/default/defaulteditor.desktop.orig	2008-02-13 10:39:44.000000000 +0100
-+++ libkdepim/komposer/plugins/default/defaulteditor.desktop	2008-06-29 20:10:36.000000000 +0200
-@@ -39,6 +39,7 @@
- Name[is]=Komposer ritill
- Name[it]=Editor Komposer
- Name[ja]=Komposer エディタ
-+Name[ka]=Komposer რედაქტორი
- Name[kk]=Komposer өңдегіші
- Name[km]=កម្មវិធី​និពន្ធ Komposer
- Name[lt]=Komposer redaktorius
-@@ -84,6 +85,7 @@
- Comment[is]=Sjálfgefinn ritill Komposer
- Comment[it]=Editor di default per Komposer
- Comment[ja]=Komposer 標準エディタ
-+Comment[ka]=Komposer ნაგულისხმევი რედაქტორი
- Comment[kk]=Komposer әдетті өңдегіші
- Comment[km]=កម្មវិធី​និពន្ធ​លំនាំដើម​របស់ Komposer
- Comment[ko]=Komposer 기본 편집기
 Index: libkdepim/komposer/core/komposerplugin.desktop
 ===================================================================
---- libkdepim/komposer/core/komposerplugin.desktop.orig	2008-02-13 10:39:45.000000000 +0100
-+++ libkdepim/komposer/core/komposerplugin.desktop	2008-06-29 20:10:36.000000000 +0200
-@@ -29,6 +29,7 @@
- Name[is]=Komposer íforrit
- Name[it]=Plugin Komposer
- Name[ja]=Komposer プラグイン
-+Name[ka]=Komposer მოდული
- Name[kk]=Komposer плагин модулі
- Name[km]=កម្មវិធី​ជំនួយ Komposer
- Name[ko]=Komposer 플러그인
 Index: libkdepim/komposer/core/komposerconfig.desktop
 ===================================================================
---- libkdepim/komposer/core/komposerconfig.desktop.orig	2007-05-14 09:54:47.000000000 +0200
-+++ libkdepim/komposer/core/komposerconfig.desktop	2008-06-29 20:10:36.000000000 +0200
-@@ -28,6 +28,7 @@
- Comment[fr]=Komposer KDE
- Comment[ga]=Komposer KDE
- Comment[hi]=केडीई कम्पोज़र
-+Comment[ka]=KDE კომპოზიტორი
- Comment[ms]=Penggubah KDE
- Comment[nds]=Nettbreef-Editor vun KDE
- Comment[ne]=केडीई कम्पोजर
-@@ -46,6 +47,7 @@
- Keywords[de]=Komposer
- Keywords[fy]=komposer,opstellen, opsteller
- Keywords[hi]=कम्पोज़र
-+Keywords[ka]=komposer,ნოტები
- Keywords[nds]=Komposer
- Keywords[ne]=कम्पोजर
- Keywords[nl]=komposer,opstellen
 Index: libkdepim/komposer/core/komposereditor.desktop
 ===================================================================
---- libkdepim/komposer/core/komposereditor.desktop.orig	2008-02-13 10:39:45.000000000 +0100
-+++ libkdepim/komposer/core/komposereditor.desktop	2008-06-29 20:10:36.000000000 +0200
-@@ -27,6 +27,7 @@
- Comment[is]=Komposer ritill
- Comment[it]=Komposer editor
- Comment[ja]=Komposer,エディタ
-+Comment[ka]=Komposer-ის რედაქტორი
- Comment[kk]=Komposer өңдегіші
- Comment[km]=កម្មវិធី​និពន្ធ Komposer
- Comment[ko]=Komposer 편집기
 Index: libkdepim/addresseelineedit.cpp
 ===================================================================
---- libkdepim/addresseelineedit.cpp.orig	2008-02-13 10:39:45.000000000 +0100
-+++ libkdepim/addresseelineedit.cpp	2008-06-29 20:10:36.000000000 +0200
-@@ -539,9 +539,8 @@
-       int weight = config.readNumEntry( resource->identifier(), 60 );
-       s_completionSources->append( resource->resourceName() );
-       KABC::Resource::Iterator it;
--      if ( resource->type() != "ldapkio" )
--        for ( it = resource->begin(); it != resource->end(); ++it )
--          addContact( *it, weight, s_completionSources->size()-1 );
-+      for ( it = resource->begin(); it != resource->end(); ++it )
-+        addContact( *it, weight, s_completionSources->size()-1 );
-     }
-   }
- 
 Index: libkcal/resourcelocaldir.cpp
 ===================================================================
 --- libkcal/resourcelocaldir.cpp.orig	2008-02-13 10:39:51.000000000 +0100




More information about the pkg-kde-commits mailing list