This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-experimental-5.0 in repository libreoffice.
commit 211260d1f9f40e5198f94939269a9321b51091ad Author: Rene Engelhard <[email protected]> Date: Sat Jan 16 13:29:34 2016 +0100 move pom generation and mh_* for -officebean to install-arch... --- changelog | 4 ++++ rules | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index 15102f6..ca02dd0 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,10 @@ libreoffice (1:5.0.5~rc1~git20151219-1) UNRELEASED; urgency=medium * New upstream snapshot + * debian/rules: + - -officebean is a arch-dep package, move pom generation and mh_* + calls for it to install-arch... + -- Rene Engelhard <[email protected]> Sat, 19 Dec 2015 01:50:15 +0100 libreoffice (1:5.0.4~rc2-2) unstable; urgency=medium diff --git a/rules b/rules index 95ba2eb..096d499 100755 --- a/rules +++ b/rules @@ -2753,6 +2753,10 @@ ifeq "$(ENABLE_JAVA)" "y" for i in juh jurt ridl unoloader; do \ mh_installjar -pure -l debian/pom.$$i.xml instdir/program/classes/$$i.jar; \ done + sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ + < $(SOURCE_TREE)/bean/pom.officebean.xml > debian/pom.officebean.xml + mh_installpoms -plibreoffice-officebean + mh_installjar -plibreoffice-officebean -l debian/pom.officebean.xml instdir/program/classes/officebean.jar endif for i in $(ARCH_DEP_PACKAGES); do \ @@ -3076,12 +3080,8 @@ ifeq "$(ENABLE_JAVA)" "y" # we get a NullPointerException when calling mh_installjar sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ < $(SOURCE_TREE)/unoil/pom.unoil.xml > debian/pom.unoil.xml - sed -e s/@version@/$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d~ -f1)/ \ - < $(SOURCE_TREE)/bean/pom.officebean.xml > debian/pom.officebean.xml mh_installpoms -plibreoffice-java-common mh_installjar -plibreoffice-java-common -l debian/pom.unoil.xml instdir/program/classes/unoil.jar - mh_installpoms -plibreoffice-officebean - mh_installjar -plibreoffice-officebean -l debian/pom.officebean.xml instdir/program/classes/officebean.jar endif touch $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
