------------------------------------------------------------
revno: 980
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-01-27 12:17:11 +0100
message:
merge from 2.3
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 901.1.89
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-01-06 19:11:02 +0100
message:
ooo-build update; minor merge from 2.4 and Ubuntu
added:
openoffice.org-base-core.overrides.lintian
modified:
changelog
rules
------------------------------------------------------------
revno: 901.1.90
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-01-15 18:45:02 +0100
message:
ooo-build update; typo
modified:
changelog
------------------------------------------------------------
revno: 901.1.91
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-01-15 18:50:06 +0100
message:
merge xml-apis fix from 2.4
modified:
changelog
rules
------------------------------------------------------------
revno: 901.1.92
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-01-24 12:59:26 +0100
message:
another missing epoch
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 901.1.93
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-01-25 10:12:20 +0100
message:
make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-01-26 22:52:46 +0000
+++ b/changelog 2008-01-27 11:17:11 +0000
@@ -60,6 +60,9 @@
OOo now contains the DejaVu fonts. Closes: #461279
- add USE_SYSTEM_JFREEREPORT conditional
- build-depend on flex-old instead of flex, see Issue 85508
+ - another Replaces: (-core) missed the epoch, thanks Chris Cheney
+ - make openoffice.org-writer conflict against -java-common (<< 1:2.3.1)
+ (closes: #462477)
* debian/control.ogltrans.in:
- depend on openoffice.orgVER-core and openoffice.orgVER-impress
>> 2.4.0~m237
@@ -70,8 +73,10 @@
* merge from Ubuntu:
- debian/rules:
+ Use java-runtime-depends variable for java dependencies.
+ + make -gcj depend on libhsqldb-java-gcj
+ + some minor parallel build conditional improvements
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 26 Jan 2008 23:47:15 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Jan 2008 12:16:11 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-01-26 22:52:46 +0000
+++ b/control 2008-01-27 11:17:11 +0000
@@ -105,7 +105,7 @@
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114,
openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome,
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
-Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2)
+Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
1:2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2)
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -145,7 +145,7 @@
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}, ${writer-w2l-dep}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}
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 (<= 2.2.0-4)
+Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${Source-Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
Suggests: openoffice.org-gcj, openoffice.org-base
Description: OpenOffice.org office suite - word processor
=== modified file 'control.in'
--- a/control.in 2008-01-21 12:34:58 +0000
+++ b/control.in 2008-01-27 11:17:11 +0000
@@ -241,7 +241,7 @@
openoffice.org-java,
openoffice.org2-hunspell,
openoffice.org-hunspell,
- openoffice.org-common (<< 2.3.1),
+ openoffice.org-common (<< 1:2.3.1),
openoffice.org-calc (<< 2.2.1~oof680m15-2)
Description: OpenOffice.org office suite architecture dependent files
OpenOffice.org is a full-featured office productivity suite that provides
@@ -324,7 +324,7 @@
openoffice.org-common (<< 1:2.3.1)
Conflicts: openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
- openoffice.org-java-common (<= 2.2.0-4)
+ openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
Suggests: openoffice.orgVER-gcj,
openoffice.orgVER-base
=== modified file 'rules'
--- a/rules 2008-01-26 22:52:46 +0000
+++ b/rules 2008-01-27 11:17:11 +0000
@@ -727,6 +727,9 @@
BUILD_DEPS += , libhsqldb-java (>= 1.8.0.9-1) [$(OOO_JAVA_ARCHS)]
BASE_HSQLDB_DEPENDS = libhsqldb-java (>= 1.8.0.9-1)
CONFIGURE_FLAGS+= --with-system-hsqldb
+ ifneq "$(ETCH_BACKPORT)" "y"
+ JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
+ endif
endif
ifeq "$(USE_SYSTEM_BSH)" "y"
BUILD_DEPS += , bsh (>= 2.0b4-1) [$(OOO_JAVA_ARCHS)]
@@ -809,14 +812,13 @@
# 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')
+AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(NUM_CPUS)" ""
NUM_CPUS := 1
ifeq "$(PARALLEL_BUILD)" "y"
- AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
# according to Pavel Janik, build -P<number of cores> -- -P2
# is ideal. This sets the first -P according to the number
# of CPUs (where dual-core CPUS report 2, too)
- # Default to 2 on 1-processor machines anyway
ifneq ($(AVAIL_CPUS),1)
NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
