------------------------------------------------------------
revno: 1363
committer: Rene Engelhard <r...@debian.org>
branch nick: 31
timestamp: Fri 2008-12-26 01:09:24 +0100
message:
update Vcs-Bzr:, merge
modified:
changelog
control
control.in
control.reportdesign.in
rules
------------------------------------------------------------
revno: 1332.1.19
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2008-12-22 17:58:35 +0100
message:
fix bzr branch
modified:
control
control.in
------------------------------------------------------------
revno: 1332.1.20
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 12:24:22 +0100
message:
work around #i97491; -2
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.21
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 19:37:56 +0100
message:
Rene Engelhard 2008-12-23 merge
Rene Engelhard 2008-12-23 add missing Depends: on
${java-runtime-depends}
Rene Engelhard 2008-12-23 debian/rules: apply Python26 patchset if
build...
Rene Engelhard 2008-12-23 debian/startcenter.desktop.in: use
ooo-gulls.p...
Rene Engelhard 2008-12-23 remove obsolete variable
modified:
changelog
control
control.in
control.reportdesign.in
rules
startcenter.desktop.in
------------------------------------------------------------
revno: 1332.2.1
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 14:32:16 +0100
message:
remove obsolete variable
modified:
rules
------------------------------------------------------------
revno: 1332.2.2
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 14:34:36 +0100
message:
debian/startcenter.desktop.in: use ooo-gulls.png as Icon
modified:
changelog
startcenter.desktop.in
------------------------------------------------------------
revno: 1332.2.3
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 14:35:58 +0100
message:
debian/rules: apply Python26 patchset if building with python 2.6
modified:
changelog
rules
------------------------------------------------------------
revno: 1332.2.4
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 14:41:23 +0100
message:
merge
modified:
changelog
control
control.reportdesign.in
------------------------------------------------------------
revno: 1022.1.210
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Tue 2008-12-23 14:31:12 +0100
message:
add missing Depends: on ${java-runtime-depends}
modified:
changelog
control
control.reportdesign.in
------------------------------------------------------------
revno: 1332.1.22
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 22:05:49 +0100
message:
merge
modified:
rules
------------------------------------------------------------
revno: 1022.3.1
committer: Chris Halls <ch...@thehalls.de>
branch nick: debian
timestamp: Mon 2008-12-22 16:50:41 +0000
message:
ooo-build branch is ooo-build-3-0-1
modified:
rules
------------------------------------------------------------
revno: 1022.3.2
committer: Chris Halls <ch...@thehalls.de>
branch nick: debian
timestamp: Mon 2008-12-22 17:06:33 +0000
message:
Revert previous commit - this was on the wrong branch. Thanks Rene
modified:
rules
------------------------------------------------------------
revno: 1022.3.3
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Tue 2008-12-23 19:53:09 +0100
message:
add missing Depends: on runtime-depends
modified:
changelog
control
control.reportdesign.in
------------------------------------------------------------
revno: 1022.3.4
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 22:03:07 +0100
message:
actually set java-runtime-depends for -report-builder
modified:
control.reportdesign.in
rules
------------------------------------------------------------
revno: 1332.1.23
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 23:11:31 +0100
message:
regen control..
modified:
control
------------------------------------------------------------
revno: 1332.1.24
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Thu 2008-12-25 14:55:56 +0100
message:
+ * debian/control.in:
+ - only recommend ttf-liberation and change it to
+ ttf-liberation | msttcorefonts (closes: #509193
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-12-26 00:02:00 +0000
+++ b/changelog 2008-12-26 00:09:24 +0000
@@ -24,6 +24,30 @@
-- Rene Engelhard <r...@debian.org> Mon, 22 Dec 2008 03:03:41 +0100
+openoffice.org (1:3.0.1~rc1-2.3pre) experimental; urgency=low
+
+ * debian/startcenter.desktop.in: use ooo-gulls.png as Icon
+ * debian/rules:
+ - apply Python26 patchset if building with python 2.6
+ * debian/control.reportdesign.in:
+ - add missing Depends: on ${java-runtime-depends}
+ * debian/control.in:
+ - only recommend ttf-liberation and change it to
+ ttf-liberation | msttcorefonts (closes: #509193)
+
+ -- Rene Engelhard <r...@debian.org> Tue, 23 Dec 2008 14:34:51 +0100
+
+openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
+
+ * ooo-build:
+ - update (r14911):
+ - work around #i97491: do not move soffice into
+ openoffice.org-common (closes: #509435)
+ * debian/rules: (temporarily?) comment out soffice changing in -common.
+ * debian/control{,in}: fix Vcs-Bzr:
+
+ -- Rene Engelhard <r...@debian.org> Mon, 22 Dec 2008 23:58:48 +0100
+
openoffice.org (1:3.0.1~rc1-1) experimental; urgency=low
* OpenOffice.org 3.0.1 rc1 (OOO300_m14)
=== modified file 'control'
--- a/control 2008-12-19 18:22:24 +0000
+++ b/control 2008-12-26 00:09:24 +0000
@@ -7,14 +7,14 @@
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
-Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0/experimental
+Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
Vcs-Svn: svn://svn.gnome.org/svn/ooo-build/trunk
Homepage: http://www.go-oo.org
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}
-Recommends: ${ooo-binfilter-dep}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin,
ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep},
openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1,
libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox |
icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
@@ -104,7 +104,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), cli-uno-bridge (<< 1:3.0.0~dev300m22),
openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>=
${base-version}.1), cacao-oj6-jre
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 (<<
1:2.3.1), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless
(<< 1:3.0.0~dev300m26)
+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:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2),
openoffice.org-headless (<< 1:3.0.0~dev300m26)
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.
@@ -157,7 +157,7 @@
Package: openoffice.org-calc
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep},
${scsolver-shlibs:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${Source-Version})
Provides: openoffice.org2-calc
@@ -3241,7 +3241,7 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>=
${base-version}), openoffice.org-java-common (>= ${base-version})
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>=
${base-version}), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'control.in'
--- a/control.in 2008-12-19 18:06:32 +0000
+++ b/control.in 2008-12-26 00:09:24 +0000
@@ -52,7 +52,7 @@
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64]
Standards-Version: 3.8.0
XS-Python-Version: current
-Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.0/experimental
+Vcs-Bzr:
http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
Vcs-Svn: %OOO_BUILD_SVN%
Homepage: http://www.go-oo.org
@@ -67,13 +67,13 @@
openoffice.orgVER-base,
openoffice.orgVER-report-builder-bin,
ttf-dejavu,
- ttf-liberation,
${ooo-officebean-dep},
${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
${lucene-depends},
${java-common-depends}
-Recommends: ${ooo-binfilter-dep}
+Recommends: ${ooo-binfilter-dep},
+ ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary,
myspell-dictionary,
openoffice.orgVER-help-${help-l10n-virtual-version},
@@ -244,7 +244,7 @@
openoffice.org-java,
openoffice.org2-hunspell,
openoffice.org-hunspell,
- openoffice.org-common (<< 1:2.3.1),
+ openoffice.org-common (<< 1:3.0.1~rc1-2),
openoffice.org-calc (<< 2.2.1~oof680m15-2),
openoffice.org-headless (<< 1:3.0.0~dev300m26)
Description: OpenOffice.org office suite architecture dependent files
@@ -341,7 +341,7 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
- ${lpsolve-dep}
+ ${lpsolve-dep}, ${scsolver-shlibs:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
openoffice.org (<< 1.9),
openoffice.org-debian-files,
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-09-21 09:44:31 +0000
+++ b/control.reportdesign.in 2008-12-23 21:05:49 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin
(>= ${base-version}), openoffice.org-java-common (>= ${base-version})
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin
(>= ${base-version}), openoffice.org-java-common (>= ${base-version}),
${java-runtime-depends}
Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder-bin
(>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'rules'
--- a/rules 2008-12-26 00:02:50 +0000
+++ b/rules 2008-12-26 00:09:24 +0000
@@ -164,7 +164,6 @@
RUN_API_TESTS=n
RUN_UNIT_TESTS=n
USE_LIBCURL4=y
-USE_SYSTEM_LIBSVG=y
USE_SYSTEM_DMAKE=y
USE_LIBSUITESPARSE=y
USE_BZIP_COMPRESS=n
@@ -453,6 +452,9 @@
endif
BUILD_DEPS += , python-dev (>= 2.4)
DBG_DBG_SUGGESTS+= , python-dbg
+ ifeq "$(PYMAJOR).$(PYMINOR)" "2.6"
+ ADDITIONAL_SECTIONS += Python26
+ endif
else
BUILD_DEPS += , python
endif
@@ -2888,12 +2890,12 @@
ln -s /$(OODIR)/sdk/index.html index.html
endif
-ifneq "$(DIST)" "Ubuntu"
- # ooo-build has a patch with this hardcoded.
- perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
- perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
- perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
-endif
+#ifneq "$(DIST)" "Ubuntu"
+# # ooo-build has a patch with this hardcoded.
+# perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+# perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+# perl -pi -e "s/Ubuntu stuff/stuff/"
$(PKGDIR)-common/$(OOBRANDDIR)/program/soffice
+#endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -rf $(PKGDIR)-wiki-publisher
@@ -3055,6 +3057,14 @@
-Sdebian/ure/$(OOUREDIR)/lib \
$(SOURCE_TREE)/connectivity/$(shell .
$(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc*.so \
> debian/openoffice.org$(VER)-sdbc-postgresql.substvars
+ifeq "$(USE_SCSOLVER)" "y"
+
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
+ dpkg-shlibdeps -O -p scsolver-shlibs \
+ -Sdebian/uno-libs3/$(OOUREDIR)/lib \
+ -Sdebian/ure/$(OOUREDIR)/lib \
+ $(SOURCE_TREE)/scsolver/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/scsolver.uno.so \
+ >> debian/openoffice.org$(VER)-calc.substvars
+endif
ifeq "$(ENABLE_MINIMIZER)" "y"
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
@@ -3259,6 +3269,7 @@
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e
's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut
-d: -f2`
endif
dh_md5sums -i
