The following commit has been merged in the master branch:
commit 1ca004f01fa94150b998ead930bf5e8379b30100
Author: Rene Engelhard <[email protected]>
Date: Tue Jun 28 23:42:28 2011 +0000
run jh_depends and add where we have Java
diff --git a/changelog b/changelog
index f061ddd..af41d4a 100644
--- a/changelog
+++ b/changelog
@@ -21,8 +21,10 @@ libreoffice (1:3.3.3-2) UNRELEASED; urgency=low
per default since longer (only suggested)
* debian/control.in, debian/rules: move libpq-dev builddep to a
conditional
+ * debian/rules, debian/control*in:
+ - run jh_depends and add ${java:Depends} where we have Java
- -- Rene Engelhard <[email protected]> Tue, 28 Jun 2011 16:10:32 +0200
+ -- Rene Engelhard <[email protected]> Tue, 28 Jun 2011 23:36:01 +0000
libreoffice (1:3.3.3-1) unstable; urgency=medium
diff --git a/control.gcj.in b/control.gcj.in
index 01651e9..5f2fae3 100644
--- a/control.gcj.in
+++ b/control.gcj.in
@@ -5,6 +5,7 @@ Depends: ${shlibs:Depends},
gcj-jre,
libreofficeVER-core (= ${binary:Version}),
libreofficeVER-java-common (= ${source:Version}),
+ ${java:Depends},
${java-gcj-depends},
${misc:Depends}
Enhances: libreofficeVER-writer, libreofficeVER-base
diff --git a/control.in b/control.in
index 95e2471..143873e 100644
--- a/control.in
+++ b/control.in
@@ -242,7 +242,7 @@ Description: office productivity suite -- arch-independent
files
Package: libreofficeVER-java-common
Architecture: all
Depends: libreofficeVER-common,
- ${java-common-java-depends},
+ ${java:Depends},
${misc:Depends}
Suggests: ${common-bsh-depends}
Description: office productivity suite -- arch-independent Java support files
@@ -339,7 +339,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-base-core (= ${binary:Version}),
${shlibs:Depends},
${java-runtime-depends},
- ${base-hsqldb-depends},
+ ${java:Depends},
${java-common-depends},
${misc:Depends}
Suggests: unixodbc,
@@ -524,6 +524,7 @@ Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${java-runtime-depends},
${java-common-depends},
+ ${java:Depends},
${misc:Depends}
Description: office productivity suite -- Java bean
LibreOffice is a full-featured office productivity suite that provides
@@ -556,6 +557,7 @@ Section: misc
Architecture: all
Depends: ${java-runtime-depends},
${java-common-depends},
+ ${java:Depends},
${misc:Depends}
Description: office productivity suite -- mobile devices filters
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.mediawiki.in b/control.mediawiki.in
index 5fda6bd..569aacd 100644
--- a/control.mediawiki.in
+++ b/control.mediawiki.in
@@ -3,6 +3,7 @@ Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, libreofficeVER-core,
libreofficeVER-java-common,
+ ${java:Depends},
${misc:Depends}
Enhances: libreofficeVER-writer
Recommends: ${lucene-depends}
diff --git a/control.reportdesign.in b/control.reportdesign.in
index d6ceebf..5eaa141 100644
--- a/control.reportdesign.in
+++ b/control.reportdesign.in
@@ -3,6 +3,7 @@ Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
Depends: ${report-builder-jar-depends}, libreofficeVER-report-builder-bin,
libreoffice-core, libreoffice-java-common,
+ ${java:Depends},
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Provides: libreoffice-reportdesigner
diff --git a/rules b/rules
index 9d16ea8..da5461b 100755
--- a/rules
+++ b/rules
@@ -734,7 +734,6 @@ export JAVA_HOME
ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
CONFIGURE_FLAGS += --with-system-saxon
--with-saxon-jar=/usr/share/java/saxonb.jar
BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
- JAVA_COMMON_JAVA_DEPENDS+= , libsaxonb-java
endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(DIST)" "Debian"
@@ -3272,6 +3271,11 @@ ifeq "$(ENABLE_MONO)" "y"
dh_makeclilibs -s
dh_clideps -s
endif
+ifeq "$(ENABLE_JAVA)" "y"
+ jh_depends -s -Xlibreoffice$(VER)-gcj
+ perl -pi -e "s/libhsqldb-java/libhsqldb-java $(HSQLDB_MINVER),
libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)/" \,
+ debian/libreoffice$(VER)-base.substvars
+endif
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
# causes ldd crashes sometimes when used with fakeroot:
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
@@ -3416,6 +3420,11 @@ ifeq "$(ENABLE_MONO)" "y"
dh_makeclilibs -i
dh_clideps -i
endif
+ifeq "$(ENABLE_JAVA)" "y"
+ # the help recommends lucene. this is enough. no need for a hard depend
in
+ # -common, IMHO
+ jh_depends -i -Xbsh -Xlibreoffice$(VER)-gcj -Xliblucene2-java
+endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
-Nlibreoffice$(VER)-wiki-publisher \
@@ -3432,7 +3441,6 @@ endif
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
- -V'java-common-java-depends=$(JAVA_COMMON_JAVA_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
