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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-113-g34fc3ee



The following commit has been merged in the debian-experimental-4.1 branch:
commit 34fc3eea81503a6cbb044cb019f26c63eae98ad7
Author: Rene Engelhard <rene@debian.org>
Date:   Sun May 12 09:00:36 2013 +0200

    don't run cleandupes on en-US-only builds...

diff --git a/rules b/rules
index 02a7c68..0049471 100755
--- a/rules
+++ b/rules
@@ -2087,6 +2087,7 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-indep $(SO
 			$(PKGDIR)-$$pkg/$(OODIR)/share/wordbook/$$iso/technical.dic; \
 	done
 
+ifneq "$(BUILD_ISOS)" "en-US"
 	# replace duplicate files in the langpacks with symlinks
 	TMP=`mktemp -q`; \
 		fdupes --quiet --recurse --sameline --size \
@@ -2094,6 +2095,7 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-indep $(SO
 		$(foreach d,$(shell echo $(filter-out en-US ca-XV,$(LANGPACKISOS)) | tr A-Z a-z),debian/libreoffice-l10n-$(d)/$(OODIR)) \
 		> $$TMP && \
 	debian/scripts/cleandupes --base=libreoffice --prefix=debian < $$TMP && rm -f $$TMP
+endif
 
 ifeq "$(DEB_VENDOR)" "Debian"
 	# install Debian presentation template

-- 
LibreOffice packaging repository


Reply to: