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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.0-1-29-g8c8f2ec



The following commit has been merged in the debian-experimental-4.0 branch:
commit c4385bd4b622b4b00de414a429929c57cdb292c8
Author: Benjamin Drung <bdrung@debian.org>
Date:   Sat Feb 16 20:17:11 2013 +0100

    Run wrap-and-sort on control.in

diff --git a/control.in b/control.in
index 5dc2b90..153a2d7 100644
--- a/control.in
+++ b/control.in
@@ -76,11 +76,11 @@ Depends: libreofficeVER-base%OOO_NO_BASE_ARCHS%,
          libreofficeVER-math,
          libreofficeVER-report-builder-bin%OOO_NO_REPORTDESIGN_ARCHS%,
          libreofficeVER-writer,
-         ${pyuno-depends},
          ttf-dejavu,
          ttf-sil-gentium-basic,
          ${java-common-depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         ${pyuno-depends}
 Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils
 Suggests: cups-bsd,
           hunspell-dictionary,
@@ -307,9 +307,7 @@ Suggests: libreofficeVER-style-crystal,
           libreofficeVER-style-hicontrast,
           libreofficeVER-style-oxygen,
           libreofficeVER-style-tango
-Recommends: ${pyuno-depends},
-            xfonts-mathml,
-            ${textcat-data-recommends}
+Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
 Conflicts: broffice,
            libreoffice-l10n-3.5,
            libreoffice-l10n-3.6,
@@ -592,9 +590,9 @@ Description: office productivity suite -- GNOME integration
 Package: libreofficeVER-emailmerge
 Architecture: all
 Depends: libreofficeVER-core,
-         ${pyuno-depends},
          ${misc:Depends},
-         ${python:Depends}
+         ${python:Depends},
+         ${pyuno-depends}
 Enhances: libreofficeVER-writer
 Replaces: python-uno (<< 1:2.4.1-5)
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@ -696,9 +694,9 @@ Architecture: all
 Section: python
 Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
          libreoffice-core (>= 1:3.5.0~alpha0~),
-         ${pyuno-depends},
          ${misc:Depends},
-         ${python:Depends}
+         ${python:Depends},
+         ${pyuno-depends}
 Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
 Conflicts: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
 Description: Python script support provider for LibreOffice scripting framework

-- 
LibreOffice packaging repository


Reply to: