------------------------------------------------------------
revno: 1278
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-10-10 15:21:16 +0200
message:
update for 3.0.0 final and upstream packages; update ooo-build
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.173
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Fri 2008-10-10 09:42:57 +0200
message:
-11
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-10-09 04:49:09 +0000
+++ b/changelog 2008-10-10 13:21:16 +0000
@@ -1,13 +1,16 @@
-openoffice.org (1:3.0.0~rc4-1.2pre) experimental; urgency=low
+openoffice.org (1:3.0.0-0.1pre) experimental; urgency=low
+ * OpenOffice.org 3.0.0 final
* ooo-build
- - update (r14245)
+ - update (r14278)
+ - system-python-ure-bootstrap.diff: set URE_BOOTSTRAP variable if not
+ there with system-python, thanks Daniel Watkins (closes: #501028)
* debin/rules:
- remove now obsolete ADDITIONAL_SECTIONS="DebianBaseSystem*"
- build against KDE3 again. In contrast to building against KDE4 it works
in runtime (and also works with KDE4)
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 09 Oct 2008 06:47:59 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 10 Oct 2008 15:18:23 +0200
openoffice.org (1:3.0.0~rc4-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-10-09 04:49:09 +0000
+++ b/rules 2008-10-10 13:21:16 +0000
@@ -55,7 +55,7 @@
# debhelper
export DH_OPTIONS
-export DH_ALWAYS_EXCLUDE=CVS
+export DH_ALWAYS_EXCLUDE=CVS:.svn:.bzr
#export DH_VERBOSE=1
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
@@ -64,8 +64,8 @@
MWS=OOO300
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
MILESTONE=m9
-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
ifeq "" "$(OOO_BUILD_BRANCH)"
OOO_BUILD_SVN=svn://svn.gnome.org/svn/ooo-build/trunk
@@ -187,10 +187,10 @@
PACKAGE_NPSOPLUGIN=y
endif
# y means Koheis solver
-USE_SCSOLVER=n
+USE_SCSOLVER=y
# "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
