[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.7-3-11-g7a70ba4
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Fri Mar 25 02:47:09 UTC 2011
The following commit has been merged in the master branch:
commit ac57bd616c893d47377adf6411bd03d026b5e4bd
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Thu Mar 3 00:53:09 2011 +0100
Delete backport_dont_crash_when_adding_feed.diff, no longer needed.
---
.../backport_dont_crash_when_adding_feed.diff | 21 --------------------
debian/patches/series | 1 -
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/debian/patches/backport_dont_crash_when_adding_feed.diff b/debian/patches/backport_dont_crash_when_adding_feed.diff
deleted file mode 100644
index f58ccc6..0000000
--- a/debian/patches/backport_dont_crash_when_adding_feed.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Christophe Giboudeaux <cgiboudeaux at gmail.com>
-Subject: Make sure that the archive exists before calling markAsFetchNow.
-Origin: backport http://websvn.kde.org/?revision=1208110&view=revision
-Bug: https://bugs.kde.org/show_bug.cgi?id=254323
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605094
-Forwarded: yes
-Applied-Upstream: 4.4.9
-Last-Update: 2011-01-20
-
-Patch by Guy Shapiro. Thank you.
-
---- a/akregator/src/feed.cpp
-+++ b/akregator/src/feed.cpp
-@@ -682,6 +682,7 @@ void Feed::fetchCompleted(Syndication::L
-
- void Feed::markAsFetchedNow()
- {
-+ if ( d->archive )
- d->archive->setLastFetch( QDateTime::currentDateTime().toTime_t());
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index d8ea8ae..1f95bc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-backport_dont_crash_when_adding_feed.diff
30_debianize_akregator_default.diff
--
KDE PIM module packaging
More information about the pkg-kde-commits
mailing list