[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.4.5-2-56-g29da923

Modestas Vainius modax at alioth.debian.org
Tue Mar 29 07:53:54 UTC 2011


The following commit has been merged in the master branch:
commit fb20613bd00dd0babeba57a45ffc757561c1b0de
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Mar 29 10:45:52 2011 +0300

    Add libkonq5a to libkonq-common breaks/conflicts.
    
    qt-kde.debian.net only. To be removed half a year later after first 4.6.x
    upload.
---
 debian/TODO.source |    2 ++
 debian/changelog   |    1 +
 debian/control     |    4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/TODO.source b/debian/TODO.source
new file mode 100644
index 0000000..477acff
--- /dev/null
+++ b/debian/TODO.source
@@ -0,0 +1,2 @@
+libkonq5a breaks/replaces are qt-kde.debian.net (KDE 4.5.1) only. Can be
+removed half a year later (after the first 4.6.x upload).
diff --git a/debian/changelog b/debian/changelog
index 87c8a4e..66492f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -56,6 +56,7 @@ kdebase (4:4.6.1-0r3) UNRELEASED; urgency=low
   * Remove redudant links to common-licenses/BSD. Verbatim text was already
     there.
   * Override all libkonsoleprivate.so shlibs related lintian reports.
+  * Add libkonq5a to libkonq-common breaks/conflicts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Mar 2011 04:07:06 +0300
 
diff --git a/debian/control b/debian/control
index b130bca..b4d1c92 100644
--- a/debian/control
+++ b/debian/control
@@ -180,8 +180,8 @@ Package: libkonq-common
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq5-templates
-Replaces: libkonq5 (<< 4:4.4.5-3)
-Breaks: libkonq5 (<< 4:4.4.5-3)
+Replaces: libkonq5 (<< 4:4.4.5-3), libkonq5a
+Breaks: libkonq5 (<< 4:4.4.5-3), libkonq5a
 Description: core Konqueror library - support files
  This package contains plugins and data files used by the core Konqueror
  library (libkonq).

-- 
KDE Base Applications module packaging



More information about the pkg-kde-commits mailing list