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

[SCM] LibreOffice packaging repository branch, master, updated. 886dc4173abc4a02153e60c12aeeaf4aea5a426a



The following commit has been merged in the master branch:
commit 5bf76b36bbf0da99e500e4be0fd5eca0b69c74de
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Apr 12 20:48:11 2011 +0200

    move -gcj into Section: java

diff --git a/changelog b/changelog
index 056c0a1..0d37a19 100644
--- a/changelog
+++ b/changelog
@@ -14,8 +14,10 @@ libreoffice (1:3.3.2-3) UNRELEASED; urgency=low
     - build-conflict against at3-dev-tools, it installs a moc-qt3 alternative
       for moc, which might hose the KDE VCLplug build - and configure insists
       on ../bin/moc relative to libQt.so (thus /usr/bin/moc) now
+  * debian/control.gcj.in: 
+    - move -gcj into Section: java 
 
- -- Rene Engelhard <rene@debian.org>  Tue, 12 Apr 2011 20:43:38 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 12 Apr 2011 20:47:12 +0200
 
 libreoffice (1:3.3.2-2) unstable; urgency=medium
 
diff --git a/control b/control
index d9f644a..9b01c4f 100644
--- a/control
+++ b/control
@@ -1156,7 +1156,7 @@ Architecture: all
 Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
 Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-he, culmus
 Provides: libreoffice-l10n-${help-l10n-virtual-version}
-Suggests: hunspell-dictionary-he | myspell-dictionary-he, hyphen-he, mythes-he, libreoffice-help-he, libreoffice-ctl-he
+Suggests: hunspell-dictionary-he | myspell-dictionary-he, hyphen-he, mythes-he, libreoffice-help-he
 Description: office productivity suite -- Hebrew language package
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -3124,6 +3124,7 @@ Description: LibreOffice UNO runtime environment -- debug symbols
 
 Package: libreoffice-gcj
 Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Section: java
 Depends: ${shlibs:Depends}, gcj-jre, libreoffice-core (= ${binary:Version}), libreoffice-java-common (= ${source:Version}), ${java-gcj-depends}, ${misc:Depends}
 Enhances: libreoffice-writer, libreoffice-base
 Description: office productivity suite -- Java libraries for GIJ
diff --git a/control.gcj.in b/control.gcj.in
index 1cc76f8..01651e9 100644
--- a/control.gcj.in
+++ b/control.gcj.in
@@ -1,5 +1,6 @@
 Package: libreofficeVER-gcj
 Architecture: %OOO_GCJ_ARCHS%
+Section: java
 Depends: ${shlibs:Depends}, 
  gcj-jre,
  libreofficeVER-core (= ${binary:Version}),

-- 
LibreOffice packaging repository


Reply to: