The following commit has been merged in the master branch:
commit 70a4fa5679cef488ae162667503870d4585c87f4
Author: Rene Engelhard <r...@debian.org>
Date: Tue Oct 4 01:10:03 2011 +0200
use internal jfreereport on squeeze-backports
diff --git a/changelog b/changelog
index 4e6a3cb..c2f0c34 100644
--- a/changelog
+++ b/changelog
@@ -7,12 +7,13 @@ libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
- use jh_classpath instead of manual MANIFEST.MF hacking for jurt.jar
- build-depend on libpoppler-cpp-dev
- fix libsslX.Y.Z in -dbgs suggests for multiarch
+ - use internal jfreereport on squeeze-backports
* merge from ubuntu-oneiric-3.4:
- hard hack to make upload happy: Pre-Depends on xz-capable dpkg
for -dbg
- -- Rene Engelhard <r...@debian.org> Fri, 30 Sep 2011 03:15:57 +0200
+ -- Rene Engelhard <r...@debian.org> Tue, 04 Oct 2011 01:09:24 +0200
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/rules b/rules
index 701f044..88643a4 100755
--- a/rules
+++ b/rules
@@ -446,7 +446,7 @@ endif
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backpo...@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat
graphite, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat
graphite jfreereport, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
PARALLEL_BUILD=n
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rbmya-0002n5...@vasks.debian.org
