[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-147-g7a58f78
The following commit has been merged in the debian-experimental-4.1 branch:
commit 66f6eeb02cacaafc7ddb3510951182080b4c6021
Author: Rene Engelhard <rene@debian.org>
Date: Tue May 21 22:39:50 2013 +0200
Revert "don't run cleandupes on en-US-only builds...". bogus.
This reverts commit 34fc3eea81503a6cbb044cb019f26c63eae98ad7.
diff --git a/rules b/rules
index 2e8e1c3..f033081 100755
--- a/rules
+++ b/rules
@@ -2110,7 +2110,6 @@ $(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 \
@@ -2118,7 +2117,6 @@ ifneq "$(BUILD_ISOS)" "en-US"
$(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: