[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-64-g4fea3e0
The following commit has been merged in the debian-experimental-4.1 branch:
commit fe85d15b5dc5c290f52e2670810577e9646ef3e6
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 11 22:13:43 2013 +0100
don't add empty control to -help-en-us when we build only en-US
diff --git a/control b/control
index 60b4eec..fa304e9 100644
--- a/control
+++ b/control
@@ -848,7 +848,6 @@ Description: transitional package for LibreOffice presenter's console
integrated with LibreOffice Impress 4.0. You can safely remove this package.
Package: libreoffice-help-en-us
-Conflicts:
Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
Architecture: all
Section: doc
@@ -1259,3 +1258,4 @@ Description: Logo-like progamming language for LibreOffice
- native commands (easily translatable)
- Python data structures (list, tuple, set, dictionary) and other Python
features
+
diff --git a/rules b/rules
index d45b2e7..2a9779d 100755
--- a/rules
+++ b/rules
@@ -1516,7 +1516,9 @@ ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
endif
perl -pi -e 's/Package: libreoffice-help-en-us/Package: libreoffice-help-en-us\nReplaces: libreoffice-common (<< 1:3.0.0~dev300m28)/' debian/control
+ifneq "$(HELPISOS)" "en-US"
perl -pi -e 's/Package: libreoffice-help-en-us/Package: libreoffice-help-en-us\nConflicts: $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice-help-$(d),)/' debian/control
+endif
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
--
LibreOffice packaging repository
Reply to: