./packages/openofficeorg/3.0/experimental r1168: update ooo-build and reenable -qa-* and binfilters; we need a .shlibs for ure, too (e.g. libjvmfwk.so.3); more extension fixes

To: debian-openoffice@lists.debian.org
Subject: ./packages/openofficeorg/3.0/experimental r1168: update ooo-build and reenable -qa-* and binfilters; we need a .shlibs for ure, too (e.g. libjvmfwk.so.3); more extension fixes
From: Rene Engelhard <rene@debian.org>
Date: Thu, 10 Jul 2008 21:21:36 +0200
Message-id: <[🔎] E1KH1lI-00020P-T3@alioth.debian.org>

------------------------------------------------------------
revno: 1168
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-07-10 21:21:36 +0200
message:
  update ooo-build and reenable -qa-* and binfilters; we need a .shlibs for ure, too (e.g. libjvmfwk.so.3); more extension fixes
modified:
  changelog
  control
  rules

=== modified file 'changelog'
--- a/changelog	2008-07-10 01:37:52 +0000
+++ b/changelog	2008-07-10 19:21:36 +0000
@@ -7,7 +7,7 @@
       to a read-only location (closes: #238906)
     - fixes printing of handouts in grayscale mode (closes: #416309)
   * ooo-build:
-    - update (r13131)
+    - update (r13150)
   * debian/template.desktop.in: move to ..
   * debian/startcenter.desktop.in: .. this and run ooffice now, which
     will bring us to the new StartCenter. Reuse writers icon.
@@ -34,8 +34,6 @@
     - remove spellchecking symlink and specify the new configure options for
       specifying dictionary/hyphenation/thesauri paths.
     - disable mono, known-broken right now, will be fixed with m22 onwards
-    - temporarily build with --disable-qadevooo
-    - temporarily disable the binfilters
   * debian/rules, debian/control.in:
     - make openoffice.org-core Pre-Depend on ure (>= 1.4+OOo3.0.0~)
       (unfortunately ure didn't update it's version although 3.0.0 needs new

=== modified file 'control'
--- a/control	2008-07-09 12:50:25 +0000
+++ b/control	2008-07-10 19:21:36 +0000
@@ -600,6 +600,37 @@
  .
  This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
 
+Package: openoffice.org-qa-tools
+Section: devel
+Priority: extra
+Depends: ${shlibs:Depends}, openoffice.org (>> ${base-version}), ${ooo-binfilter-dep}, ${java-common-depends}
+Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests
+Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
+Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
+Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Description: OpenOffice.org Automatic Test Programs
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the test tools to automatically test the
+ OpenOffice.org programs.
+ .
+ Install the openoffice.org-qa-ui-tests and
+ openoffice.org-qa-api-tests packages to get the official
+ testscripts, or write your own scripts.
+
+Package: openoffice.org-qa-api-tests
+Section: devel
+Priority: extra
+Depends: openoffice.org-qa-tools
+Architecture: all
+Description: OpenOffice.org API Test Data
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the test data for the OpenOffice.org Java and
+ Basic APIs.
+
 Package: mozilla-openoffice.org
 Section: net
 Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64

=== modified file 'rules'
--- a/rules	2008-07-10 01:37:52 +0000
+++ b/rules	2008-07-10 19:21:36 +0000
@@ -89,11 +89,11 @@
 BUILD_DEPS=
 BUILD_PYUNO=y
 USE_PYCENTRAL=y
-PACKAGE_QA_TOOLS=n
+PACKAGE_QA_TOOLS=y
 PACKAGE_TTF_OPENSYMBOL=y
 PACKAGE_PCVSLIB=n
 BUILD_JARS_NATIVE=y
-BUILD_BINFILTERS=n
+BUILD_BINFILTERS=y
 BUILD_ONLY_EN_US=y
 ENABLE_JAVA=y
 JDK=java-gcj-compat
@@ -2945,7 +2945,7 @@
 	dh_installcligac -s
 endif
 	dh_compress -s -X.py -X.mk -X.sxd
-	dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo3.0.0~)"
+	dh_makeshlibs -puno-libs3 -pure -V"ure (>= $(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo3.0.0~)"
 	dh_installdeb -s
 ifneq "$(USE_SYSTEM_XMLSEC)" "y"
 	cat debian/shlibs.override.xmlsec >> debian/shlibs.local
@@ -2960,41 +2960,41 @@
 	# /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
 	# and therefore we must not use it for -gcj. But we *do* need it
 	# for -officebean (libjawt.so is referenced there)
-	LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program" \
+	LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program" \
 		dh_shlibdeps -s -Nopenoffice.org$(VER)-officebean \
 			-Lure \
-			-ldebian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program \
+			-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program \
 			$(SHLIBS_OVERRIDE)
 ifeq "$(ENABLE_JAVA)" "y"
-	LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+	LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
 		dh_shlibdeps -popenoffice.org$(VER)-officebean \
 			-Lure \
-			-ldebian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
+			-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(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:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+	LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
 		dpkg-shlibdeps -O \
 			-Sdebian/ure/$(OOUREDIR)/lib \
 			$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
 			> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
 ifeq "$(ENABLE_MINIMIZER)" "y"
-	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
 	 	dpkg-shlibdeps -O \
 			-Sdebian/ure/$(OOUREDIR)/lib \
 			$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/SunPresentationMinimizer.uno.so \
 			> debian/openoffice.org$(VER)-presentation-minimizer.substvars
 endif
 ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
-	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
 	 	dpkg-shlibdeps -O \
 			-Sdebian/ure/$(OOUREDIR)/lib \
 			$(SOURCE_TREE)/sdext/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/PresenterScreen.uno.so \
 			> debian/openoffice.org$(VER)-presenter-screen.substvars
 endif
 ifeq "$(ENABLE_PDFIMPORT)" "y"
-	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
+	 LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program" \
 	 	dpkg-shlibdeps -O \
 			-Sdebian/ure/$(OOUREDIR)/lib \
 			$(SOURCE_TREE)/xpdf/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/xpdfimport \
@@ -3011,7 +3011,7 @@
 	dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg -Nuno-libs3 -Nuno-libs3-dbg \
 		-Nopenoffice.org$(VER)-report-builder \
 		-Nopenoffice.org$(VER)-presentation-minimizer \
-		-Nopenoffice.org$(VER)-presenter-screen \
+		-Nopenoffice.org$(VER)-presenter-console \
 		-Nopenoffice.org$(VER)-pdfimport \
 		-Nopenoffice.org$(VER)-sdbc-postgresql -- \
 		-V"ure:Version=$(shell grep -A 1 "PRODUCTNAME URE" $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | tail -n 1 | awk '{ print $$2 }')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`" \
@@ -3048,10 +3048,10 @@
 endif
 ifeq "$(ENABLE_MINIMIZER)" "y"
 	dh_gencontrol -popenoffice.org$(VER)-presentation-minimizer -- \
-		-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
+		-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
 endif
 ifeq "$(ENABLE_PRESENTER_SCREEN)" "y"
-	dh_gencontrol -popenoffice.org$(VER)-presenter-screen -- \
+	dh_gencontrol -popenoffice.org$(VER)-presenter-console -- \
 		-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/presenter/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
 endif
 	dh_gencontrol -popenoffice.org$(VER)-sdbc-postgresql -- \

Reply to:

Prev by Date: Bug#490138: writer2latex: postinst calls unavailable update- commands
Next by Date: Processed: severity of 490138 is serious
Previous by thread: Bug#490138: marked as done (writer2latex: postinst calls unavailable update- commands)
Next by thread: Processed: severity of 490138 is serious
Index(es):
- Date
- Thread