------------------------------------------------------------ revno: 1646 committer: Rene Engelhard <r...@debian.org> branch nick: experimental timestamp: Mon 2009-08-24 17:29:00 +0200 message: fix changelog; rc2 == final; fix header modified: changelog rules
=== modified file 'changelog' --- a/changelog 2009-08-24 07:55:33 +0000 +++ b/changelog 2009-08-24 15:29:00 +0000 @@ -1,8 +1,14 @@ -openoffice.org (1:3.1.1~rc2-2) experimental; urgency=low +openoffice.org (1:3.1.1-1) UNRELEASED; urgency=low + + * OpenOffice.org 3.1.1 final release. + * upload to unstable * ooo-build: - - update (55803b53518d5af40836aefbc31a531fe421b9e3) - - new-sqllen.diff: fix ODBC libs for "new" SQLLEN (closes: #539642) + - update (082b8207644675ef5de736ff6a930597253597b4) + - new-SQLLEN.diff: fix ODBC libs for "new" SQLLEN (closes: #539642) + + * debian/rules: + - use upstreams tarballs -- Rene Engelhard <r...@debian.org> Mon, 17 Aug 2009 02:50:51 +0200
=== modified file 'rules' --- a/rules 2009-08-21 00:59:21 +0000 +++ b/rules 2009-08-24 15:29:00 +0000 @@ -65,8 +65,8 @@ MWS=OOO310 #MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e s/$(shell echo $(MWS) | tr A-Z a-z)//) MILESTONE=m19 -TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) -#TAG=$(MWS)_$(MILESTONE) +#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE) +TAG=$(MWS)_$(MILESTONE) OOO_BUILD_BRANCH=ooo-build-3-1-1 SOURCE_TREE=ooo-build/build/$(TAG) STAMP_DIR=debian/stampdir @@ -226,7 +226,7 @@ endif # "new" source split? This is to be n when to use # Suns tarballs. -WITH_SPLIT=y +WITH_SPLIT=n ENABLE_GRAPHITE=n USE_SYSTEM_GRAPHITE=y ALLOC=system