[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-202-g467283b
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 4ca1aa771a2d589913d1d0b00afedb892c21ffd8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Mar 8 10:25:21 2013 +0100
fix bad-provided-package-name -help-en-US: casing
diff --git a/rules b/rules
index 3b8798d..4aee257 100755
--- a/rules
+++ b/rules
@@ -1546,7 +1546,7 @@ ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
endif
perl -pi -e 's/Package: libreoffice$(VER)-help-en-us/Package: libreoffice$(VER)-help-en-us\nReplaces: libreoffice$(VER)-common (<< 1:3.0.0~dev300m28)/' debian/control
perl -pi -e 's/Package: libreoffice$(VER)-help-en-us/Package: libreoffice$(VER)-help-en-us\nConflicts: $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice$(VER)-help-$(d),)/' debian/control
- $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),perl -pi -e 's/^Package: libreoffice$(VER)-help-$(d)$$/Package: libreoffice$(VER)-help-$(d)\nConflicts: libreoffice$(VER)-help-en-US/' debian/control; )
+ $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),perl -pi -e 's/^Package: libreoffice$(VER)-help-$(d)$$/Package: libreoffice$(VER)-help-$(d)\nConflicts: libreoffice$(VER)-help-en-us/' debian/control; )
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
--
LibreOffice packaging repository
Reply to: