diff -Nru libreoffice-3.6.2~rc2/debian/changelog libreoffice-3.6.2~rc2/debian/changelog --- libreoffice-3.6.2~rc2/debian/changelog 2012-10-07 20:36:47.000000000 +0000 +++ libreoffice-3.6.2~rc2/debian/changelog 2012-10-08 12:11:35.000000000 +0000 @@ -1,3 +1,9 @@ +libreoffice (1:3.6.2~rc2-0ubuntu3) quantal-proposed; urgency=high + + * packaging shouldnt try to move stuff it doesnt build on armel/armhf + + -- Bjoern Michaelsen Mon, 08 Oct 2012 13:19:24 +0200 + libreoffice (1:3.6.2~rc2-0ubuntu2) quantal-proposed; urgency=high * do not build extensions on armel, armhf for bug 1062448 diff -Nru libreoffice-3.6.2~rc2/debian/rules libreoffice-3.6.2~rc2/debian/rules --- libreoffice-3.6.2~rc2/debian/rules 2012-10-07 20:36:47.000000000 +0000 +++ libreoffice-3.6.2~rc2/debian/rules 2012-10-08 12:11:35.000000000 +0000 @@ -2680,17 +2680,19 @@ endif ifeq "$(ENABLE_JAVA)" "y" - ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y" + ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) + ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y" mkdir -p $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \ $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts - endif + endif - ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y" + ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y" mkdir -p $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \ $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts - endif + endif + endif endif ifeq "$(ENABLE_REPORTDESIGN)" "y"