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

[Modestas Vainius]

Author: modax
Date: 2010-02-27 20:24:24 +0000 (Sat, 27 Feb 2010)
New Revision: 17192

Removed:
   trunk/packages/kdepim/debian/patches/01_slox_fix.diff
   trunk/packages/kdepim/debian/patches/97_fix_target_link_libraries.diff
Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
   trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
   trunk/packages/kdepim/debian/patches/series
Log:
* Drop 01_slot_fix.diff patch, taken from upstream.
* Add DEP-3 headers to the 30_debianize_akregator_default.diff patch.
* Add shared-desktop-ontologies to Build-Depends.

Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2010-02-27 20:02:27 UTC (rev 17191)
+++ trunk/packages/kdepim/debian/changelog	2010-02-27 20:24:24 UTC (rev 17192)
@@ -1,4 +1,4 @@
-kdepim (4:4.4.1-0) UNRELEASED; urgency=low
+kdepim (4:4.4.1-0r1) UNRELEASED; urgency=low
 
   * New upstream release:
     - KMail no longer corrupts single attachment of multipart emails generated
@@ -32,6 +32,9 @@
   * Bump pkg-kde-tools build dependency to 0.6.4.
   * Drop libknotificationitem-1-dev from Build-Depends: no longer needed.
   * Bump akonadi build dependency to 1.3.0.
+  * Drop 01_slot_fix.diff patch, taken from upstream.
+  * Add DEP-3 headers to the 30_debianize_akregator_default.diff patch.
+  * Add shared-desktop-ontologies to Build-Depends.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2010 02:21:11 +0100
 

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2010-02-27 20:02:27 UTC (rev 17191)
+++ trunk/packages/kdepim/debian/control	2010-02-27 20:24:24 UTC (rev 17192)
@@ -12,7 +12,7 @@
  xsltproc, libgnokii-dev, libxss-dev, libqca2-dev (>= 2.0.0), libassuan-dev,
  libstreams-dev (>= 0.6.3), libstreamanalyzer-dev (>= 0.6.3), libsearchclient-dev (>= 0.6.3),
  libstrigihtmlgui-dev (>= 0.6.3), libstrigiqtdbusclient-dev (>= 0.6.3), zlib1g-dev,
- libakonadi-dev (>= 1.3.0), libpisock-dev
+ libakonadi-dev (>= 1.3.0), libpisock-dev, shared-desktop-ontologies (>= 0.2)
 Standards-Version: 3.8.4
 Homepage: http://pim.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdepim/#_trunk_packages_kdepim_

Modified: trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2010-02-27 20:02:27 UTC (rev 17191)
+++ trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2010-02-27 20:24:24 UTC (rev 17192)
@@ -1,3 +1,9 @@
+Author: Ana Beatriz Guerrero Lopez <ana at debian.org>
+Description: add a few Debian feeds to akregator
+ Include planet debian and debian times as default in akregator
+Forwarded: not-needed
+Origin: vendor
+
 --- a/akregator/src/akregator_part.cpp
 +++ b/akregator/src/akregator_part.cpp
 @@ -133,6 +133,20 @@ namespace {

Modified: trunk/packages/kdepim/debian/patches/series
===================================================================
--- trunk/packages/kdepim/debian/patches/series	2010-02-27 20:02:27 UTC (rev 17191)
+++ trunk/packages/kdepim/debian/patches/series	2010-02-27 20:24:24 UTC (rev 17192)
@@ -1,2 +1 @@
-01_slox_fix.diff
 30_debianize_akregator_default.diff