[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-14-gd41967a
The following commit has been merged in the debian-experimental-4.0 branch:
commit 5b04cc01e40f41e7319d483fbb050cd298e754d8
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
Conflicts:
changelog
diff --git a/changelog b/changelog
index 109aec6..a107132 100644
--- a/changelog
+++ b/changelog
@@ -2,13 +2,12 @@ libreoffice (1:4.0.1~rc2-1) UNRELEASED; urgency=low
* new upstream release candidate
- * merge From Ubuntu:
+ * merge from Ubuntu:
+ - add transitional for -presenter-console
- silent some lintian noise for unversioned breaks:
+ promote Breaks to Conflicts against -binfilter as it will never return
+ remove Breaks against -style-industrial which is long gone
-
- * merge from Ubuntu:
- - add transitional for -presenter-console
+ + promote Breaks to Conflicts from langpacks against en-US
-- Rene Engelhard <rene@debian.org> Wed, 27 Feb 2013 17:18:53 +0100
diff --git a/rules b/rules
index e320f41..8d0c7ab 100755
--- a/rules
+++ b/rules
@@ -1510,7 +1510,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: