------------------------------------------------------------
revno: 1808
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Thu 2010-01-07 00:16:54 +0100
message:
switch to own debian-3-1-1 branch
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-01-04 19:48:34 +0000
+++ b/changelog 2010-01-06 23:16:54 +0000
@@ -1,17 +1,19 @@
openoffice.org (1:3.1.1-13) UNRELEASED; urgency=medium
* ooo-build:
+ - swoitch to own debian-3-1-1 branch
- update (68c071fd1a3975cd7463723e4334c6ea1d345c48)
- backport fix for i107917: get data source correctly (closes: #553612)
* 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 00:16:17 +0100
openoffice.org (1:3.1.1-12) unstable; urgency=medium
=== modified file 'rules'
--- a/rules 2010-01-04 19:04:41 +0000
+++ b/rules 2010-01-06 23:16:54 +0000
@@ -67,7 +67,7 @@
MILESTONE=m19
#TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=ooo-build-3-1-1
+OOO_BUILD_BRANCH=debian-3-1-1
SOURCE_TREE=ooo-build/build/$(TAG)
STAMP_DIR=debian/stampdir
@@ -355,7 +355,7 @@
endif
ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
USE_SYSTEM_GRAPHITE=n
- USE_SYSTEM_MYSQLCPPCONN=n
+# USE_SYSTEM_MYSQLCPPCONN=n
endif
ifeq "$(ENABLE_OPENGL)" "y"
