[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-4-8-gc6d10f5

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit c6d10f5d068764e15bb2b59148be5bb0ff462e7e
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Mar 18 22:48:24 2013 +0100

    Revert "make -help-en-us break "the others" to work around 682838"
    
    This reverts commit 62e3d1e813e2c8bd5f828efebb93a0ce185d9647.
    
    Conflicts:
    	changelog

diff --git a/changelog b/changelog
index 93bc4e6..eddb57e 100644
--- a/changelog
+++ b/changelog
@@ -9,9 +9,6 @@ libreoffice (1:3.5.4+dfsg2-1) UNRELEASED; urgency=low
     http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
     doesn't exist anymore
 
-  * debian/rules:
-    - make -help-en-us break "the others" to work around 682838
-      (closes: #682838) 
   * debian/copyright: fix: ext-sources -> src
   * debian/control.in:
     - remove bogus | python3-uno dependency alternatives. Will properly be back
diff --git a/control b/control
index 8bfdc77..0f433a3 100644
--- a/control
+++ b/control
@@ -2599,7 +2599,6 @@ Description: office productivity suite -- Zulu language package
  the language packs.
 
 Package: libreoffice-help-en-us
-Breaks: 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-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 2c87b12..da5bb06 100755
--- a/rules
+++ b/rules
@@ -1471,7 +1471,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\nBreaks: $(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