The following commit has been merged in the master branch:
commit da4b8f9c3e9af0b38ddd25233b69c26180325bd1
Author: Rene Engelhard <[email protected]>
Date: Tue Jun 7 12:19:21 2011 +0000
fix/override (some) new Java related lintian warnings
diff --git a/changelog b/changelog
index c17c037..0aeef14 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,9 @@ libreoffice (1:3.3.3~rc1-1) UNRELEASED; urgency=low
- make -l10n-sw (if enabled) depend on locales (>= 2.13-5)
* debian/control.in:
- build-conflict against libmdds-dev (>= 0.4.0)
+ * debian/rules,
+ debian/libreoffice-{officebean,filter-mobildev}.lintian-overrides:
+ fix/override (some) new Java related lintian warnings
-- Rene Engelhard <[email protected]> Mon, 06 Jun 2011 23:19:01 +0000
diff --git a/control b/control
index 859947c..9c8c265 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <[email protected]>
Uploaders: Rene Engelhard <[email protected]>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, gcc-4.6
[hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], g++-4.6 [hppa ia64
kfreebsd-i386 kfreebsd-amd64 mips mipsel], dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>=
2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2
.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf
i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc
!powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64],
ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime,
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org
[!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel],
libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11),
mono-devel (>= 2.
4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>=
2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>=
2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>=
0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>=
1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386],
libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2),
libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>=
5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0),
libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip,
zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>=
2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev,
libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev,
libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev,
libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev,
libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, wget | curl, gcc-4.6
[hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], g++-4.6 [hppa ia64
kfreebsd-i386 kfreebsd-amd64 mips mipsel], dpkg-dev (>= 1.15.1),
libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips
!mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>=
2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2
.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf
i386 powerpc powerpcspe ppc64 s390 s390x sparc], gcj-native-helper [!powerpc
!powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64],
ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime,
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org
[!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel],
libflute-java-openoffice.org [!armel],
libpentaho-reporting-flow-engine-java-openoffice.org [!armel],
liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel],
libformula-java-openoffice.org [!armel], librepository-java-openoffice.org
[!armel], libfonts-java-openoffice.org [!armel],
libserializer-java-openoffice.org [!armel], libcommons-logging-java,
libservlet2.5-java, javahelper, xulrunner-dev, libnss3-dev (>= 3.12.3), dmake
(>= 1:4.11), mono-
devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev
(>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>=
2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>=
0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>=
1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386],
libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2),
libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>=
5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0),
libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, lib
rdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev,
libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64
mips mipsel], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips
mipsel], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
libmdds-dev (>= 0.4.0), base-files (= 6.0), base-files (= 6.0squeeze1),
libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/libreoffice-filter-mobiledev.lintian-overrides
b/libreoffice-filter-mobiledev.lintian-overrides
index bc40d1a..d761449 100644
--- a/libreoffice-filter-mobiledev.lintian-overrides
+++ b/libreoffice-filter-mobiledev.lintian-overrides
@@ -1 +1,2 @@
libreoffice-filter-mobiledev: desktop-command-not-in-package
usr/share/applications/libreoffice-javafilter.desktop libreoffice
+libreoffice-filter-mobiledev: missing-classpath libreoffice-java
diff --git a/rules b/rules
index bd43c2d..5e1dd57 100755
--- a/rules
+++ b/rules
@@ -764,6 +764,7 @@ export JAVA_HOME
CONFIGURE_FLAGS += --enable-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
+ BUILD_DEPS += , javahelper
else
CONFIGURE_FLAGS += --without-java
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean
-Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev
-Nlibreoffice$(VER)-gcj
@@ -1872,7 +1873,10 @@ ifeq "$(ENABLE_JAVA)" "y"
mkdir -p $(PKGDIR)-core/$(shell echo $(OOBASISDIR) | sed -e
s/lib/share/)/program/classes; \
mv $(PKGDIR)-common/$(OODIR)/program/classes/officebean.jar \
$(PKGDIR)-core/$(shell echo $(OOBASISDIR) | sed -e
s/lib/share/)/program/classes
-
+ # fix the classpath
+ jh_classpath --classpath="ridl.jar unoil.jar jurt.jar juh.jar" \
+ $(PKGDIR)-core/$(shell echo $(OOBASISDIR) | sed -e
s/lib/share/)/program/classes/officebean.jar
+
ifeq "$(PACKAGE_BASE)" "y"
# move sdbc_hsqldb.jar into -base (do the move
# to /usr/share/java here directly, we do it for the "rest"
diff --git a/ure.lintian-overrides b/ure.lintian-overrides
index 96b7672..1ed63ae 100644
--- a/ure.lintian-overrides
+++ b/ure.lintian-overrides
@@ -1,2 +1,5 @@
ure: binary-or-shlib-defines-rpath
ure: no-debconf-config
+ure: classpath-contains-relative-path usr/share/java/jurt.jar: ridl.jar
unoloader.jar ../../lib/ /usr/lib/ure/lib/ ../bin/
+ure: classpath-contains-relative-path usr/share/java/juh.jar: ridl.jar
jurt.jar ../../lib/ ../bin/
+ure: classpath-contains-relative-path usr/share/java/java_uno.jar: jurt.jar
ridl.jar ../../lib/ ../bin/
--
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]
