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

[SCM] LibreOffice packaging repository branch, master, updated. d2dc67d9f0054d7e49d8d9dafb7d9d21b94a62b7



The following commit has been merged in the master branch:
commit eb3af1c373a864ee0272b8b63bdf730fa3935577
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Mar 1 22:15:07 2011 +0100

    make -wiki-publisher depend on -java-common

diff --git a/changelog b/changelog
index fea38ad..c847784 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.3.1-2) UNRELEASED; urgency=low
+
+  * make -wiki-publisher depend on -java-common
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 01 Mar 2011 22:13:42 +0100
+
 libreoffice (1:3.3.1-1) unstable; urgency=low
 
   * LibreOffice 3.3.1 final (identical to rc2)
diff --git a/control b/control
index ab538ef..3c71042 100644
--- a/control
+++ b/control
@@ -3242,7 +3242,7 @@ Package: libreoffice-wiki-publisher
 Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreoffice-core, ${misc:Depends}
+Depends: ${mediawiki-jar-depends}, libreoffice-core, libreoffice-java-common, ${misc:Depends}
 Enhances: libreoffice-writer
 Recommends: ${lucene-depends}
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
diff --git a/control.mediawiki.in b/control.mediawiki.in
index cc046d0..5fda6bd 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,
+Depends: ${mediawiki-jar-depends}, libreofficeVER-core, libreofficeVER-java-common,
  ${misc:Depends}
 Enhances: libreofficeVER-writer
 Recommends: ${lucene-depends}

-- 
LibreOffice packaging repository


Reply to: