./packages/openofficeorg/3.2.1/experimental r1961: prepare for m17 aka 3.2.1rc1 with Suns tarballs; update translations
------------------------------------------------------------
revno: 1961
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2010-05-07 13:22:57 +0200
message:
prepare for m17 aka 3.2.1rc1 with Suns tarballs; update translations
removed:
ooo_custom_images/
ooo_custom_images/dev_nologo_broffice/
ooo_custom_images/dev_nologo_broffice/introabout/
ooo_custom_images/dev_nologo_broffice/introabout/intro.png
added:
patches/m17.diff
modified:
changelog
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-05-04 00:50:10 +0000
+++ b/changelog 2010-05-07 11:22:57 +0000
@@ -1,11 +1,11 @@
-openoffice.org (1:3.2.1~ooo320m16-1) UNRELEASED; urgency=low
+openoffice.org (1:3.2.1~rc1-1) UNRELEASED; urgency=low
- * new upstream milestone
+ * OpenOffice.org 3.2.1 rc1 (aka OOO320_m17)
* ooo-build:
- update (3.2.0.99.3)
- * translation-updates-20100426: update GSIs from ftp.linux.cz
+ * translation-updates-20100506: update GSIs from ftp.linux.cz
* debian/patches/fix-system-mythes-for-mythes-1.2.diff: adapt build
for mythes 1.2
@@ -22,7 +22,7 @@
- build with external mythes
* debian/broffice.org.*: update diversions for new about.png
- -- Rene Engelhard <rene@debian.org> Wed, 28 Apr 2010 22:49:14 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 06 May 2010 18:17:37 +0200
openoffice.org (1:3.2.0-9) unstable; urgency=low
=== removed directory 'ooo_custom_images'
=== removed directory 'ooo_custom_images/dev_nologo_broffice'
=== removed directory 'ooo_custom_images/dev_nologo_broffice/introabout'
=== removed file 'ooo_custom_images/dev_nologo_broffice/introabout/intro.png'
Binary files a/ooo_custom_images/dev_nologo_broffice/introabout/intro.png 2010-04-22 00:06:33 +0000 and b/ooo_custom_images/dev_nologo_broffice/introabout/intro.png 1970-01-01 00:00:00 +0000 differ
=== added file 'patches/m17.diff'
--- a/patches/m17.diff 1970-01-01 00:00:00 +0000
+++ b/patches/m17.diff 2010-05-07 11:22:57 +0000
@@ -0,0 +1,24 @@
+diff --git a/configure.in b/configure.in
+index 40c232c..8edc91d 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-0-99-3/configure.in
++++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/configure.in
+@@ -1570,6 +1570,8 @@ elif test "$with_tag" = "OOO310_m18" ; then
+ UPSTREAM_VERSION=3.1.1
+ elif test "$with_tag" = "OOO320_m8" ; then
+ UPSTREAM_VERSION=3.2.0
++elif test "$with_tag" = "OOO320_m17" ; then
++ UPSTREAM_VERSION=3.2.1
+ fi
+ if test -n "$UPSTREAM_VERSION"; then
+ UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
+--- openoffice.org-3.2.1/ooo-build-3-2-0-99-3/configure-old 2010-05-06 19:04:46.000000000 +0200
++++ openoffice.org-3.2.1/ooo-build-3-2-0-99-3/configure 2010-05-06 19:05:03.000000000 +0200
+@@ -7371,6 +7371,8 @@
+ UPSTREAM_VERSION=3.1.1
+ elif test "$with_tag" = "OOO320_m8" ; then
+ UPSTREAM_VERSION=3.2.0
++elif test "$with_tag" = "OOO320_m17" ; then
++ UPSTREAM_VERSION=3.2.1
+ fi
+ if test -n "$UPSTREAM_VERSION"; then
+ UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
=== modified file 'rules'
--- a/rules 2010-05-04 00:50:10 +0000
+++ b/rules 2010-05-07 11:22:57 +0000
@@ -66,8 +66,8 @@
unexport LS_COLORS
MWS=OOO320
-MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
-#MILESTONE=m15
+#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//)
+MILESTONE=m17
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-2
@@ -245,7 +245,7 @@
endif
# "new" source split? This is to be n when to use
# Suns tarballs.
-WITH_SPLIT=y
+WITH_SPLIT=n
ENABLE_GRAPHITE=y
USE_SYSTEM_GRAPHITE=y
ALLOC=system
@@ -3014,7 +3014,7 @@
done
t=`mktemp -q`.bmp ; \
if dpkg-parsechangelog | grep urgency | egrep -q "\~.*m[0123456789]+"; then \
- convert debian/ooo_custom_images/dev_nologo_broffice/introabout/intro.png $$t && \
+ convert $(SOURCE_TREE)/ooo_custom_images/dev_nologo_broffice/introabout/intro.png $$t && \
debian/scripts/fix_bmp_rgb \
$$t \
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/intro.bmp; \
=== modified file 'source/components'
--- a/source/components 2010-04-29 06:59:45 +0000
+++ b/source/components 2010-05-07 11:22:57 +0000
@@ -1,3 +1,3 @@
ooo-build-3-2-0-99-3
ext-sources-ooo-build-3-2-0-99-3
-translation-updates-20100426
+translation-updates-20100506
Reply to: