./packages/openofficeorg/3.1/experimental r1406: OOO310_m1; merge
------------------------------------------------------------
revno: 1406
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2009-02-14 11:08:03 +0100
message:
OOO310_m1; merge
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.65
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2009-02-06 00:21:46 +0100
message:
update ooo-build; target unstable; make writer Recommend math
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.66
committer: Chris Halls <chris@thehalls.de>
branch nick: debian
timestamp: Thu 2009-02-12 17:09:53 +0000
message:
Add changelog entry for ooo-build/patches/dev300/sfx2-recent-files.diff:
Update recent files list after save as and open (closes: #505879)
modified:
changelog
------------------------------------------------------------
revno: 1332.1.67
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2009-02-12 23:59:36 +0100
message:
support noopt
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-02-01 15:58:43 +0000
+++ b/changelog 2009-02-14 10:08:03 +0000
@@ -1,6 +1,6 @@
-openoffice.org (1:3.1.0~dev300m40-0.1pre) experimental; urgency=low
+openoffice.org (1:3.1.0~ooo310m1-0.1pre) experimental; urgency=low
- * OpenOffice.org 3.1.0 development snapshot m40
+ * OpenOffice.org 3.1.0 development snapshot OOO310_m1
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
- now has overline supports for word (closes: #228392)
@@ -9,7 +9,7 @@
- doesn't decrement date on input to 1 day past on some $TZ anymore
(closes: #512644)
* ooo-build:
- - back on trunk (r15264)
+ - back on trunk (r15332)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -37,17 +37,27 @@
* debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
fixed
- -- Rene Engelhard <rene@debian.org> Sun, 01 Feb 2009 16:52:40 +0100
-
-openoffice.org (1:3.0.1-1.2pre) experimental; urgency=low
-
+ -- Rene Engelhard <rene@debian.org> Fri, 13 Feb 2009 21:45:54 +0100
+
+openoffice.org (1:3.0.1-1.2pre) unstable; urgency=low
+
+ [ Rene Engelhard ]
+ * upload to unstable
* ooo-build:
- - update (r15225)
+ - update (r15324)
* debian/openoffice.org-common.links: add symlinks to the mimetype icons so
that they adhere to the Icon Naming Specification, thanks Guido Günther
(closes: #512792)
-
- -- Rene Engelhard <rene@debian.org> Sat, 31 Jan 2009 12:17:28 +0100
+ * debian/rules:
+ - add Recommends openoffice.org-math to openoffice.org-writer
+ - specify ARCH_FLAGS as -O0 when DEB_BULD_OPTIONS contains noopt
+ (closes: #514166)
+
+ [ Chris Halls ]
+ * ooo-build/patches/dev300/sfx2-recent-files.diff:
+ Update recent files list after save as and open (closes: #505879)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 12 Feb 2009 23:34:10 +0100
openoffice.org (1:3.0.1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-02-01 15:58:43 +0000
+++ b/control 2009-02-14 10:08:03 +0000
@@ -144,7 +144,7 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge, openoffice.org-math
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
=== modified file 'control.in'
--- a/control.in 2009-01-25 18:34:31 +0000
+++ b/control.in 2009-02-14 10:08:03 +0000
@@ -322,7 +322,7 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge, openoffice.orgVER-math
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
=== modified file 'rules'
--- a/rules 2009-02-01 16:57:01 +0000
+++ b/rules 2009-02-14 10:08:03 +0000
@@ -63,7 +63,7 @@
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
-MWS=DEV300
+MWS=OOO310
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)
@@ -463,6 +463,10 @@
CONFIGURE_FLAGS += --enable-symbols=SMALL
endif
+ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ ARCH_FLAGS += -O0
+endif
+
ifeq "$(BUILD_PYUNO)" "y"
ifeq "$(USE_PYCENTRAL)" "y"
BUILD_DEPS += , python-central (>= 0.5)
@@ -1535,7 +1539,7 @@
fi
endif
- cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true $(MAKE)
+ cd ooo-build ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) $(MAKE)
if [ -d ooo-build/build/current -a ! -d $(SOURCE_TREE) ]; then \
ln -sf current $(SOURCE_TREE); \
@@ -2251,15 +2255,6 @@
cd $(PKGDIR)-dev/$(OOSDKDIR) && \
rm docs
- # create .so symlinks upstream doesn't create (see i#97041).
- # we do it here so that we don't need to patch the SDKs
- # "deployment dir". The -L for the URE dir is added anyway.
- mkdir -p $(PKGDIR)-dev/$(OOUREDIR)/lib
- cd $(PKGDIR)-dev/$(OOUREDIR)/lib && \
- for i in cppu cppuhelpergcc3 sal salhelpergcc3; do \
- ln -s /$(OOUREDIR)/lib/libuno_$${i}.so.3 libuno_$${i}.so; \
- done
-
# install gsicheck into -dev
install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
Reply to: