./packages/openofficeorg/3.2/experimental r1702: update for m6 (also reenable all langs as l10n is now merged) and ooo-build

[Rene Engelhard <rene@debian.org>]

------------------------------------------------------------
revno: 1702
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Thu 2009-11-26 17:09:43 +0100
message:
  update for m6 (also reenable all langs as l10n is now merged) and ooo-build
modified:
  changelog
  rules

=== modified file 'changelog'
--- a/changelog	2009-11-23 22:48:05 +0000
+++ b/changelog	2009-11-26 16:09:43 +0000
@@ -1,3 +1,16 @@
+openoffice.org (1:3.2.0~ooo320m6-1) UNRELEASED; urgency=low
+
+  * OpenOffice.org 3.2.0 release branch milestone 6
+
+  * ooo-build
+    - update (23789644f337067b2c560d9bf35ca0ac56a11a65)
+      - cws-linuxhppa1.diff: backport hppa port (closes: #484116)
+
+  * debian/rules:
+    - enable l10n again (closes: #558030)
+
+ -- Rene Engelhard <rene@debian.org>  Mon, 23 Nov 2009 21:27:01 +0100
+
 openoffice.org (1:3.2.0~beta-2) experimental; urgency=low
 
   * ooo-build:

=== modified file 'rules'
--- a/rules	2009-11-23 20:11:18 +0000
+++ b/rules	2009-11-26 16:09:43 +0000
@@ -63,8 +63,8 @@
 unexport LS_COLORS
 
 MWS=OOO320
-#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f3 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m2
+MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
+#MILESTONE=m6
 TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
 #TAG=$(MWS)_$(MILESTONE)
 #OOO_BUILD_BRANCH=ooo-build-3-2
@@ -101,7 +101,7 @@
  endif
 endif
 BUILD_BINFILTERS=y
-BUILD_ONLY_EN_US=y
+BUILD_ONLY_EN_US=n
 ENABLE_JAVA=y
 JDK=openjdk
 ifeq "$(ARCH)" "ia64"