[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 2bfd53dd8a0729d836318572354f3bbe6dec04ea
Author: Rene Engelhard <rene@debian.org>
Date: Wed May 22 08:59:29 2013 +0200
HACK: temporarily disable cleandupes...
diff --git a/changelog b/changelog
index c617d22..b9f1b57 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,7 @@ libreoffice (1:4.1.0~beta1~git20130521-1) UNRELEASED; urgency=low
- build with explicit --enable-python=system
- enable the tightended binutils build-dep, we're in experimental anyway
and need harfbuzz, orcus and mdds from experimental, too
+ - temporarily disable cleandupes for -l10n-* as it's broken right nwo
* debian/uno-libs3.symbols: update
-- Rene Engelhard <rene@debian.org> Sat, 22 Dec 2012 18:03:18 +0100
diff --git a/rules b/rules
index f033081..559b2c9 100755
--- a/rules
+++ b/rules
@@ -2110,13 +2110,14 @@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-indep $(SO
$(PKGDIR)-$$pkg/$(OODIR)/share/wordbook/$$iso/technical.dic; \
done
- # replace duplicate files in the langpacks with symlinks
- TMP=`mktemp -q`; \
- fdupes --quiet --recurse --sameline --size \
- debian/libreoffice-common/$(OODIR) \
- $(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
+ # FIXME!
+# # replace duplicate files in the langpacks with symlinks
+# TMP=`mktemp -q`; \
+# fdupes --quiet --recurse --sameline --size \
+# debian/libreoffice-common/$(OODIR) \
+# $(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
ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
--
LibreOffice packaging repository
Reply to: