------------------------------------------------------------ revno: 1594 committer: Rene Engelhard <[email protected]> branch nick: experimental timestamp: Sun 2009-06-14 13:56:57 +0200 message: start 3.1.1 work modified: changelog rules
=== modified file 'changelog' --- a/changelog 2009-06-13 21:37:36 +0000 +++ b/changelog 2009-06-14 11:56:57 +0000 @@ -1,3 +1,15 @@ +openoffice.org (1:3.1.1~ooo310m13-1) UNRELEASED; urgency=low + + * OpenOffice.org 3.1.1 development milestone 13 (OOO310_m13) + + * ooo-build: + - use 'master' again (ec9dd01cf99da0cde1be3426fde8514526a42418) + + * debian/rules: + - WITH_SPLIT=n, enable milestone detection again, use ooo-build tarballs + + -- Rene Engelhard <[email protected]> Sat, 13 Jun 2009 23:20:33 +0200 + openoffice.org (1:3.1.0-6) UNRELEASED; urgency=low * debian/control.in:
=== modified file 'rules' --- a/rules 2009-06-13 20:57:14 +0000 +++ b/rules 2009-06-14 11:56:57 +0000 @@ -63,11 +63,11 @@ unexport LS_COLORS MWS=OOO310 -#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//) -MILESTONE=m11 -#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) -TAG=$(MWS)_$(MILESTONE) -OOO_BUILD_BRANCH=ooo-build-3-1 +MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//) +#MILESTONE=m11 +TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) +#TAG=$(MWS)_$(MILESTONE) +#OOO_BUILD_BRANCH=ooo-build-3-1 SOURCE_TREE=ooo-build/build/$(TAG) STAMP_DIR=debian/stampdir @@ -212,7 +212,7 @@ endif # "new" source split? This is to be n when to use # Suns tarballs. -WITH_SPLIT=n +WITH_SPLIT=y ENABLE_GRAPHITE=n USE_SYSTEM_GRAPHITE=y ALLOC=system
