------------------------------------------------------------
revno: 1476
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2009-04-02 15:02:22 +0200
message:
build with boost 1.34; merge
modified:
changelog
control
control.in
control.reportdesign.in
control.sdk.in
rules
------------------------------------------------------------
revno: 1332.1.117
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-01 23:47:59 +0200
message:
three more misc:Depends
modified:
changelog
control
control.in
control.reportdesign.in
control.sdk.in
=== modified file 'changelog'
--- a/changelog 2009-03-31 09:34:37 +0000
+++ b/changelog 2009-04-02 13:02:22 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.0~ooo310m8-1) UNRELEASED; urgency=low
+openoffice.org (1:3.1.0~ooo310m8-1) UNSTABLE; urgency=low
* OpenOffice.org 3.1.0 development snapshot OOO310_m8
@@ -7,12 +7,15 @@
- update (6b26e7c1866699e1983089282713b15e49b6c85b)
* debian/rules:
- add conditional to use python-support
-
+ - (temporarily) revert to build with boost 1.34 (closes: #521035)
* debian/rules, ooo-build/*: switch to Fedoras solution for PyUNO. Replace
RPATH with os.path.append in uno.py and just install uno*.py into
site-packages (closes: #520944)
+ * debian/control{,sdk,reportdesign}.in:
+ - add last three ${misc:Depends}, even where we have no Depends: line
+ otherwise
- -- Rene Engelhard <r...@debian.org> Tue, 31 Mar 2009 10:53:03 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 02 Apr 2009 08:46:29 +0200
openoffice.org (1:3.0.1-9) unstable; urgency=high
=== modified file 'control'
--- a/control 2009-03-30 16:37:28 +0000
+++ b/control 2009-04-02 13:02:22 +0000
@@ -482,6 +482,7 @@
Section: libdevel
Suggests: perl
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Depends: ${misc:Depends}
Description: simple thesaurus library -- development files
MyThes is a simple thesaurus that uses a structured
text data file and an index file with binary search
@@ -3344,7 +3345,7 @@
Package: openoffice.org-report-builder-bin
Section: misc
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-base (>= 2.3.0~src680m225)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-base (>= 2.3.0~src680m225), ${misc:Depends}
Replaces: openoffice.org-report-builder
Description: OpenOffice.org extension for building database reports --
libraries
OpenOffice.org is a full-featured office productivity suite that provides
@@ -3456,6 +3457,7 @@
Package: openoffice.org-dev-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Recommends: www-browser
Suggests: g++, java2-compiler, openoffice.org-dtd-officedocument1.0
Replaces: openoffice.org-dev (<< 2.1), openoffice.org2-dev-doc
=== modified file 'control.in'
--- a/control.in 2009-03-29 21:16:28 +0000
+++ b/control.in 2009-04-02 13:02:22 +0000
@@ -774,6 +774,7 @@
Section: libdevel
Suggests: perl
Architecture: %OOO_ARCHS%
+Depends: ${misc:Depends}
Description: simple thesaurus library -- development files
MyThes is a simple thesaurus that uses a structured
text data file and an index file with binary search
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2009-03-29 21:16:28 +0000
+++ b/control.reportdesign.in 2009-04-02 13:02:22 +0000
@@ -21,7 +21,7 @@
Package: openoffice.orgVER-report-builder-bin
Section: misc
Architecture: %OOO_JAVA_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.orgVER-base (>= 2.3.0~src680m225)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.orgVER-base (>= 2.3.0~src680m225), ${misc:Depends}
Replaces: openoffice.orgVER-report-builder
Description: OpenOffice.org extension for building database reports --
libraries
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.sdk.in'
--- a/control.sdk.in 2009-03-29 21:16:28 +0000
+++ b/control.sdk.in 2009-04-02 13:02:22 +0000
@@ -30,6 +30,7 @@
Package: openoffice.orgVER-dev-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Recommends: www-browser
Suggests: g++,
java2-compiler,
=== modified file 'rules'
--- a/rules 2009-03-31 09:34:37 +0000
+++ b/rules 2009-04-02 13:02:22 +0000
@@ -125,7 +125,7 @@
USE_STLPORT=n
USE_SYSTEM_STLPORT=y
USE_SYSTEM_BOOST=y
-BOOST_VERSION=1.37
+BOOST_VERSION=1.34
ifeq "$(BOOST_VERSION)" "1.37"
BOOST_MINVER= (>= 1.37.0-4)
endif
