[SCM] KOffice packaging branch, master, updated. debian/2.3.1-1-3-ge170b6c

Ana Beatriz Guerrero López ana at alioth.debian.org
Mon Jan 31 21:42:49 UTC 2011


The following commit has been merged in the master branch:
commit e170b6c4c99f47029fdf98e4c63393863b06517b
Merge: 7fc47561a9112d0c8b3e93cba572c4f7b0b2a6bf 6d3fd82a6b2f224685344d4870897ea5788b125d
Author: Ana Beatriz Guerrero López <ana at ekaia.org>
Date:   Mon Jan 31 22:42:10 2011 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-kde/kde-std/koffice
    
    merge changes from pino, I think.
    Conflicts:
    	debian/changelog

 debian/changelog |    4 ++++
 debian/control   |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --cc debian/changelog
index 02a8a6c,3b4ed5f..aca263d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,13 @@@
 -koffice (1:2.3.0-2) UNRELEASED; urgency=low
 +koffice (1:2.3.1-1) experimental; urgency=low
 +
 +  * New upstream release.
 +  * Update installed files in krita.
  
+   [ 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
 + -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 31 Jan 2011 22:26:28 +0100
  
  koffice (1:2.3.0-1) experimental; urgency=low
  

-- 
KOffice packaging



More information about the pkg-kde-commits mailing list