[SCM] Calligra suite packaging branch, experimental, updated. debian/2.7.5-1-16-g0d05992
Adrien Grellier
adrien-guest at moszumanska.debian.org
Sat Dec 28 17:40:13 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=cabea95
The following commit has been merged in the experimental branch:
commit cabea95c6a0dbbcfb00455144692fafc8e0fbd6e
Merge: 7e59d54d32082e36ff490cc8aa473e5367824b3b 5a93d8113a91ed584728396aedf6e9eeaa4aa963
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu Dec 12 19:43:12 2013 +0100
Merge branch 'master' of git://git.debian.org/pkg-kde/kde-std/calligra
Conflicts:
debian/changelog
debian/patches/series
debian/calligra-libs.install | 2 ++
debian/calligraplan.install | 2 --
debian/changelog | 9 +++++++++
debian/patches/kexidb-relax_pqxx_version.patch | 13 +++++++++++++
debian/patches/series | 2 +-
5 files changed, 25 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 5bf549a,5c81f85..fbdfab9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,13 @@@
-calligra (1:2.7.5-0r1) UNRELEASED; urgency=low
++calligra (1:2.7.5-1r1) UNRELEASED; urgency=low
++
++ [ Raúl Sánchez Siles ]
++ * Move libcalligrakdgantt to calligra-libs from calligraplan.
++ * Added kexidb-relax_pqxx_version.patch to make pqxx driver build with
++ libpqxx >= 0.4
++
++ -- Adrien Grellier <perso at adrieng.fr> Sat, 27 Jul 2013 17:54:00 +0200
++
+calligra (1:2.7.5-1) unstable; urgency=low
* New upstream release.
- A new component appears: calligraactive
diff --cc debian/patches/series
index 7c0248a,af52a10..e259991
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,2 +1,3 @@@
add_keywords_to_desktop_files.patch
+eigen3.patch
- pqxx_4_support.diff
+ kexidb-relax_pqxx_version.patch
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list