[SCM] KDE SDK module packaging branch, master, updated. debian/4.7.4-1-6-g75ed5a7
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Wed Dec 28 21:43:26 UTC 2011
The following commit has been merged in the master branch:
commit dc41f7d4c088ec557bbeb7f6fea719e26948dcd0
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Wed Dec 28 22:22:21 2011 +0100
Add default-jre-headless to Build-Depends.
---
debian/changelog | 5 +++++
debian/control | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59faa7e..9085460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
kdesdk (4:4.7.4-2) UNRELEASED; urgency=low
+ * Add default-jre-headless to Build-Depends, thus we make sure that antlr
+ will use the latest gcj (4.6 today) when building with sbuild configured to
+ use the aptitude based resolver. Right now, this avoids an FTBFS on
+ kfreebsd-amd64; this FTBFS happens because of gcj 4.4, which segfaults when
+ executing antlr.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 28 Dec 2011 22:13:03 +0100
diff --git a/debian/control b/debian/control
index 9e2792e..c600b54 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
kdepimlibs5-dev (>= 4:4.7), libphonon-dev (>= 4:4.3.1),
libsvn-dev, libstreamanalyzer-dev (>= 0.6.3), libxslt1-dev, libboost-dev,
binutils-dev, libhunspell-dev, libltdl-dev, libx11-dev, x11proto-core-dev,
- shared-mime-info (>= 0.30), libkonq5-dev (>= 4:4.7), libantlr-dev, antlr,
+ shared-mime-info (>= 0.30), libkonq5-dev (>= 4:4.7),
+ libantlr-dev, antlr, default-jre-headless,
libqca2-dev
Standards-Version: 3.9.2
Homepage: http://www.kde.org
--
KDE SDK module packaging
More information about the pkg-kde-commits
mailing list