[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-205-ga82adcb
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit a82adcb5c26b88bf7d5074e7ab3b2124f8608bd0
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Mar 11 15:02:16 2013 +0100
reverting l10n conflicts as they create an unfortunate mess in image and installer creation
- related: lp#957589
diff --git a/changelog b/changelog
index a449b93..13a229d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.0.1-0ubuntu2) raring; urgency=low
+
+ * reverting l10n conflicts as they create an unfortunate mess in image and
+ installer creation (related: lp#957589)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 11 Mar 2013 14:59:03 +0100
+
libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
[ Bjoern Michaelsen ]
diff --git a/rules b/rules
index 4aee257..bc26771 100755
--- a/rules
+++ b/rules
@@ -1545,8 +1545,6 @@ 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$(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; )
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
--
LibreOffice packaging repository
Reply to: