------------------------------------------------------------
revno: 2099
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2010-09-16 21:23:56 +0200
message:
update to 3.2.98.1 and fix SOURCE_TREE for new build dir
modified:
changelog
rules
source/components
=== modified file 'changelog'
--- a/changelog 2010-09-14 18:51:46 +0000
+++ b/changelog 2010-09-16 19:23:56 +0000
@@ -6,7 +6,7 @@
* ooo-build:
- back to master
- - use git (for now) again: 873f1abc092a8be9303c8e27e7b8471e29a34ce6
+ - use 3.2.98.1 release
- use new ooo-build build insfrastructure
* debian/control.in:
@@ -54,7 +54,7 @@
extensions in /usr/lib/openoffice/share/extensions have been
installed/updated
- -- Rene Engelhard <r...@debian.org> Tue, 14 Sep 2010 20:47:45 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 16 Sep 2010 16:38:45 +0200
openoffice.org (1:3.2.1-6) unstable; urgency=high
=== modified file 'rules'
--- a/rules 2010-09-16 13:03:36 +0000
+++ b/rules 2010-09-16 19:23:56 +0000
@@ -72,13 +72,12 @@
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-3
-OOO_BUILD_VERSION=873f1abc092a8be9303c8e27e7b8471e29a34ce6
+OOO_BUILD_VERSION=3.2.98.1
# in ooo-build releases the same as OOO_BUILD_VERSION
-#OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
-OOO_BUILD_TARBALL_VERSION=3.2.98.0
-OOO_BUILD_TAG=
+OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
+OOO_BUILD_TAG=OOO_BUILD_3_2_98_1
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
-SOURCE_TREE=$(OOO_BUILD_TREE)/build/$(TAG)
+SOURCE_TREE=$(OOO_BUILD_TREE)/build/ooo-build-$(OOO_BUILD_TARBALL_VERSION)
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
export TARFILE_LOCATION
=== modified file 'source/components'
--- a/source/components 2010-09-14 18:29:48 +0000
+++ b/source/components 2010-09-16 19:23:56 +0000
@@ -1,5 +1,5 @@
ext-sources
-archive-ooo-build-873f1abc092a8be9303c8e27e7b8471e29a34ce6
-ooo-build-873f1abc092a8be9303c8e27e7b8471e29a34ce6
-ext-sources-ooo-build-873f1abc092a8be9303c8e27e7b8471e29a34ce6
+archive-ooo-build-3-2-98-1
+ooo-build-3-2-98-1
+ext-sources-3-2-98-1
translation-updates-20100529
