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

./packages/openofficeorg/2.3.1/unstable r997: more Java fixes from 2.3



------------------------------------------------------------
revno: 997
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-01-28 17:34:45 +0100
message:
  more Java fixes from 2.3
modified:
  changelog
  control
  control.in
  rules
=== modified file 'changelog'
--- a/changelog	2008-01-28 16:26:58 +0000
+++ b/changelog	2008-01-28 16:34:45 +0000
@@ -15,14 +15,17 @@
       Place it before sun-java?-jre
     - don't try to create a libstlport_gcc.so symlink if we don't build
       with stlport and the readlink will fail :)
+    - fix ENABLE_JAVA=n build, build the help as it doesn't need Java anymore,
+      don't build report-builder
   * debian/control.in:
     - another Replaces: (-core) missed the epoch, thanks Chris Cheney
     - make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
       (closes: #462477)
   * merge from Ubuntu:
     - debian/rules:
-     + make -gcj depend on libhsqldb-java-gcj
-     + some minor parallel build conditional improvements
+      + make -gcj depend on libhsqldb-java-gcj
+      + some minor parallel build conditional improvements
+      + Use java-runtime-depends variable for java dependencies.
 
  -- Rene Engelhard <rene@debian.org>  Mon, 28 Jan 2008 17:16:57 +0100
 

=== modified file 'control'
--- a/control	2008-01-28 16:26:58 +0000
+++ b/control	2008-01-28 16:34:45 +0000
@@ -14,7 +14,7 @@
 Package: openoffice.org
 Architecture: i386 powerpc sparc amd64 ppc64
 Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-officebean, ${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
-Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, java-gcj-compat | sun-java5-jre | java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
+Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
 Conflicts: openoffice.org2 (<< ${Source-Version})
 Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
 Provides: openoffice.org2
@@ -143,7 +143,7 @@
 Package: openoffice.org-writer
 Architecture: i386 powerpc sparc amd64 ppc64
 Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
-Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}  ${java-common-depends}
 Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 1:2.3.1)
 Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-java-common (<< 1:2.3.1)
 Provides: openoffice.org2-writer, writer2latex
@@ -219,7 +219,7 @@
 
 Package: openoffice.org-base
 Architecture: i386 powerpc sparc amd64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, java-gcj-compat | sun-java5-jre | java2-runtime, ${base-hsqldb-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
 Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj, openoffice.org-report-builder
 Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
 Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
@@ -411,7 +411,7 @@
 Package: openoffice.org-officebean
 Architecture: i386 powerpc sparc amd64 ppc64
 Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}
 Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
 Provides: openoffice.org2-officebean
 Conflicts: openoffice.org2-officebean
@@ -444,7 +444,7 @@
 Package: openoffice.org-filter-mobiledev
 Section: misc
 Architecture: all
-Depends: java-gcj-compat | sun-java5-jre | java2-runtime, ${java-common-depends}
+Depends: ${java-runtime-depends}, ${java-common-depends}
 Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178), openoffice.org-common (<< 2.0.3+2.0.4m178)
 Description: Mobile Devices Filters for OpenOffice.org
  OpenOffice.org is a full-featured office productivity suite that provides

=== modified file 'control.in'
--- a/control.in	2008-01-25 09:12:20 +0000
+++ b/control.in	2008-01-28 16:34:45 +0000
@@ -51,7 +51,7 @@
  gperf [%OOO_ARCHS%],
  libpq-dev [%OOO_ARCHS%]
  %BUILD_DEPS%
-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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), 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)
+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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), 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), gcj-4.2 (= 4.2.2-6)
 Standards-Version: 3.7.2
 XS-Python-Version: current
 Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3.1/unstable
@@ -87,7 +87,7 @@
  msttcorefonts,
  openoffice.orgVER-gnome | openoffice.orgVER-kde,
  iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
- java-gcj-compat | sun-java5-jre | java2-runtime,
+ ${java-runtime-depends},
  openclipart-openoffice.org,
  pstoedit,
  imagemagick,
@@ -316,7 +316,7 @@
  openoffice.orgVER-base-core (= ${Source-Version}),
  ${shlibs:Depends}, 
  ${writer-pyuno-dep} 
-Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}  ${java-common-depends}
 Replaces: openoffice.org (<< 1.9), 
  openoffice.org-debian-files,
  openoffice.org2-writer (<< ${Source-Version}),
@@ -429,7 +429,7 @@
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  openoffice.orgVER-base-core (= ${Source-Version}),
  ${shlibs:Depends},
- java-gcj-compat | sun-java5-jre | java2-runtime,
+ ${java-runtime-depends},
  ${base-hsqldb-depends},
  ${java-common-depends}
 Suggests: unixodbc, 
@@ -654,7 +654,7 @@
 Section: misc
 Depends: openoffice.orgVER-core (= ${Source-Version}),
  ${shlibs:Depends},
- java-gcj-compat | ${gcj-jawt-depends} | sun-java5-bin | sun-java6-bin,
+ ${java-runtime-depends},
  ${java-common-depends}
 Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1), openoffice.org2-officebean
 Provides: openoffice.org2-officebean
@@ -693,7 +693,7 @@
 Package: openoffice.orgVER-filter-mobiledev
 Section: misc
 Architecture: all
-Depends: java-gcj-compat | sun-java5-jre | java2-runtime, 
+Depends: ${java-runtime-depends},
  ${java-common-depends}
 Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178), openoffice.org-common (<< 2.0.3+2.0.4m178)
 Description: Mobile Devices Filters for OpenOffice.org

=== modified file 'rules'
--- a/rules	2008-01-28 16:26:58 +0000
+++ b/rules	2008-01-28 16:34:45 +0000
@@ -144,7 +144,11 @@
 MOZILLA=xulrunner
 ENABLE_OPENGL=n
 NEW_DPKG_SHLIBDEPS=y
-ENABLE_REPORTDESIGN=y
+ifeq "$(ENABLE_JAVA)" "y"
+  ENABLE_REPORTDESIGN=y
+else
+  ENABLE_REPORTDESIGN=n
+endif
 
 # when we have a package we want to have to be installed on older things with some older
 # C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -481,7 +485,6 @@
 else
 	CONFIGURE_FLAGS += --without-java
 	DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean -Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
-	HELPISOS=
 endif
 
 ifneq "$(MOZILLA)" ""
@@ -1127,9 +1130,11 @@
 	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
 		>> debian/control < debian/control.ogltrans.in
 endif
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
+ifeq "$(ENABLE_JAVA)" "y"
+  ifeq "$(ENABLE_REPORTDESIGN)" "y"
 	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
 		>> debian/control < debian/control.reportdesign.in
+  endif
 endif
 ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
 	sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
@@ -2102,10 +2107,6 @@
 		rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
 	done
 
-	# install scsolvers ChangeLog
-	install -D -m644 $(SOURCE_TREE)/scsolver/ChangeLog \
-		$(PKGDIR)-calc/usr/share/doc/openoffice.org$(VER)-calc/changelog.scsolver
-
 ifeq "$(ENABLE_REPORTDESIGN)" "y"
 	# move rpt stuff into -report-builder
 	rm -rf $(PKGDIR)-report-builder
@@ -2662,10 +2663,12 @@
 			-l$(PKGDIR)-core/$(OODIR)/program \
 			-l$(PKGDIR)-base/$(OODIR)/program \
 			$(SHLIBS_OVERRIDE)
+ifeq "$(ENABLE_JAVA)" "y"
 	LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
 		dh_shlibdeps -popenoffice.org$(VER)-officebean \
 			-l$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
 			$(SHLIBS_OVERRIDE)
+endif
 	# this is in an extension (.zip), so dh_shlibdeps doesn't get it. We need to do
 	# it manually.
 	LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program" \
@@ -2687,7 +2690,7 @@
 		-V'writer-pyuno-dep=$(WRITER_PYUNO_DEP)' \
 		-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
 		-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-		-V'gcj-jawt-depends=$(GCJ_JAWT_DEPENDS)' \
+		-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
 		-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
 		-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
 		-V'Binary-Version=$(BINARY_VERSION)' \
@@ -2704,7 +2707,7 @@
 	dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \
 		-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
 	dh_md5sums -s
-	dh_builddeb -s $(BUILDDEB_OPTIONS)
+	dh_builddeb -s $(DEBHELPER_OPTIONS)
 	
 	touch $@
 
@@ -2784,7 +2787,7 @@
 		-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
 		-v$(BINARY_VERSION)
 	dh_md5sums -i
-	dh_builddeb -i $(BUILDDEB_OPTIONS)
+	dh_builddeb -i $(DEBHELPER_OPTIONS)
 	
 	touch $@
 


Reply to: