./packages/openofficeorg/3.1/experimental r1444: fix install
------------------------------------------------------------
revno: 1444
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Mon 2009-03-16 15:02:47 +0100
message:
fix install
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1332.1.95
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2009-03-13 11:09:43 +0100
message:
s/experimental/unstable/ in Vcs-Bzr
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.96
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-03-14 10:23:33 +0100
message:
add nosmart+
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.97
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-03-14 10:28:14 +0100
message:
add (Ben Finney)
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1332.1.98
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sun 2009-03-15 17:30:43 +0100
message:
syntax: $( -> ${
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-03-15 20:05:50 +0000
+++ b/changelog 2009-03-16 14:02:47 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.0~ooo310m5-1) UNRELEASED; urgency=low
+openoffice.org (1:3.1.0~ooo310m5-1) experimental; urgency=low
* OpenOffice.org 3.1.0 development snapshot OOO310_m5
- build without -march=armv5te for arm (closes: #501957)
@@ -14,6 +14,7 @@
- back on trunk (r15543)
- updates openoffice.1 to remove --version (closes: #505768)
- mentions ; vs , change in the help (closes: #519828)
+ - src: add OOO310 GSIs from ftp.linux.cz
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
* debian/rules:
@@ -59,17 +60,29 @@
- update
- migrate to http://wiki.debian.org/Proposals/CopyrightFormat format
- -- Rene Engelhard <rene@debian.org> Thu, 12 Mar 2009 22:15:47 +0100
-
-openoffice.org (1:3.0.1-6) UNRELEASED; urgency=low
-
+ -- Rene Engelhard <rene@debian.org> Sun, 15 Mar 2009 21:49:59 +0100
+
+openoffice.org (1:3.0.1-6) unstable; urgency=low
+
+ [ Rene Engelhard ]
+ * ooo-build:
+ - update (15544)
* debian/rules:
- remove ure (>= ...) from uno-libs3s Depends: (closes: #519138)
+ * debian/control.in:
+ - s/experimental/unstable/ in Vcs-Bzr
* debian/openoffice.org-qa-tools.{postrm,preinst},
openoffice.org-emailmerge.postinst.in, debian/rules: don't hardcode the
dir, use @OOBASISDIR@
- -- Rene Engelhard <rene@debian.org> Wed, 11 Mar 2009 17:59:26 +0100
+ [ Ben Finney ]
+ * debian/control.in:
+ + add nosmart+ to Vcs-Bzr:
+ + ‘Depends: ${misc:Depends}’ as recommended by Lintian for
+ debhelper(7).
+ (Closes: Bug#519644)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 14 Mar 2009 12:10:56 +0100
openoffice.org (1:3.0.1-5) unstable; urgency=high
=== modified file 'control'
--- a/control 2009-03-12 20:19:04 +0000
+++ b/control 2009-03-16 14:02:47 +0000
@@ -7,13 +7,13 @@
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], base-files (= 5)
Standards-Version: 3.8.0
XS-Python-Version: current
-Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
+Vcs-Bzr: nosmart+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, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}
+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}, ${misc: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}), openoffice.org-java-common (<< 1:3.0.0)
@@ -65,7 +65,7 @@
Section: editors
Priority: extra
Architecture: all
-Depends: openoffice.org, openoffice.org-l10n-pt-br, openoffice.org-help-pt-br, myspell-pt-br
+Depends: openoffice.org, openoffice.org-l10n-pt-br, openoffice.org-help-pt-br, myspell-pt-br, ${misc:Depends}
Description: BrOffice.org office suite
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -78,7 +78,7 @@
Section: editors
Priority: optional
Architecture: all
-Depends: openoffice.org, 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
+Depends: openoffice.org, 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: South African language packages for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -90,7 +90,7 @@
Section: editors
Priority: optional
Architecture: all
-Depends: openoffice.org, 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
+Depends: openoffice.org, 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
Description: Indic language packages for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -101,7 +101,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
+Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}, ${misc:Depends}
Conflicts: openoffice.org-thesaurus, 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-core (<< ${Source-Version}), 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:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2), openoffice.org-headless (<< 1:3.0.0~dev300m26)
@@ -114,7 +114,7 @@
Package: openoffice.org-common
Architecture: all
-Depends: openoffice.org-style-galaxy
+Depends: openoffice.org-style-galaxy, ${misc:Depends}
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast
Recommends: openoffice.org-style-tango, openoffice.org-style-crystal
Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-core (= 2.0.4~rc3-1), openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-5), dictionaries-common (<< 0.98.14)
@@ -129,7 +129,7 @@
Package: openoffice.org-java-common
Architecture: all
-Depends: openoffice.org-common, ${java-common-java-depends}
+Depends: openoffice.org-common, ${java-common-java-depends}, ${misc:Depends}
Suggests: ${common-bsh-depends}
Replaces: openoffice.org-common (<< 2.0.3-4), openoffice.org2-java-common
Conflicts: openoffice.org2-java-common, openoffice.org-filter-mobiledev (<= 2.2.0-4), openoffice.org-base (<= 2.2.0-4), openoffice.org-writer (<= 2.2.0-4), openoffice.org-officebean (<= 2.2.0-4)
@@ -143,7 +143,7 @@
Package: openoffice.org-writer
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}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.org-emailmerge, openoffice.org-math
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 (<= 1:2.3.1)
@@ -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}, ${scsolver-shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${lpsolve-dep}, ${scsolver-shlibs:Depends}, ${misc: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
@@ -169,7 +169,7 @@
Package: openoffice.org-impress
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-draw (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-draw (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Provides: openoffice.org2-impress
Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<< ${Source-Version})
@@ -181,7 +181,7 @@
Package: openoffice.org-draw
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-draw (<< ${Source-Version}), openoffice.org-core (<< 2.2.1~rc3-3), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-draw (<< ${Source-Version})
Provides: openoffice.org2-draw
@@ -193,7 +193,7 @@
Package: openoffice.org-math
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-math (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-math (<< ${Source-Version})
Provides: openoffice.org2-math
@@ -205,7 +205,7 @@
Package: openoffice.org-base-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.org-base
Description: OpenOffice.org office suite -- libdba
@@ -220,7 +220,7 @@
Package: openoffice.org-base
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}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${base-hsqldb-depends}, ${java-common-depends}, ${misc:Depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools, libmysql-java | libpg-java, openoffice.org-gcj, openoffice.org-report-builder
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<< 1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-java, openoffice.org-java-common (= 1:2.3.1-2~bpo40+1), openoffice.org-java-common (= 1:2.4.0-4~bpo40+1), openoffice.org-java-common (= 1:2.4.1-3~bpo40+1), openoffice.org-java-common (= 2.2.0-6~bpo.1), openoffice.org-java-common (= 2.2.1-1~bpo.1), openoffice.org-java-common (= 2.2.1-9~bpo40+1)
Conflicts: openoffice.org-debian-files, openoffice.org2-base (<< ${Source-Version}), openoffice.org-common (= 2.0.4-4)
@@ -249,7 +249,7 @@
Package: openoffice.org-style-crystal
Architecture: all
-Depends: openoffice.org-common (= ${Source-Version})
+Depends: openoffice.org-common (= ${Source-Version}), ${misc:Depends}
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.org-common (<< 2.1~m190)
Description: Crystal symbol style for OpenOffice.org
@@ -260,7 +260,7 @@
Package: openoffice.org-style-industrial
Architecture: all
-Depends: openoffice.org-common (= ${Source-Version})
+Depends: openoffice.org-common (= ${Source-Version}), ${misc:Depends}
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.org-common (<< 2.1~m190)
Description: Industrial symbol style for OpenOffice.org
@@ -271,7 +271,7 @@
Package: openoffice.org-style-tango
Architecture: all
-Depends: openoffice.org-common (= ${Source-Version})
+Depends: openoffice.org-common (= ${Source-Version}), ${misc:Depends}
Suggests: tango-icon-theme
Replaces: openoffice.org-common (<< 2.1~m190)
Description: Tango symbol style for OpenOffice.org
@@ -283,7 +283,7 @@
Package: openoffice.org-style-hicontrast
Architecture: all
-Depends: openoffice.org-common (= ${Source-Version})
+Depends: openoffice.org-common (= ${Source-Version}), ${misc:Depends}
Suggests: gtk2-engines
Replaces: openoffice.org-common (<< 2.1~m190)
Description: Hicontrast symbol style for OpenOffice.org
@@ -295,7 +295,7 @@
Package: openoffice.org-style-galaxy
Architecture: all
-Depends: openoffice.org-common (= ${Source-Version})
+Depends: openoffice.org-common (= ${Source-Version}), ${misc:Depends}
Replaces: openoffice.org-common (<< 2.1~m190), openoffice.org-style-default, openoffice.org-style-andromeda
Conflicts: openoffice.org-style-default
Provides: openoffice.org-style-default
@@ -309,7 +309,7 @@
Package: openoffice.org-style-andromeda
Architecture: all
-Depends: openoffice.org-common (= ${Source-Version})
+Depends: openoffice.org-common (= ${Source-Version}), ${misc:Depends}
Replaces: openoffice.org-common (<< 2.1~m190)
Description: Andromeda (Classic) symbol style for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -322,7 +322,7 @@
Package: openoffice.org-kde
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-crystal, ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-crystal, ${shlibs:Depends}, ${misc:Depends}
Suggests: konqueror, kmail, openoffice.org-kab
Section: kde
Enhances: openoffice.org
@@ -342,7 +342,7 @@
Package: openoffice.org-gtk
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-tango, ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-tango, ${shlibs:Depends}, ${misc:Depends}
Section: gnome
Enhances: openoffice.org
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<< 2.0.4~rc1-0)
@@ -357,7 +357,7 @@
Package: openoffice.org-gnome
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-gtk, ${shlibs:Depends}, gconf2
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-gtk, gconf2, ${shlibs:Depends}, ${misc:Depends}
Suggests: openoffice.org-evolution
Section: gnome
Enhances: openoffice.org
@@ -378,7 +378,7 @@
Package: openoffice.org-evolution
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Section: gnome
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base, ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base, ${shlibs:Depends}, ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${Source-Version})
Provides: openoffice.org2-evolution
@@ -392,7 +392,7 @@
Package: openoffice.org-kab
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
Description: KDE Adressbook support for OpenOffice.org
@@ -404,7 +404,7 @@
Package: openoffice.org-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno
+Depends: ${python:Depends}, python-uno, ${misc:Depends}
Enhances: openoffice.org-writer
Replaces: python-uno (<< 1:2.4.1-5)
Description: E-Mail Mailmerge component for OpenOffice.org
@@ -420,7 +420,7 @@
Section: python
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Enhances: openoffice.org
-Depends: openoffice.org-core (= ${Source-Version}), ${python:Depends}, ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org-common (<< 1.9.82)
Description: Python interface for OpenOffice.org
The Python-UNO bridge allows use of the standard OpenOffice.org API
@@ -433,7 +433,7 @@
Package: openoffice.org-officebean
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
Section: misc
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -447,7 +447,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
Architecture: i386 powerpc sparc mips mipsel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<< 1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
Conflicts: openoffice.org2-filter-so52, openoffice.org-filter-so52
@@ -466,7 +466,7 @@
Package: openoffice.org-filter-mobiledev
Section: misc
Architecture: all
-Depends: ${java-runtime-depends}, ${java-common-depends}
+Depends: ${java-runtime-depends}, ${java-common-depends}, ${misc:Depends}
Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178), openoffice.org-common (<< 2.0.3+2.0.4m178)
Description: Mobile Devices Filters for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -494,7 +494,7 @@
Package: openoffice.org-dtd-officedocument1.0
Section: text
Priority: extra
-Depends: xml-core
+Depends: xml-core, ${misc:Depends}
Architecture: all
Replaces: openoffice.org-common (<< 2.0.4~ood680)
Conflicts: openoffice.org-common (<< 2.0.4~ood680)
=== modified file 'control.in'
--- a/control.in 2009-03-10 21:42:12 +0000
+++ b/control.in 2009-03-16 14:02:47 +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: @PYTHON_VERSION@
-Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
+Vcs-Bzr: nosmart+http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/3.1/experimental
Vcs-Svn: %OOO_BUILD_SVN%
Homepage: http://www.go-oo.org
@@ -71,7 +71,8 @@
${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
${lucene-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ ${misc:Depends}
Recommends: ${ooo-binfilter-dep},
ttf-liberation | msttcorefonts
Suggests: hunspell-dictionary,
@@ -143,7 +144,8 @@
Section: editors
Priority: extra
Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-pt-br, openoffice.orgVER-help-pt-br, myspell-pt-br
+Depends: openoffice.orgVER, openoffice.orgVER-l10n-pt-br, openoffice.orgVER-help-pt-br, myspell-pt-br,
+ ${misc:Depends}
Description: BrOffice.org office suite
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -156,7 +158,8 @@
Section: editors
Priority: optional
Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-af, openoffice.orgVER-l10n-en-za, openoffice.orgVER-l10n-nr, openoffice.orgVER-l10n-ns, openoffice.orgVER-l10n-ss, openoffice.orgVER-l10n-st, openoffice.orgVER-l10n-tn, openoffice.orgVER-l10n-ts, openoffice.orgVER-l10n-ve, openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu
+Depends: openoffice.orgVER, openoffice.orgVER-l10n-af, openoffice.orgVER-l10n-en-za, openoffice.orgVER-l10n-nr, openoffice.orgVER-l10n-ns, openoffice.orgVER-l10n-ss, openoffice.orgVER-l10n-st, openoffice.orgVER-l10n-tn, openoffice.orgVER-l10n-ts, openoffice.orgVER-l10n-ve, openoffice.orgVER-l10n-xh, openoffice.orgVER-l10n-zu,
+ ${misc:Depends}
Description: South African language packages for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -168,7 +171,8 @@
Section: editors
Priority: optional
Architecture: all
-Depends: openoffice.orgVER, openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn, openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in, openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in, openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in, openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in
+Depends: openoffice.orgVER, openoffice.orgVER-l10n-as-in, openoffice.orgVER-l10n-bn, openoffice.orgVER-l10n-gu-in, openoffice.orgVER-l10n-hi-in, openoffice.orgVER-l10n-ml-in, openoffice.orgVER-l10n-mr-in, openoffice.orgVER-l10n-or-in, openoffice.orgVER-l10n-pa-in, openoffice.orgVER-l10n-ta-in, openoffice.orgVER-l10n-te-in,
+ ${misc:Depends}
Recommends: ttf-indic-fonts
Description: Indic language packages for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -183,7 +187,8 @@
ttf-opensymbol,
${shlibs:Depends},
fontconfig,
- ${mozilla-nss-depends}
+ ${mozilla-nss-depends},
+ ${misc:Depends}
Conflicts: openoffice.orgVER-unbundled,
openoffice.org-thesaurus,
openoffice.orgVER-l10n-1.9.108,
@@ -257,7 +262,8 @@
Package: openoffice.orgVER-common
Architecture: all
-Depends: openoffice.orgVER-style-galaxy
+Depends: openoffice.orgVER-style-galaxy,
+ ${misc:Depends}
Suggests: openoffice.orgVER-style-industrial,
openoffice.orgVER-style-hicontrast
Recommends: openoffice.orgVER-style-tango,
@@ -301,7 +307,8 @@
Package: openoffice.orgVER-java-common
Architecture: all
Depends: openoffice.orgVER-common,
- ${java-common-java-depends}
+ ${java-common-java-depends},
+ ${misc:Depends}
Suggests: ${common-bsh-depends}
Replaces: openoffice.orgVER-common (<< 2.0.3-4),
openoffice.org2-java-common
@@ -322,7 +329,8 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends}, ${java-common-depends}, ${writer-w2l-dep}, openoffice.orgVER-emailmerge, openoffice.orgVER-math
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
@@ -345,7 +353,8 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
- ${lpsolve-dep}, ${scsolver-shlibs:Depends}
+ ${lpsolve-dep}, ${scsolver-shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1),
openoffice.org (<< 1.9),
openoffice.org-debian-files,
@@ -366,7 +375,8 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-draw (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-impress (<< ${Source-Version}),
@@ -383,7 +393,8 @@
Package: openoffice.orgVER-draw
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-draw (<< ${Source-Version}),
@@ -401,7 +412,8 @@
Package: openoffice.orgVER-math
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-math (<< ${Source-Version}),
@@ -417,7 +429,9 @@
Package: openoffice.orgVER-base-core
Architecture: %OOO_ARCHS%
-Depends: openoffice.orgVER-core (= ${Source-Version}), ${shlibs:Depends}
+Depends: openoffice.orgVER-core (= ${Source-Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.orgVER-base
Description: OpenOffice.org office suite -- libdba
@@ -437,7 +451,8 @@
${shlibs:Depends},
${java-runtime-depends},
${base-hsqldb-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ ${misc:Depends}
Suggests: unixodbc,
libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc | mdbtools,
libmysql-java | libpg-java,
@@ -483,7 +498,8 @@
Package: openoffice.orgVER-style-crystal
Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ ${misc:Depends}
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Description: Crystal symbol style for OpenOffice.org
@@ -494,7 +510,8 @@
Package: openoffice.orgVER-style-industrial
Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ ${misc:Depends}
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Description: Industrial symbol style for OpenOffice.org
@@ -505,7 +522,8 @@
Package: openoffice.orgVER-style-tango
Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ ${misc:Depends}
Suggests: tango-icon-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Description: Tango symbol style for OpenOffice.org
@@ -517,7 +535,8 @@
Package: openoffice.orgVER-style-hicontrast
Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ ${misc:Depends}
Suggests: gtk2-engines
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Description: Hicontrast symbol style for OpenOffice.org
@@ -529,7 +548,8 @@
Package: openoffice.orgVER-style-galaxy
Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 2.1~m190), openoffice.orgVER-style-default, openoffice.org-style-andromeda
Conflicts: openoffice.orgVER-style-default
Provides: openoffice.orgVER-style-default
@@ -543,7 +563,8 @@
Package: openoffice.orgVER-style-andromeda
Architecture: all
-Depends: openoffice.orgVER-common (= ${Source-Version})
+Depends: openoffice.orgVER-common (= ${Source-Version}),
+ ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Description: Andromeda (Classic) symbol style for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -558,7 +579,8 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-style-crystal,
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Suggests: konqueror,
kmail,
openoffice.orgVER-kab
@@ -582,7 +604,8 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-style-tango,
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Section: gnome
Enhances: openoffice.orgVER
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0),
@@ -600,8 +623,9 @@
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-gtk,
+ gconf2,
${shlibs:Depends},
- gconf2
+ ${misc:Depends}
Suggests: openoffice.orgVER-evolution
Section: gnome
Enhances: openoffice.orgVER
@@ -627,7 +651,8 @@
Section: gnome
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base,
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${Source-Version})
Provides: openoffice.org2-evolution
@@ -642,7 +667,8 @@
Package: openoffice.orgVER-kab
Architecture: %OOO_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
Description: KDE Adressbook support for OpenOffice.org
@@ -654,7 +680,8 @@
Package: openoffice.orgVER-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno
+Depends: ${python:Depends}, python-uno,
+ ${misc:Depends}
Enhances: openoffice.orgVER-writer
Replaces: python-uno (<< 1:2.4.1-5)
Description: E-Mail Mailmerge component for OpenOffice.org
@@ -672,7 +699,8 @@
Enhances: openoffice.orgVER
Depends: openoffice.orgVER-core (= ${Source-Version}),
${python:Depends},
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 1.9.82)
Description: Python interface for OpenOffice.org
The Python-UNO bridge allows use of the standard OpenOffice.org API
@@ -688,7 +716,8 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
${shlibs:Depends},
${java-runtime-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ ${misc:Depends}
Replaces: openoffice.orgVER-common (<< 1.9.113-0pre1), openoffice.org2-officebean
Provides: openoffice.org2-officebean
Conflicts: openoffice.org2-officebean
@@ -703,7 +732,8 @@
Section: misc
Architecture: %OOO_BINFILTER_ARCHS%
Depends: openoffice.orgVER-core (= ${Source-Version}),
- ${shlibs:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1),
openoffice.orgVER-math (<< 1.9.113-0pre1),
openoffice.orgVER-calc (<< 1.9.113-0pre1),
@@ -727,7 +757,8 @@
Section: misc
Architecture: all
Depends: ${java-runtime-depends},
- ${java-common-depends}
+ ${java-common-depends},
+ ${misc:Depends}
Replaces: openoffice.org-java-common (<< 2.0.3+2.0.4m178), openoffice.org-common (<< 2.0.3+2.0.4m178)
Description: Mobile Devices Filters for OpenOffice.org
OpenOffice.org is a full-featured office productivity suite that provides
@@ -755,7 +786,8 @@
Package: openoffice.orgVER-dtd-officedocument1.0
Section: text
Priority: extra
-Depends: xml-core
+Depends: xml-core,
+ ${misc:Depends}
Architecture: all
Replaces: openoffice.org-common (<< 2.0.4~ood680)
Conflicts: openoffice.org-common (<< 2.0.4~ood680)
=== modified file 'rules'
--- a/rules 2009-03-12 21:25:18 +0000
+++ b/rules 2009-03-16 14:02:47 +0000
@@ -1714,9 +1714,9 @@
for iso in $(filter-out en-US,$(LANGPACKISOS)); do \
if ! `echo $(HELPISOS) | grep -q $$iso`; then \
pkgiso=`echo $$iso | tr A-Z a-z`; \
- rm -rf debian/tmp/pkg/openoffice.org-help-$$pkgiso; \
- rm -f debian/openoffice.org-help.$$pkgiso.dirs; \
- rm -f debian/openoffice.org-help.$$pkgiso.install; \
+ rm -rf debian/tmp/pkg/openoffice.org-help-$$iso; \
+ rm -f debian/openoffice.org-help-$$pkgiso.dirs; \
+ rm -f debian/openoffice.org-help-$$pkgiso.install; \
fi; \
done
endif
Reply to: