[SCM] KOffice packaging branch, master, updated. debian/2.3.3-2-6-g1026e8a

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/koffice.git;a=commitdiff;h=1026e8a

The following commit has been merged in the master branch:
commit 1026e8addd7cdd162840a3c5fc41265162c06bea
Author: Pino Toscano <pino at debian.org>
Date:   Sat Mar 31 01:32:33 2012 +0200

    koffice-dbg: make the kdebase-runtime-dbg dependency an alternative with kde-runtime-dbg
    
    ... giving priority to the latter
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 428659f..826ab39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ koffice (1:2.3.3-3) UNRELEASED; urgency=low
   * Switch the libpng12-dev build dependency to libpng-dev. (Closes: #662390)
   * Fix building with glib 2.32, by including only <glib.h> instead of
     individual headers; patch 30_glib_includes. (Closes: #665564)
+  * koffice-dbg: make the kdebase-runtime-dbg dependency an alternative with
+    kde-runtime-dbg, giving priority to the latter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2011 12:15:57 +0200
 
diff --git a/debian/control b/debian/control
index 58b5e07..5d4f467 100644
--- a/debian/control
+++ b/debian/control
@@ -375,7 +375,7 @@ Package: koffice-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: koffice-libs (= ${binary:Version}), kdebase-runtime-dbg
+Depends: koffice-libs (= ${binary:Version}), kde-runtime-dbg | kdebase-runtime-dbg
 Description: debugging symbols for KOffice
  This package contains the debugging symbols associated with KOffice.
  They will automatically be used by gdb for debugging koffice-related

-- 
KOffice packaging