This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 85658793393611d5086535d89f6fc4838e1dc0de
Author: Rene Engelhard <r...@debian.org>
Date: Wed May 14 22:33:24 2014 +0200
add a rm -f -core//librpt* if ENABLE_REPORTDESIGN=n and make -core conflict
against -report-builder-bin for kfreebsd-i386 kfreebsd-amd64
---
changelog | 7 +++++++
control | 7 +++++--
control.in | 2 +-
rules | 1 +
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 913d6d7..ba84fd6 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,13 @@ libreoffice (1:4.2.4-3) UNRELEASED; urgency=low
from master: don't use hardcoded filelist for SDK Javadocs (fixes build
with
OpenJDK8) (closes: #748046)
+ * debian/rules:
+ - add a rm -f $(PKGDIR)-core/$(OODIR)/librpt* if ENABLE_REPORTDESIGN=n. I
can't
+ reproduce the error here when setting the build to gcj but hopefully this
+ (closes: #748075)
+ * debian/control.in:
+ - make -core conflict against -report-builder-bin for kfreebsd-i386
kfreebsd-amd64
+
-- Rene Engelhard <r...@debian.org> Tue, 13 May 2014 19:19:07 +0200
libreoffice (1:4.2.4-2) unstable; urgency=low
diff --git a/control b/control
index bf47862..d966e9a 100644
--- a/control
+++ b/control
@@ -184,7 +184,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -407,7 +407,10 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5)
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+Conflicts: cacao-oj6-jre,
+ libreoffice-filter-binfilter,
+ libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64],
+ libreoffice-unbundled
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
libreoffice-common (<= 1:4.0.0~beta2-1),
diff --git a/control.in b/control.in
index f5eae37..8b66739 100644
--- a/control.in
+++ b/control.in
@@ -252,7 +252,7 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5)
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled,
libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
libreoffice-common (<= 1:4.0.0~beta2-1),
diff --git a/rules b/rules
index 7291b45..ec6a9bf 100755
--- a/rules
+++ b/rules
@@ -2620,6 +2620,7 @@ ifneq "$(ENABLE_REPORTDESIGN)" "y"
# (and we need to remove it here anyway as it otherwise would end up
# in -base)
rm -rf $(PKGDIR)-report-builder
+ rm -f $(PKGDIR)-core/$(OODIR)/librpt*
else
ifeq "$(PACKAGE_BASE)" "y"
# move rpt stuff into -report-builder-bin
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wkuir-0001oy...@moszumanska.debian.org
