rev 17462 - kde-extras/kmymoney2/trunk/debian

[Fathi Boudra]

Author: fabo
Date: 2010-03-18 17:50:00 +0000 (Thu, 18 Mar 2010)
New Revision: 17462

Modified:
   kde-extras/kmymoney2/trunk/debian/changelog
   kde-extras/kmymoney2/trunk/debian/control
Log:
Merge aqbanking plugin. Conflicts/Replaces as appropriate.(Closes: #574390)


Modified: kde-extras/kmymoney2/trunk/debian/changelog
===================================================================
--- kde-extras/kmymoney2/trunk/debian/changelog	2010-03-18 17:45:42 UTC (rev 17461)
+++ kde-extras/kmymoney2/trunk/debian/changelog	2010-03-18 17:50:00 UTC (rev 17462)
@@ -1,4 +1,4 @@
-kmymoney (3.96.1-1) unstable; urgency=low
+kmymoney (3.96.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -12,6 +12,8 @@
     - Bump build dependencies versions (debhelper, libaqbanking29-dev).
     - Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
     - Conflicts/Replaces against version 3.96.0-1. (Closes: #573488, #573475)
+    - Merge aqbanking plugin. Conflicts/Replaces as appropriate.
+      (Closes: #574390)
   * Update debian/rules:
     - Enable parallel buildd (pass --parallel option to dh).
     - List missing files (pass --list-missing option to dh).

Modified: kde-extras/kmymoney2/trunk/debian/control
===================================================================
--- kde-extras/kmymoney2/trunk/debian/control	2010-03-18 17:45:42 UTC (rev 17461)
+++ kde-extras/kmymoney2/trunk/debian/control	2010-03-18 17:50:00 UTC (rev 17462)
@@ -16,9 +16,8 @@
 Package: kmymoney
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kmymoney-common (= ${source:Version})
-Replaces: kmymoney2 (<< 3.96.0-1)
-Conflicts: kmymoney2 (<< 3.96.0-1)
-Breaks: kmymoney2-plugin-aqbanking (<= 1.0-1)
+Replaces: kmymoney2 (<< 3.96.0-1), kmymoney2-plugin-aqbanking (<= 1.0-1)
+Conflicts: kmymoney2 (<< 3.96.0-1), kmymoney2-plugin-aqbanking (<= 1.0-1)
 Description: personal finance manager for KDE
  KMyMoney is the Personal Finance Manager for KDE. It operates similar to
  MS-Money and Quicken, supports different account types, categorisation of