[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.1_rc1-1-2-g7e5cc1d
The following commit has been merged in the debian-experimental-3.6 branch:
commit 7e5cc1d977e698c43324bb56cb381077ea41ca7f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 17 16:50:15 2012 +0200
fix build and install targets to prevent build-arch be called under fakeroot, thanks rleigh for the hints
diff --git a/changelog b/changelog
index 0eae257..62396de 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:3.6.1~rc1-2) UNRELEASED; urgency=low
- revert "build-depend against libpng-dev instead of libpng12-dev"
as it breaks on the buildds which install the libpng from experimental
(fails GTK3 pkg-config test) (reopens: #662411)
+ - fix build and install targets to prevent build-arch be called under
+ fakeroot, thanks rleigh for the hints
-- Rene Engelhard <rene@debian.org> Fri, 17 Aug 2012 11:39:00 +0200
diff --git a/rules b/rules
index 089d115..18bf28a 100755
--- a/rules
+++ b/rules
@@ -1211,10 +1211,10 @@ endif
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
# that match the given targets will be removed automagically.
-stampdir_targets=files.backup icons.scale patch.apply build.prepare.artwork
-stampdir_targets+=build.prepare configure
-stampdir_targets+=setupins setup install install-arch install-indep
-stampdir_targets+=langpacks binary-common binary-arch binary-indep
+stampdir_targets+=prepare
+stampdir_targets+=build build-arch build-indep maintscripts
+stampdir_targets+=install-common install-arch install-indep langpacks
+stampdir_targets+=binary-arch binary-indep
ifdef FORCE
DUMMY:=$(shell rm -f $(patsubst %,$(STAMP_DIR)/%,$(filter $(stampdir_targets),$(MAKECMDGOALS))))
endif
@@ -1578,7 +1578,7 @@ build:
$(CURDIR)/debian/rules build-indep
touch $(STAMP_DIR)/$@
-build-arch: $(STAMP_DIR)/prepare
+build-arch: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch
$(STAMP_DIR)/build-arch:
#build-arch: ENABLE_HELP = n PACKAGE_SDK_DOCS = n ENABLE_MEDIAWIKI = n ENABLE_REPORTDESIGN = n ENABLE_SCRIPT_PROVIDER_BSH = n ENABLE_SCRIPT_PROVIDER_JS = n
dh_testdir
@@ -1656,8 +1656,10 @@ ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
endif
endif
-install: $(STAMP_DIR)/install
-$(STAMP_DIR)/install: $(STAMP_DIR)/build
+install: $(STAMP_DIR)/install-common $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep
+
+install-common: $(STAMP_DIR)/install-common
+$(STAMP_DIR)/install-common:
dh_testdir
dh_testroot
@@ -2007,7 +2009,7 @@ endif
# Install files generated by setup into arch-dependent package directories
install-arch: $(STAMP_DIR)/install-arch
-$(STAMP_DIR)/install-arch: $(STAMP_DIR)/install $(STAMP_NATIVE_JARS)
+$(STAMP_DIR)/install-arch: $(STAMP_DIR)/install-common $(STAMP_NATIVE_JARS)
dh_testdir
dh_testroot
umask 022
@@ -2396,7 +2398,7 @@ install-indep: $(STAMP_DIR)/install-indep
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).install
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER)-mimelnk.install
#$(STAMP_DIR)/install-indep: debian/libreoffice$(VER).dirs
-$(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install
+$(STAMP_DIR)/install-indep: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-common
dh_testdir
dh_testroot
@@ -2748,7 +2750,7 @@ endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/build-arch $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
dh_testdir
dh_testroot
--
LibreOffice packaging repository
Reply to: