[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-177-g132031d
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 132031d3f725342e4310cb43f9c00aa833308dc5
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Mar 6 09:14:43 2013 +0100
silent some lintian noise for unversioned breaks:
- promote Breaks to Conflicts from langpack against en-US
diff --git a/changelog b/changelog
index 110b687..fbf3802 100644
--- a/changelog
+++ b/changelog
@@ -56,9 +56,10 @@ libreoffice (1:4.0.1-0ubuntu1) raring; urgency=low
- some whitespace
* silent some lintian noise for unversioned breaks:
- promote Breaks to Conflicts against -binfilter as it will never return
+ - promote Breaks to Conflicts from langpacks against en-US
- remove Breaks against -style-industrial which is long gone
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 08:55:54 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed, 06 Mar 2013 09:10:20 +0100
libreoffice (1:4.0.1~rc1-2) experimental; urgency=low
diff --git a/rules b/rules
index 1cd8418..e0e5dd2 100755
--- a/rules
+++ b/rules
@@ -1546,7 +1546,7 @@ 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\nBreaks: $(foreach d,$(shell echo $(filter-out en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice$(VER)-help-$(d),)/' 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
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
--
LibreOffice packaging repository
Reply to: