------------------------------------------------------------
revno: 1379
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Mon 2009-01-19 16:50:30 +0100
message:
3.0.1 final...
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-19 01:32:14 +0000
+++ b/changelog 2009-01-19 15:50:30 +0000
@@ -1,13 +1,16 @@
-openoffice.org (1:3.0.1~rc2-1.2pre) experimental; urgency=low
+openoffice.org (1:3.0.1-0.1pre) experimental; urgency=low
- * merge from Ubuntu:
- - make ure only Suggest a JRE
+ * OpenOffice.org 3.0.1 final
+ * ooo-build:
+ - update (r15097)
* debian/rules:
- update xulrunner build-dep in MOZILLA=libxul case for current reality
* debian/control.in:
- make -common conflict against dictionaries-common (<< 0.98.14)
+ * merge from Ubuntu:
+ - make ure only Suggest a JRE
- -- Rene Engelhard <r...@debian.org> Mon, 19 Jan 2009 02:28:49 +0100
+ -- Rene Engelhard <r...@debian.org> Mon, 19 Jan 2009 16:13:35 +0100
openoffice.org (1:3.0.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-15 06:42:02 +0000
+++ b/rules 2009-01-19 15:50:30 +0000
@@ -66,8 +66,8 @@
MWS=OOO300
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
MILESTONE=m15
-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-0-1
ifeq "" "$(OOO_BUILD_BRANCH)"
OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/trunk
@@ -205,7 +205,7 @@
USE_SCSOLVER=n
# "new" source split? This is to be n when to use
# Suns tarballs.
-WITH_SPLIT=y
+WITH_SPLIT=n
# when we have a package we want to have to be installed on older things with
some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this.
Don't touch
