[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-194-g6c04e8d
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 7b070064dc452398a0e608ca1ae1084cfc8c0c23
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 7 14:56:14 2013 +0100
conflict help in both ways
diff --git a/changelog b/changelog
index 0142fa5..3b5a069 100644
--- a/changelog
+++ b/changelog
@@ -64,13 +64,14 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
* libreoffice-core already conflicts with -evolution, so no need to break in
addition
* remove all traces of -so52
+ * conflict help language packages in both ways
[ Rico Tzschichholz ]
* disable two more flaky tests for now:
- fdo#35663
- fdo#61896
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 19:08:07 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 07 Mar 2013 14:56:29 +0100
libreoffice (1:4.0.1~rc1-2) experimental; urgency=low
diff --git a/rules b/rules
index ee1eb23..e2e0272 100755
--- a/rules
+++ b/rules
@@ -1546,6 +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; )
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
--
LibreOffice packaging repository
Reply to: