[SCM] KOffice packaging branch, master, updated. debian/2.3.0-1-2-g6d3fd82

[Pino Toscano]

The following commit has been merged in the master branch:
commit 6d3fd82a6b2f224685344d4870897ea5788b125d
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 30 18:44:34 2011 +0100

    Explicitly build depend on libpoppler-dev
    
    ... so we do not rely on the implicit dependency of libpoppler-qt4-dev.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d761064..3b4ed5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 koffice (1:2.3.0-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Explicitly build depend on libpoppler-dev (needed by karbon), to not rely
+    on the implicit dependency of libpoppler-qt4-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 30 Jan 2011 18:39:27 +0100
 
diff --git a/debian/control b/debian/control
index 83444a9..73adc3b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cdbs, debhelper (>= 7), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
  libqimageblitz-dev, libqca2-dev, libglew1.5-dev,
  libexiv2-dev, libpng12-dev, liblcms1-dev, libtiff4-dev, libjpeg62-dev,
  libgif-dev, libopenjpeg-dev,
- libwv2-dev (>= 0.4.1), libmysqlclient-dev, libpoppler-qt4-dev, 
+ libwv2-dev (>= 0.4.1), libmysqlclient-dev, libpoppler-dev, libpoppler-qt4-dev,
  libgsl0-dev, libwpd8-dev, libwpg-dev,
  libxslt1-dev, libqt4-opengl-dev (>= 4.5.0), 
  pstoedit, libgmm++-dev, libfftw3-dev,

-- 
KOffice packaging