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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-21-gb6e3869



The following commit has been merged in the debian-experimental-3.6 branch:
commit b6e3869368428b3af42c31b7cd9a7eb441fcd335
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Mar 6 14:13:27 2013 +0100

    remove obsolete ${java-common-depends} Recommends from -help-*

diff --git a/changelog b/changelog
index c774a78..926d9d3 100644
--- a/changelog
+++ b/changelog
@@ -13,6 +13,8 @@ libreoffice (1:3.6.5-2) UNRELEASED; urgency=low
   * debian/control.in:
     - remove bogus | python3-uno dependency alternatives. Will properly be back
       with LO 4.0 which supportts python3
+  * debian/control.help.in:
+    - remove obsolete ${java-common-depends} Recommends
 
  -- Rene Engelhard <rene@debian.org>  Sun, 03 Feb 2013 15:23:55 +0100
 
diff --git a/control b/control
index 732a2ca..2b19eab 100644
--- a/control
+++ b/control
@@ -2604,7 +2604,7 @@ Breaks: libreoffice-help-ca, libreoffice-help-ca-xv, libreoffice-help-cs, libreo
 Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en
 Depends: libreoffice-writer | language-support-translations-en, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- English_american help
@@ -2617,7 +2617,7 @@ Description: office productivity suite -- English_american help
 Package: libreoffice-help-ca
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ca, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ca
 Depends: libreoffice-writer | language-support-translations-ca, libreoffice-l10n-ca, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Catalan help
@@ -2630,7 +2630,7 @@ Description: office productivity suite -- Catalan help
 Package: libreoffice-help-cs
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-cs, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-cs
 Depends: libreoffice-writer | language-support-translations-cs, libreoffice-l10n-cs, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Czech help
@@ -2643,7 +2643,7 @@ Description: office productivity suite -- Czech help
 Package: libreoffice-help-da
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-da, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-da
 Depends: libreoffice-writer | language-support-translations-da, libreoffice-l10n-da, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Danish help
@@ -2656,7 +2656,7 @@ Description: office productivity suite -- Danish help
 Package: libreoffice-help-de
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-de, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-de
 Depends: libreoffice-writer | language-support-translations-de, libreoffice-l10n-de, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- German help
@@ -2669,7 +2669,7 @@ Description: office productivity suite -- German help
 Package: libreoffice-help-dz
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz
 Depends: libreoffice-writer | language-support-translations-dz, libreoffice-l10n-dz, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Dzongkha help
@@ -2682,7 +2682,7 @@ Description: office productivity suite -- Dzongkha help
 Package: libreoffice-help-el
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-el, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-el
 Depends: libreoffice-writer | language-support-translations-el, libreoffice-l10n-el, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Greek help
@@ -2695,7 +2695,7 @@ Description: office productivity suite -- Greek help
 Package: libreoffice-help-en-gb
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en
 Depends: libreoffice-writer | language-support-translations-en, libreoffice-l10n-en-gb, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- English_british help
@@ -2708,7 +2708,7 @@ Description: office productivity suite -- English_british help
 Package: libreoffice-help-es
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-es, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-es
 Depends: libreoffice-writer | language-support-translations-es, libreoffice-l10n-es, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Spanish help
@@ -2721,7 +2721,7 @@ Description: office productivity suite -- Spanish help
 Package: libreoffice-help-et
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-et, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-et
 Depends: libreoffice-writer | language-support-translations-et, libreoffice-l10n-et, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Estonian help
@@ -2734,7 +2734,7 @@ Description: office productivity suite -- Estonian help
 Package: libreoffice-help-eu
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-eu, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-eu
 Depends: libreoffice-writer | language-support-translations-eu, libreoffice-l10n-eu, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Basque help
@@ -2747,7 +2747,7 @@ Description: office productivity suite -- Basque help
 Package: libreoffice-help-fi
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fi, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fi
 Depends: libreoffice-writer | language-support-translations-fi, libreoffice-l10n-fi, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Finnish help
@@ -2760,7 +2760,7 @@ Description: office productivity suite -- Finnish help
 Package: libreoffice-help-fr
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fr, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fr
 Depends: libreoffice-writer | language-support-translations-fr, libreoffice-l10n-fr, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- French help
@@ -2773,7 +2773,7 @@ Description: office productivity suite -- French help
 Package: libreoffice-help-gl
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gl, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gl
 Depends: libreoffice-writer | language-support-translations-gl, libreoffice-l10n-gl, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Galician help
@@ -2786,7 +2786,7 @@ Description: office productivity suite -- Galician help
 Package: libreoffice-help-hi
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hi, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hi
 Depends: libreoffice-writer | language-support-translations-hi, libreoffice-l10n-hi, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Hindi help
@@ -2799,7 +2799,7 @@ Description: office productivity suite -- Hindi help
 Package: libreoffice-help-hu
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hu, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hu
 Depends: libreoffice-writer | language-support-translations-hu, libreoffice-l10n-hu, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Hungarian help
