[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-22-g0c7ef10



The following commit has been merged in the debian-experimental-3.5 branch:
commit 57e867038a7a605028637151f82e872e3d26b3d0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Wed Dec 21 20:54:15 2011 +0100

    we can ignore dependencies while doing full builds

diff --git a/rules b/rules
index 398fcdb..3c4efed 100755
--- a/rules
+++ b/rules
@@ -1560,7 +1560,7 @@ build: $(STAMP_DIR)/build
 $(STAMP_DIR)/build: config.status
 	dh_testdir
 
-	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
+	PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS=
 
 ifeq "$(BUILD_PYUNO)" "y"
   ifeq "$(ENABLE_PYTHON3)" "y"
@@ -1577,7 +1577,7 @@ ifeq "$(BUILD_PYUNO)" "y"
 endif
 
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	$(CURDIR)/debian/rules check
+	$(CURDIR)/debian/rules check gb_FULLDEPS=
 endif
 
 	touch $@

-- 
LibreOffice packaging repository


Reply to: