r859 ./packages/openofficeorg/2.3/experimental: m2; make opennoffice.org depend on openoffice.org-officebean; remove RID_STR_EXTENSION_NOT_PRESENT; bump HELP_L10N_VIRTUAL_VERSION to 2.3; make -qa-tools conflict against openoffice.org-core (<< 1:2.3.0~oog680m2); update GSIs; mention gdk hang fix

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 859
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-08-21 19:39:50 +0200
message:
  m2; make opennoffice.org depend on openoffice.org-officebean; remove RID_STR_EXTENSION_NOT_PRESENT; bump HELP_L10N_VIRTUAL_VERSION to 2.3; make -qa-tools conflict against openoffice.org-core (<< 1:2.3.0~oog680m2); update GSIs; mention gdk hang fix
modified:
  changelog
  control
  control.in
  control.qa.in
  rules

=== modified file 'changelog'
--- a/changelog	2007-08-16 22:53:22 +0000
+++ b/changelog	2007-08-21 17:39:50 +0000
@@ -1,12 +1,28 @@
-openoffice.org (1:2.3.0~oog680m1-1.2pre) experimental; urgency=low
+openoffice.org (1:2.3.0~oog680m2-0.1pre) experimental; urgency=high
 
+  * new upstream snapshot (OOG680_m2)
+    - doesn't "translate" function names into german in hebrew calc anymore
+      (closes: #365964)
+  * ooo-build:
+    - update (r10106)
+      - ooo59127.vcl.honourcairofont.diff: fix for gdk hang. [CC]
+        (closes: #433870)
+    - src: update GSIs from ftp.linux.cz: bg cs et fi gl sl vi
   * debian/control.in:
     - fix libpq-dev builddep, thanks calc
+    - make the openoffice.org metapackage depend on openoffice.org-officebean as
+      the officebean is a "standard part of the office"
+  * debian/control.qa.in:
+    - make -qa-tools conflict against openoffice.org-core (<< 1:2.3.0~oog680m2) as m1 breaks
+      the testtool and it's already uploaded..
   * debian/rules:
     - remove some more occurances of conditionals I missed to remove
       in 2.3.0~src680m225-1
+    - remove RID_STR_EXTENSION_NOT_PRESENT translation from the GSIs so that
+      it is not merged (we changed the string)
+    - bump HELP_L10N_VIRTUAL_VERSION to 2.3
 
- -- Rene Engelhard <rene@debian.org>  Fri, 17 Aug 2007 00:38:11 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 21 Aug 2007 19:34:35 +0200
 
 openoffice.org (1:2.3.0~oog680m1-1) experimental; urgency=low
 

=== modified file 'control'
--- a/control	2007-08-16 22:53:22 +0000
+++ b/control	2007-08-21 17:39:50 +0000
@@ -12,7 +12,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, ${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+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, openoffice.org-officebean, java-gcj-compat | j2re1.4 | java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
 Conflicts: openoffice.org2 (<< ${Source-Version})
 Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
@@ -2892,6 +2892,7 @@
 Priority: extra
 Depends: openoffice.org (>> ${base-version}), openoffice.org-filter-so52, openoffice.org-java-common
 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 amd64 ppc64
 Description: OpenOffice.org Automatic Test Programs

=== modified file 'control.in'
--- a/control.in	2007-08-16 22:53:22 +0000
+++ b/control.in	2007-08-21 17:39:50 +0000
@@ -66,6 +66,7 @@
  openoffice.orgVER-draw,
  openoffice.orgVER-math,
  openoffice.orgVER-base,
+ openoffice.orgVER-officebean,
  ${ooo-binfilter-dep},
  openoffice.orgVER-filter-mobiledev,
  ${java-common-depends}

=== modified file 'control.qa.in'
--- a/control.qa.in	2006-08-27 00:52:25 +0000
+++ b/control.qa.in	2007-08-21 17:39:50 +0000
@@ -6,6 +6,7 @@
  openoffice.orgVER-java-common
 Recommends: openoffice.orgVER-qa-api-tests,
  openoffice.orgVER-qa-ui-tests
+Conflicts: openoffice.org-core (<< 1:2.3.0~oog680m2)
 Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
 Architecture: %OOO_ARCHS%
 Description: OpenOffice.org Automatic Test Programs

=== modified file 'rules'
--- a/rules	2007-08-16 22:53:22 +0000
+++ b/rules	2007-08-21 17:39:50 +0000
@@ -22,8 +22,8 @@
 SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
 UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
 BASE_VERSION:=$(UPSTREAM_VERSION)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=2.2
+#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
+HELP_L10N_VIRTUAL_VERSION:=2.3
 
 BINARY_VERSION=$(SOURCE_VERSION)
 #BINARY_VERSION=2.2.0-$(shell dpkg-parsechangelog  | grep urgency \
@@ -57,7 +57,7 @@
 MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
 # For SRC680 milestones, use only ~mX
 #MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2)//)
-#MILESTONE=m1
+#MILESTONE=m2
 TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
 #TAG=$(MWS)_$(MILESTONE)
 #OOO_BUILD_BRANCH=ooo-build-2-3
@@ -1202,6 +1202,13 @@
 	  grep -v OOO_LICENSE ooo-build/src/GSI_$$iso.sdf \
 	    > $$TMP && mv $$TMP ooo-build/src/GSI_$$iso.sdf; \
 	done
+	# we change the message, and those translations therefore don't match anymore.
+	for iso in $(LANGPACKISOS); do \
+	  [ -f ooo-build/src/GSI_$$iso.sdf ] || continue; \
+	  TMP=`mktemp -q`; \
+	  grep -v RID_STR_EXTENSION_NOT_PRESENT ooo-build/src/GSI_$$iso.sdf \
+	    > $$TMP && mv $$TMP ooo-build/src/GSI_$$iso.sdf; \
+	done
     ifeq (he,$(findstring he,$(LANGPACKISOS)))
 	# TKOS_BUILD_DATE is bogus, too
 	if [ -f ooo-build/src/GSI_he.sdf ]; then \
@@ -2033,6 +2040,15 @@
 	# the *rpt* stuff is a no-op.
 	install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
 		$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
+	# unneeded license files
+	perl -e 'use Archive::Zip;
+		$$zip=Archive::Zip->new("$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt");
+		$$members = $$zip->members();
+		$$zip->removeMember( "THIRDPARTYREADMELICENSE.html" );
+		$$zip->removeMember( "license_en-US.html" );
+		$$zip->removeMember( "readme_en-US.html" );
+		$$zip->removeMember( "readme_en-US.txt" );
+		$$zip->writeToFileNamed("$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt");'
 endif
 
 	rm -rf $(PKGDIR)-sdbc-postgresql