rev 12668 - in branches/kde4-backports/packages/kdepim/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Mon Nov 17 20:33:46 UTC 2008 

Author: ana
Date: 2008-11-17 20:33:45 +0000 (Mon, 17 Nov 2008)
New Revision: 12668

Added:
   branches/kde4-backports/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff
Modified:
   branches/kde4-backports/packages/kdepim/debian/akonadi-kde.install
   branches/kde4-backports/packages/kdepim/debian/changelog
   branches/kde4-backports/packages/kdepim/debian/control
   branches/kde4-backports/packages/kdepim/debian/kmail.install
   branches/kde4-backports/packages/kdepim/debian/libkdepim4.install
   branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
   branches/kde4-backports/packages/kdepim/debian/patches/series
Log:
kdepim 4.1.3 backports


Modified: branches/kde4-backports/packages/kdepim/debian/akonadi-kde.install
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/akonadi-kde.install	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/akonadi-kde.install	2008-11-17 20:33:45 UTC (rev 12668)
@@ -11,7 +11,6 @@
 usr/bin/akonadi_nntp_resource
 usr/bin/akonadi_strigi_feeder
 usr/bin/akonadi_vcard_resource
-usr/bin/akonadiconsole
 usr/bin/akonaditray
 usr/lib/kde4/akonadi_serializer_addressee.so
 usr/lib/kde4/akonadi_serializer_bookmark.so
@@ -40,14 +39,12 @@
 usr/share/akonadi/agents/nntpresource.desktop
 usr/share/akonadi/agents/strigifeeder.desktop
 usr/share/akonadi/agents/vcardresource.desktop
-usr/share/applications/kde4/akonadiconsole.desktop
 usr/share/applications/kde4/akonaditray.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
 usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 # usr/share/kde4/apps/akonadi/plugins/serializer/akonadi_serializer_sms.desktop
-usr/share/kde4/apps/akonadiconsole/akonadiconsoleui.rc
 usr/share/kde4/apps/nepomuk/ontologies/nco.desktop
 usr/share/kde4/apps/nepomuk/ontologies/nco.trig
 usr/share/kde4/apps/nepomuk/ontologies/nmo.desktop
@@ -56,3 +53,4 @@
 usr/share/kde4/services/kcm_akonadi_resources.desktop
 usr/share/kde4/services/kresources/kabc/akonadi.desktop
 usr/share/kde4/services/kresources/kcal/akonadi.desktop
+usr/lib/kde4/kio_akonadi.so

Modified: branches/kde4-backports/packages/kdepim/debian/changelog
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/changelog	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/changelog	2008-11-17 20:33:45 UTC (rev 12668)
@@ -1,9 +1,26 @@
-kdepim (4:4.1.2-1~lenny+1) lenny; urgency=low
+kdepim (4:4.1.3-2~lenny+1) lenny; urgency=low
 
   * Backport for Lenny.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Tue, 07 Oct 2008 18:35:21 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 17 Nov 2008 21:19:17 +0100
 
+kdepim (4:4.1.3-2) experimental; urgency=low
+
+  * Add patch to avoid imap duplication. Pushed out to kde-packagers
+
+ -- Sune Vuorela <debian at pusling.com>  Thu, 06 Nov 2008 07:46:06 +0100
+
+kdepim (4:4.1.3-1) experimental; urgency=low
+
+  * New upstream
+    - bump b-d
+    - refresh patches
+  * Shuffle around akonadi-files as pr upstream instructions
+    - akonadiconsole currently put in kmail - but that should maybe be
+      revisited.
+
+ -- Sune Vuorela <debian at pusling.com>  Sat, 01 Nov 2008 17:44:00 +0100
+
 kdepim (4:4.1.2-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4-backports/packages/kdepim/debian/control
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/control	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/control	2008-11-17 20:33:45 UTC (rev 12668)
@@ -5,7 +5,7 @@
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <trigger+debian at space-based.de>, Matthew Rosewarne <mrosewarne at inoutbox.com>, Modestas Vainius <modestas at vainius.eu>
 Build-Depends: cdbs, debhelper (>= 6), cmake (>= 2.6.0), quilt,
- kdelibs5-dev (>= 4:4.1.0), kdepimlibs5-dev (>= 4:4.1.0),
+ kdelibs5-dev (>= 4:4.1.3), kdepimlibs5-dev (>= 4:4.1.3),
  libphonon-dev (>= 4:4.2.0), 
  libgpgme11-dev, libboost-dev, libboost-graph-dev, libsasl2-dev,
  xsltproc, libgnokii3-dev, libxss-dev, libqca2-dev (>= 2.0.0),
@@ -61,6 +61,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs:Depends}
+Replaces: libkdepim4 (<< 4:4.1.3)
 Homepage: http://pim.kde.org/akonadi/
 Description: akonadi resources for KDE
  This package contains the akonadi resources and connectors for KDE.
@@ -178,7 +179,7 @@
 Depends: ${shlibs:Depends}, ${perl:Depends}
 Recommends: procmail
 Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook, kleopatra, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer
-Replaces: kmailcvt (<< 4:3.90.0)
+Replaces: kmailcvt (<< 4:3.90.0), akonadi-kde (<< 4:4.1.3)
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: KDE Email client

Modified: branches/kde4-backports/packages/kdepim/debian/kmail.install
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/kmail.install	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/kmail.install	2008-11-17 20:33:45 UTC (rev 12668)
@@ -116,3 +116,6 @@
 usr/share/icons/oxygen/48x48/status/mail-tagged.png
 usr/share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
 usr/share/icons/oxygen/scalable/status/mail-tagged.svgz
+usr/bin/akonadiconsole
+usr/share/applications/kde4/akonadiconsole.desktop
+usr/share/kde4/apps/akonadiconsole/akonadiconsoleui.rc

Modified: branches/kde4-backports/packages/kdepim/debian/libkdepim4.install
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/libkdepim4.install	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/libkdepim4.install	2008-11-17 20:33:45 UTC (rev 12668)
@@ -1,4 +1,3 @@
-usr/lib/kde4/kio_akonadi.so
 usr/lib/kde4/kio_scalix.so
 usr/lib/kde4/kpartsdesignerplugin.so
 usr/lib/libkcal_resourceremote.so.4

Copied: branches/kde4-backports/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff (from rev 12638, branches/kde4/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff)
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff	                        (rev 0)
+++ branches/kde4-backports/packages/kdepim/debian/patches/01_branch_imap_duplication_fix.diff	2008-11-17 20:33:45 UTC (rev 12668)
@@ -0,0 +1,10 @@
+--- a/kmail/kmfoldermaildir.cpp
++++ b/kmail/kmfoldermaildir.cpp
+@@ -717,6 +717,7 @@
+       dateStr = dateStr.trimmed();
+       if (!dateStr.isEmpty())
+         mi->setDate(dateStr.constData());
++	uidStr = uidStr.trimmed();
+       if ( !uidStr.isEmpty() )
+          mi->setUID( uidStr.toULong() );
+       mi->setDirty(false);

Modified: branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2008-11-17 20:33:45 UTC (rev 12668)
@@ -1,6 +1,6 @@
 --- a/akregator/src/akregator_part.cpp
 +++ b/akregator/src/akregator_part.cpp
-@@ -344,6 +344,20 @@
+@@ -345,6 +345,20 @@
      look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf");
      mainFolder.appendChild(look);
  

Modified: branches/kde4-backports/packages/kdepim/debian/patches/series
===================================================================
--- branches/kde4-backports/packages/kdepim/debian/patches/series	2008-11-17 20:31:48 UTC (rev 12667)
+++ branches/kde4-backports/packages/kdepim/debian/patches/series	2008-11-17 20:33:45 UTC (rev 12668)
@@ -1,2 +1,3 @@
+01_branch_imap_duplication_fix.diff
 30_debianize_akregator_default.diff
 97_fix_target_link_libraries.diff

More information about the pkg-kde-commits mailing list