------------------------------------------------------------
revno: 1757 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Thu 2010-01-07 20:54:35 +0100
message:
merge; update ooo-build
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-01-06 00:05:30 +0000
+++ b/changelog 2010-01-07 19:54:35 +0000
@@ -2,7 +2,8 @@
* ooo-build:
- switch to ooo-build-3-2 branch
- - update (1f08c7354e05f6f640d5b0fd0dc0909f4ae68be8)
+ - update (973e7016a0986a3b0418fb098594b1ae71bdb000)
+ - backport fix for i107917: get data source correctly (closes: #553612)
* debian/control.in:
- actually fix Vcs-Bzr:
@@ -13,22 +14,23 @@
* merge 1:3.1.1-12 and -13
- -- Rene Engelhard <r...@debian.org> Tue, 22 Dec 2009 23:07:22 +0100
+ -- Rene Engelhard <r...@debian.org> Thu, 07 Jan 2010 20:52:04 +0100
openoffice.org (1:3.1.1-13) UNRELEASED; urgency=medium
* ooo-build:
- - update (68c071fd1a3975cd7463723e4334c6ea1d345c48)
- - backport fix for i107917: get data source correctly (closes: #553612)
+ - switch to own debian-3-1-1 branch
+ - update (6feb90398c1e18eb4951af3c1be4f4d4c8e6861a)
* debian/rules:
- actually also remove armel from OOO_JAVA_ARCHS and OOO_MOZILLA_ARCHS;
remobe stray arm from OOO_MOZILLA_ARCHS
- - temporarily disable -gcj to get a chance to get into testing fast
+ - temporarily disable -gcj to get a chance to get into testing
+ (gcc-defaults is blocked)
- per request from the security team: use internal mysqlcppconn for
all archs (consistency), instead of only for i386
- -- Rene Engelhard <r...@debian.org> Mon, 04 Jan 2010 20:46:56 +0100
+ -- Rene Engelhard <r...@debian.org> Thu, 07 Jan 2010 20:45:52 +0100
openoffice.org (1:3.1.1-12) unstable; urgency=medium
=== modified file 'rules'
--- a/rules 2010-01-06 00:05:30 +0000
+++ b/rules 2010-01-07 19:54:35 +0000
@@ -355,10 +355,10 @@
ifeq "$(ARCH)" "i386"
USE_STLPORT=y
endif
-ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
- USE_SYSTEM_GRAPHITE=n
- USE_SYSTEM_MYSQLCPPCONN=n
-endif
+#ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
+# USE_SYSTEM_GRAPHITE=n
+# USE_SYSTEM_MYSQLCPPCONN=n
+#endif
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on arm(el) and mips(el), does it? :)
