------------------------------------------------------------
revno: 1663
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2009-09-04 15:19:03 +0200
message:
adapt for libmysqlcppconn-stlport-dev, fix parallel=X, regen control
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-08-30 18:24:18 +0000
+++ b/changelog 2009-09-04 13:19:03 +0000
@@ -2,9 +2,12 @@
[ Rene Engelhard ]
* ooo-build:
- - update (9c418d97049f8f3380518cf6cac166d518cae388)
+ - update (62b71445f871e042403f2959cf339b9f2d12af9d)
* debian/rules:
- - bump libmysqlcppconn-dev builddep for new snapshot of mysqlnative
+ - bump libmysqlcppconn-dev builddep for new snapshot of mysqlnative and
adapt
+ for STLport flavour
+ - fix parallel=X handling to actually works, thanks to Wouter Verhelst for
+ pointing it out
* debian/control.mysql.in:
- remove conflicts against OOo >= 3.3
@@ -18,8 +21,8 @@
debian/control.minimizer.in, debian/control.mysql.in,
debian/control.postgresql.in, debian/control.presenter.in:
- drop the fileds inherited from source package
-
- -- Rene Engelhard <r...@debian.org> Fri, 28 Aug 2009 09:06:36 +0200
+
+ -- Rene Engelhard <r...@debian.org> Fri, 04 Sep 2009 15:17:00 +0200
openoffice.org (1:3.1.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-08-28 06:58:47 +0000
+++ b/control 2009-09-04 13:19:03 +0000
@@ -62,7 +62,6 @@
* libpaper-utils: papersize detection support via paperconf
Package: broffice.org
-Section: editors
Priority: extra
Architecture: all
Depends: openoffice.org, openoffice.org-l10n-pt-br, openoffice.org-help-pt-br,
myspell-pt-br, ${misc:Depends}
@@ -76,7 +75,6 @@
Package: openoffice.org-l10n-za
Section: localization
-Priority: optional
Architecture: all
Depends: openoffice.org-l10n-af, openoffice.org-l10n-en-za,
openoffice.org-l10n-nr, openoffice.org-l10n-ns, openoffice.org-l10n-ss,
openoffice.org-l10n-st, openoffice.org-l10n-tn, openoffice.org-l10n-ts,
openoffice.org-l10n-ve, openoffice.org-l10n-xh, openoffice.org-l10n-zu,
${misc:Depends}
Description: full-featured office productivity suite -- South African language
packages
@@ -88,7 +86,6 @@
Package: openoffice.org-l10n-in
Section: localization
-Priority: optional
Architecture: all
Depends: openoffice.org-l10n-as-in, openoffice.org-l10n-bn,
openoffice.org-l10n-gu-in, openoffice.org-l10n-hi-in,
openoffice.org-l10n-ml-in, openoffice.org-l10n-mr-in,
openoffice.org-l10n-or-in, openoffice.org-l10n-pa-in,
openoffice.org-l10n-ta-in, openoffice.org-l10n-te-in, ${misc:Depends}
Recommends: ttf-indic-fonts
@@ -3293,7 +3290,6 @@
Package: openoffice.org-wiki-publisher
Section: misc
-Priority: optional
Architecture: all
Pre-Depends: openoffice.org-java-common (>= 1:2.4.0), ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, openoffice.org-core (>= 1:2.4.0-6),
${lucene-depends}, ${misc:Depends}
@@ -3341,7 +3337,6 @@
Package: openoffice.org-presentation-minimizer
Section: misc
-Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.3),
openoffice.org-impress, ${misc:Depends}
@@ -3361,7 +3356,6 @@
Package: openoffice.org-presenter-console
Section: misc
-Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
@@ -3499,7 +3493,6 @@
Package: openoffice.org-sdbc-postgresql
Section: misc
-Priority: optional
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Pre-Depends: openoffice.org-common
Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
=== modified file 'rules'
--- a/rules 2009-08-30 14:54:59 +0000
+++ b/rules 2009-09-04 13:19:03 +0000
@@ -242,9 +242,7 @@
IMAGES:=$(DEFAULT_IMAGE) industrial crystal hicontrast tango oxygen classic
ENABLE_MYSQLNATIVE=n
USE_SYSTEM_MYSQLCLIENT=y
-ifneq "$(USE_STLPORT)" "y"
- USE_SYSTEM_MYSQLCPPCONN=y
-endif
+USE_SYSTEM_MYSQLCPPCONN=y
# Default flags to pass to configure of ooo-build
CONFIGURE_FLAGS= --disable-post-install-scripts \
@@ -930,7 +928,7 @@
endif
ifeq "$(USE_SYSTEM_MSQLCPPCONN)" "y"
CONFIGURE_FLAGS += --with-system-mysql-cppconn
- BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))]
+ BUILD_DEPS += , libmysqlcppconn-dev (>= 1.0.6~r768) [$(filter-out
$(OOO_STLPORT_ARCHS),$(OOO_ARCHS)))], libmysqlcppconn-stlport-dev
[$(OOO_STLPORT_ARCHS)]
endif
endif
@@ -1062,7 +1060,7 @@
# Build n projects in parallel?
# DEB_BUILD_OPTIONS=parallel=<n>
-NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^\(.*,\)\?parallel=\([0-9]\+\).*$$/\2/p')
+NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS)," | sed -n
's/^\(.*\s\)\?parallel=\([0-9]\+\).*/\2/p')
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
