The following commit has been merged in the debian-experimental-4.0 branch:
commit 4ec79e01e29b8afd99407513d4224747cb52c1a0
Author: Bjoern Michaelsen <bjoern.michael...@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
Conflicts:
changelog
rules
diff --git a/changelog b/changelog
index b740206..c288a6a 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,13 @@
libreoffice (1:4.0.2~rc1-1) experimental; urgency=low
+ * merge from Ubuntu:
+ - reverting l10n conflicts as they create an unfortunate mess in image and
+ installer creation (related: lp#957589)
+
+ -- Rene Engelhard <r...@debian.org> Wed, 13 Mar 2013 02:07:52 +0100
+
+libreoffice (1:4.0.2~rc1-1) experimental; urgency=low
+
* new upstream release candidate
* merge from Ubuntu:
diff --git a/control b/control
index 045ee00..07f4f09 100644
--- a/control
+++ b/control
@@ -3510,39 +3510,6 @@ Description: transitional package for LibreOffices email
mail merge
package.
Package: libreoffice-help-en-us
-Conflicts: libreoffice-help-ca,
- libreoffice-help-ca-xv,
- libreoffice-help-cs,
- libreoffice-help-da,
- libreoffice-help-de,
- libreoffice-help-dz,
- libreoffice-help-el,
- libreoffice-help-en-gb,
- libreoffice-help-es,
- libreoffice-help-et,
- libreoffice-help-eu,
- libreoffice-help-fi,
- libreoffice-help-fr,
- libreoffice-help-gl,
- libreoffice-help-hi,
- libreoffice-help-hu,
- libreoffice-help-it,
- libreoffice-help-ja,
- libreoffice-help-km,
- libreoffice-help-ko,
- libreoffice-help-nl,
- libreoffice-help-om,
- libreoffice-help-pl,
- libreoffice-help-pt,
- libreoffice-help-pt-br,
- libreoffice-help-ru,
- libreoffice-help-sk,
- libreoffice-help-sl,
- libreoffice-help-sv,
- libreoffice-help-tr,
- libreoffice-help-vi,
- libreoffice-help-zh-cn,
- libreoffice-help-zh-tw
Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
Architecture: all
Section: doc
diff --git a/rules b/rules
index cd54f84..cc673fd 100755
--- a/rules
+++ b/rules
@@ -1490,7 +1490,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-help-en-us/Package:
libreoffice-help-en-us\nReplaces: libreoffice-common (<< 1:3.0.0~dev300m28)/'
debian/control
- perl -pi -e 's/Package: libreoffice-help-en-us/Package:
libreoffice-help-en-us\nConflicts: $(foreach d,$(shell echo $(filter-out
en-US,$(HELPISOS)) | tr A-Z a-z),libreoffice-help-$(d),)/' debian/control
ifeq "$(ENABLE_GIO)" "y"
perl -pi -e 's/VFS/GIO/' debian/control
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uimp8-0000ep...@vasks.debian.org
