[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_rc1-1-1-g2130f11
The following commit has been merged in the debian-experimental-4.1 branch:
commit 2130f114f04e902282877ad4495a7a5e77391fca
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Mon Jun 24 18:09:32 2013 +0200
remove bogus "v"s in l10n conflicts
diff --git a/control b/control
index 0fbfc74..f15ace1 100644
--- a/control
+++ b/control
@@ -414,8 +414,8 @@ Suggests: libreoffice-style-crystal,
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
- vlibreoffice-l10n-3.5,
- vlibreoffice-l10n-3.6
+ libreoffice-l10n-3.5,
+ libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
diff --git a/control.in b/control.in
index f05b379..df62b0b 100644
--- a/control.in
+++ b/control.in
@@ -271,8 +271,8 @@ Suggests: libreoffice-style-crystal,
Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: broffice,
libreoffice-filter-mobiledev,
- vlibreoffice-l10n-3.5,
- vlibreoffice-l10n-3.6
+ libreoffice-l10n-3.5,
+ libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
--
LibreOffice packaging repository
Reply to: