[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-5-5-ga930094

[Rene Engelhard]

The following commit has been merged in the master branch:
commit 67df3363b9837a0b0ad81716f8e601f2052b5461
Author: Rene Engelhard <r...@debian.org>
Date:   Mon Jul 9 23:15:16 2012 +0200

    debian/control.mediawiki.in: add missing epoch to -core dependency

diff --git a/changelog b/changelog
index e003d28..2164945 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ libreoffice (1:3.5.4-6) UNRELEASED; urgency=high
     obsolete 3), thanks Miros◈aw Zalewski (closes: #678313)
   * debian/control.in: make -filter-mobiledev Break libreoffice-core
     (<< 1:3.5~) (closes: #633929)
+  * debian/control.mediawiki.in: add missing epoch to -core dependency
 
  -- Rene Engelhard <r...@debian.org>  Wed, 20 Jun 2012 23:29:13 +0200
 
diff --git a/control b/control
index 558aa5e..6fecc8c 100644
--- a/control
+++ b/control
@@ -3132,7 +3132,7 @@ Package: libreoffice-wiki-publisher
 Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~), 
libreoffice-java-common, ${java:Depends}, ${misc:Depends}
+Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 1:3.4~), 
libreoffice-java-common, ${java:Depends}, ${misc:Depends}
 Enhances: libreoffice-writer
 Recommends: ${lucene-depends}
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), 
libreoffice-common (<< 1:3.5~)
diff --git a/control.mediawiki.in b/control.mediawiki.in
index 6dd9962..c859d93 100644
--- a/control.mediawiki.in
+++ b/control.mediawiki.in
@@ -2,7 +2,7 @@ Package: libreofficeVER-wiki-publisher
 Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreofficeVER-core (>= 3.4~), 
libreofficeVER-java-common,
+Depends: ${mediawiki-jar-depends}, libreofficeVER-core (>= 1:3.4~), 
libreofficeVER-java-common,
  ${java:Depends},
  ${misc:Depends}
 Enhances: libreofficeVER-writer

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1srmwz-0006pg...@vasks.debian.org