[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-213-g0e44e6c



The following commit has been merged in the debian-experimental-4.0 branch:
commit a5f8264f4c3a10055e578e182c6c37ca19e7c8b1
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Jan 14 21:37:55 2013 +0100

    make -help-en-us break "the others" to work around 682838

diff --git a/changelog b/changelog
index 7d78101..bd859fd 100644
--- a/changelog
+++ b/changelog
@@ -31,6 +31,14 @@ libreoffice (1:4.0.0~rc2~git20130114-1) UNRELEASED; urgency=low
 
  -- Rene Engelhard <rene@debian.org>  Sat, 22 Dec 2012 18:03:18 +0100
 
+libreoffice (1:3.6.4-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - make -help-en-us break "the others" to work around 682838
+      (closes: #682838) 
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 14 Jan 2013 21:37:10 +0100
+
 libreoffice (1:3.6.4-1) experimental; urgency=low
 
   * LibreOffice 3.6.4 release (identical to rc3) 
diff --git a/control b/control
index 28a7a6c..f8a7d62 100644
--- a/control
+++ b/control
@@ -2616,6 +2616,7 @@ 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 5c7de6e..ec82eea 100755
--- a/rules
+++ b/rules
@@ -1488,6 +1488,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
 
 ifeq "$(ENABLE_GIO)" "y"
 	perl -pi -e 's/VFS/GIO/' debian/control

-- 
LibreOffice packaging repository


Reply to: