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

[Christopher Martin]

Author: chrsmrtn
Date: 2006-09-30 16:43:41 +0000 (Sat, 30 Sep 2006)
New Revision: 4570

Removed:
   trunk/packages/kdepim/debian/patches/01_kdepim_branch_r577416.diff
Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff
   trunk/packages/kdepim/debian/rules
Log:
Alright, kdepim is updated but NOT ready for upload.

Nope, we need to figure out WTF to do with the d-imap
problem before this upload, which will have to make
Etch.


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2006-09-30 16:42:13 UTC (rev 4569)
+++ trunk/packages/kdepim/debian/changelog	2006-09-30 16:43:41 UTC (rev 4570)
@@ -1,5 +1,7 @@
-kdepim (4:3.5.4-2) UNRELEASED; urgency=low
+kdepim (4:3.5.5-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Christopher Martin:
 
   * Improve konsolekalendar's description. (Closes: #384941)
@@ -7,11 +9,30 @@
   * Add alpha and ppc64 to the problematic arch list, thus disabling
     --enable-final and allowing kdepim to build. (Closes: #387419, #388014)
 
-  * Rebuild against new libpisock9.
-
   * Add Romanian debconf translation, thanks to Stan Ioan-Eugen.
     (Closes: #387589)
 
+  !!! TODO: !!!
+
+  * Drop the d-imap debugging patch. It still isn't clear that the d-imap
+    dataloss problem is fixed.
+
+  * Since d-imap still seems to cause data loss, disable d-imap support by
+    preventing the addition of new d-imap accounts from the GUI. [This isn't
+    good enough, though. Need better way for current users.]
+
+  !!! OR: !!!
+
+  * Modify the kdepim d-imap debugging patch to be less verbose and intrusive,
+    but keep the rest of the patch with its safer file handling. No reports
+    of d-imap data loss have surfaced with the recent code. Do we dare to
+    close the bugs and keep d-imap in Etch?
+
+  !!! EITHER WAY: !!!
+
+  * Write kmail.README.Debian explaining that d-imap is dodgy. Maybe even a
+    NEWS entry.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Aug 2006 17:54:23 -0400
 
 kdepim (4:3.5.4-1) unstable; urgency=low

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2006-09-30 16:42:13 UTC (rev 4569)
+++ trunk/packages/kdepim/debian/control	2006-09-30 16:43:41 UTC (rev 4570)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), automake1.9,
- cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.4), bison, byacc, bzip2,
+ cdparanoia, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), bison, byacc, bzip2,
  flex, groff-base, libbluetooth2-dev, libboost-dev (>= 1.33.1), libgnokii3-dev,
  libgpgme11-dev, liblockdev1-dev, libmal-dev, libpisock-dev, libreadline5-dev,
  libsasl2-dev, libssl-dev, libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils,
@@ -485,7 +485,7 @@
 Package: libkdepim1-dev
 Section: libdevel
 Architecture: any
-Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.4)
+Depends: libkdepim1a (= ${Source-Version}), kdelibs4-dev (>= 4:3.5.5)
 Replaces: kdepim-dev (<< 4:3.4.1)
 Description: KDE PIM library [development]
  This is the development package which contains the headers for the libkdepim

Deleted: trunk/packages/kdepim/debian/patches/01_kdepim_branch_r577416.diff

Modified: trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff	2006-09-30 16:42:13 UTC (rev 4569)
+++ trunk/packages/kdepim/debian/patches/15_kdepim_debug.diff	2006-09-30 16:43:41 UTC (rev 4570)
@@ -4,7 +4,7 @@
  #include <globalsettings.h>
  
  #define UIDCACHE_VERSION 1
-+#define MAIL_LOSS_DEBUGGING 1
++#define MAIL_LOSS_DEBUGGING 0
  
  static QString incidencesForToString( KMFolderCachedImap::IncidencesFor r ) {
    switch (r) {

Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules	2006-09-30 16:42:13 UTC (rev 4569)
+++ trunk/packages/kdepim/debian/rules	2006-09-30 16:43:41 UTC (rev 4570)
@@ -38,7 +38,7 @@
 
 DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
 
-shlibs_ver=4:3.5.4
+shlibs_ver=4:3.5.5
 DEB_DH_MAKESHLIBS_ARGS_libindex0 := -V'libindex0 (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkcal2b := -V'libkcal2b (>= $(shlibs_ver))'
 DEB_DH_MAKESHLIBS_ARGS_libkdenetwork2 := -V'libkdenetwork2 (>= $(shlibs_ver))'