@@ -2812,7 +2812,7 @@ Description: office productivity suite -- Hungarian help
 Package: libreoffice-help-it
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-it, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-it
 Depends: libreoffice-writer | language-support-translations-it, libreoffice-l10n-it, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Italian help
@@ -2825,7 +2825,7 @@ Description: office productivity suite -- Italian help
 Package: libreoffice-help-ja
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ja, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ja
 Depends: libreoffice-writer | language-support-translations-ja, libreoffice-l10n-ja, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Japanese help
@@ -2838,7 +2838,7 @@ Description: office productivity suite -- Japanese help
 Package: libreoffice-help-km
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km
 Depends: libreoffice-writer | language-support-translations-km, libreoffice-l10n-km, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Khmer help
@@ -2851,7 +2851,7 @@ Description: office productivity suite -- Khmer help
 Package: libreoffice-help-ko
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ko, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ko
 Depends: libreoffice-writer | language-support-translations-ko, libreoffice-l10n-ko, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Korean help
@@ -2864,7 +2864,7 @@ Description: office productivity suite -- Korean help
 Package: libreoffice-help-nl
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nl, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nl
 Depends: libreoffice-writer | language-support-translations-nl, libreoffice-l10n-nl, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Dutch help
@@ -2877,7 +2877,7 @@ Description: office productivity suite -- Dutch help
 Package: libreoffice-help-om
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-om, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-om
 Depends: libreoffice-writer | language-support-translations-om, libreoffice-l10n-om, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Oromo help
@@ -2890,7 +2890,7 @@ Description: office productivity suite -- Oromo help
 Package: libreoffice-help-pl
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pl, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pl
 Depends: libreoffice-writer | language-support-translations-pl, libreoffice-l10n-pl, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Polish help
@@ -2903,7 +2903,7 @@ Description: office productivity suite -- Polish help
 Package: libreoffice-help-pt
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt
 Depends: libreoffice-writer | language-support-translations-pt, libreoffice-l10n-pt, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Portuguese help
@@ -2916,7 +2916,7 @@ Description: office productivity suite -- Portuguese help
 Package: libreoffice-help-pt-br
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt
 Depends: libreoffice-writer | language-support-translations-pt, libreoffice-l10n-pt-br, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Portuguese_brazilian help
@@ -2929,7 +2929,7 @@ Description: office productivity suite -- Portuguese_brazilian help
 Package: libreoffice-help-ru
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ru, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ru
 Depends: libreoffice-writer | language-support-translations-ru, libreoffice-l10n-ru, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Russian help
@@ -2942,7 +2942,7 @@ Description: office productivity suite -- Russian help
 Package: libreoffice-help-sk
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sk, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sk
 Depends: libreoffice-writer | language-support-translations-sk, libreoffice-l10n-sk, libreoffice-help-cs, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Slovak help
@@ -2955,7 +2955,7 @@ Description: office productivity suite -- Slovak help
 Package: libreoffice-help-sl
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sl, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sl
 Depends: libreoffice-writer | language-support-translations-sl, libreoffice-l10n-sl, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Slovenian help
@@ -2968,7 +2968,7 @@ Description: office productivity suite -- Slovenian help
 Package: libreoffice-help-sv
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sv, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sv
 Depends: libreoffice-writer | language-support-translations-sv, libreoffice-l10n-sv, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Swedish help
@@ -2981,7 +2981,7 @@ Description: office productivity suite -- Swedish help
 Package: libreoffice-help-tr
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-tr, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-tr
 Depends: libreoffice-writer | language-support-translations-tr, libreoffice-l10n-tr, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Turkish help
@@ -2994,7 +2994,7 @@ Description: office productivity suite -- Turkish help
 Package: libreoffice-help-vi
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-vi, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-vi
 Depends: libreoffice-writer | language-support-translations-vi, libreoffice-l10n-vi, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Vietnamese help
@@ -3007,7 +3007,7 @@ Description: office productivity suite -- Vietnamese help
 Package: libreoffice-help-zh-cn
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh
 Depends: libreoffice-writer | language-support-translations-zh, libreoffice-l10n-zh-cn, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Chinese_simplified help
@@ -3020,7 +3020,7 @@ Description: office productivity suite -- Chinese_simplified help
 Package: libreoffice-help-zh-tw
 Architecture: all
 Section: doc
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh, ${java-common-depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh
 Depends: libreoffice-writer | language-support-translations-zh, libreoffice-l10n-zh-tw, ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}
 Description: office productivity suite -- Chinese_traditional help
diff --git a/control.help.in b/control.help.in
index a816ec2..1f870ad 100644
--- a/control.help.in
+++ b/control.help.in
@@ -1,7 +1,7 @@
 Package: libreofficeVER-help-@LCODE@
 Architecture: all
 Section: doc
-Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translations-@CCODE@, ${java-common-depends}
+Recommends: libreofficeVER-core (>> ${base-version}) | language-support-translations-@CCODE@
 Depends: libreofficeVER-writer | language-support-translations-@CCODE@, libreofficeVER-l10n-@LCODE@,
  ${misc:Depends}
 Provides: libreoffice-help-${help-l10n-virtual-version}

-- 
LibreOffice packaging repository


Reply to: