[libreoffice] 05/06: move report-builder-bin move also to install-common
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit d3c8902ca9875e9bb220746450ba46a7c1de907a
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 29 17:04:58 2014 +0200
move report-builder-bin move also to install-common
---
changelog | 7 ++++---
rules | 40 ++++++++++++++++++++--------------------
2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/changelog b/changelog
index f5210df..0f41299 100644
--- a/changelog
+++ b/changelog
@@ -19,10 +19,11 @@ libreoffice (1:4.2.4-4) unstable; urgency=medium
Remove (now) unneeded manual hack
- cleanup python build-deps: PYTHON_FOR_BUILD is python3 in "standard"
builds, so build-depend on that (and on python only when we build python2)
- - move gengal move to -dev to install-common (fix debuild -A _all package
- difference); also remove -wiki-publishers LICENSE in install-indep
+ - fix install targets for debuild -A:
+ + move gengal and librpt* move to install-common
+ + remove -wiki-publishers LICENSE in install-indep
- -- Rene Engelhard <rene@debian.org> Thu, 29 May 2014 15:51:32 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 29 May 2014 16:05:39 +0200
libreoffice (1:4.2.4-3) unstable; urgency=low
diff --git a/rules b/rules
index d916bcd..ef35eda 100755
--- a/rules
+++ b/rules
@@ -2203,6 +2203,26 @@ else
rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
endif
+ifneq "$(ENABLE_REPORTDESIGN)" "y"
+ # unneeded. a no-Java arch, so the report-builder can't work anyway.
+ # (and we need to remove it here anyway as it otherwise would end up
+ # in -base/-core)
+ rm -rf $(PKGDIR)-report-builder
+ rm -f $(PKGDIR)-core/$(OODIR)/program/librpt*
+else
+ ifeq "$(PACKAGE_BASE)" "y"
+ # move rpt stuff into -report-builder-bin
+ rm -rf $(PKGDIR)-report-builder-bin
+ mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
+ # FIXME: it seems that --enable/--disable-reportbuiler affects the install
+ # location. sigh.
+ if [ -e $(PKGDIR)-core/$(OODIR)/program/librptlo.so ]; then \
+ i=core; else i=report-builder; fi; \
+ mv $(PKGDIR)-$$i/$(OODIR)/program/librpt* \
+ $(PKGDIR)-report-builder-bin/$(OODIR)/program
+ endif
+endif
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@ -2643,26 +2663,6 @@ endif
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
done
-ifneq "$(ENABLE_REPORTDESIGN)" "y"
- # unneeded. a no-Java arch, so the report-builder can't work anyway.
- # (and we need to remove it here anyway as it otherwise would end up
- # in -base/-core)
- rm -rf $(PKGDIR)-report-builder
- rm -f $(PKGDIR)-core/$(OODIR)/program/librpt*
-else
- ifeq "$(PACKAGE_BASE)" "y"
- # move rpt stuff into -report-builder-bin
- rm -rf $(PKGDIR)-report-builder-bin
- mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
- # FIXME: it seems that --enable/--disable-reportbuiler affects the install
- # location. sigh.
- if [ -e $(PKGDIR)-core/$(OODIR)/program/librptlo.so ]; then \
- i=core; else i=report-builder; fi; \
- mv $(PKGDIR)-$$i/$(OODIR)/program/librpt* \
- $(PKGDIR)-report-builder-bin/$(OODIR)/program
- endif
-endif
-
ifeq "$(ENABLE_MINIMIZER)" "y"
rm -f $(PKGDIR)-presentation-minimizer/$(OODIR)/share/extensions/presentation-minimizer/registration/LICENSE
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: