./packages/openofficeorg/3.0/experimental r1108: merge; regenerate control
------------------------------------------------------------
revno: 1108
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-06-06 13:05:32 +0200
message:
merge; regenerate control
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.95
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-30 10:59:49 +0200
message:
rc2
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.96
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-30 14:55:35 +0200
message:
use upstreams tarballs; minor description and comment fix
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.97
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-05-30 14:59:25 +0200
message:
fix typo
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.98
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-06-02 23:26:20 +0200
message:
--1
modified:
changelog
------------------------------------------------------------
revno: 1022.1.99
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-06-04 10:23:05 +0200
message:
only recommend filter-binfilter...
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-06-06 11:03:57 +0000
+++ b/changelog 2008-06-06 11:05:32 +0000
@@ -57,6 +57,25 @@
-- Rene Engelhard <rene@debian.org> Mon, 26 May 2008 22:27:01 +0200
+openoffice.org (1:2.4.1~rc2-1.2pre) experimental; urgency=low
+
+ * debian/control.in:
+ - only recommend -fitler-binfilter. (closes: #484287)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 04 Jun 2008 00:10:04 +0200
+
+openoffice.org (1:2.4.1~rc2-1) experimental; urgency=low
+
+ * OpenOffice.org 2.4.1 rc2 (OOH680_m17)
+ * ooo-build:
+ - update (r12720)
+ * debian/control.in:
+ - s/meta package/metapackage/
+ * debian/rules:
+ - fix typo in installing bug scripts/presubj for arch-indep packages
+
+ -- Rene Engelhard <rene@debian.org> Fri, 30 May 2008 13:42:13 +0200
+
openoffice.org (1:2.4.1~rc1-1) experimental; urgency=low
* OpenOffice.org 2.4.1 rc1 (OOH680_m16)
=== modified file 'control'
--- a/control 2008-05-29 10:59:20 +0000
+++ b/control 2008-06-06 11:05:32 +0000
@@ -13,7 +13,8 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ttf-dejavu, ${ooo-officebean-dep}, ${ooo-binfilter-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${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, ttf-dejavu, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+Recommends: ${ooo-binfilter-dep}
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, 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
@@ -71,7 +72,7 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- OpenOffice.org is called BrOffice.org in Brazil and this meta package
+ OpenOffice.org is called BrOffice.org in Brazil and this metapackage
changes an OpenOffice.org installation into a BrOffice.org branded one once
installed.
@@ -3044,24 +3045,6 @@
This package contains the test data for the OpenOffice.org Java and
Basic APIs.
-Package: mozilla-openoffice.org
-Section: net
-Architecture: i386 powerpc sparc mips mipsel s390
-Enhances: iceape-browser,
- iceweasel,
- mozilla-browser,
- firefox,
- openoffice.org,
- openoffice.org-core
-Depends: ${shlibs:Depends}, openoffice.org-core (>= 2.2.0-2)
-Recommends: iceweasel | firefox | iceape-browser | konqueror-nsplugins, openoffice.org-writer, openoffice.org-calc, openoffice.org-draw, openoffice.org-impress, openoffice.org-math, openoffice.org-base
-Description: OpenOffice.org Mozilla plugin
- OpenOffice.org is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains a Mozilla/Netscape compatible plugin which can handle
- all OOo documents.
-
Package: openoffice.org-wiki-publisher
Section: misc
Priority: optional
=== modified file 'control.in'
--- a/control.in 2008-05-29 10:59:20 +0000
+++ b/control.in 2008-06-06 11:05:32 +0000
@@ -69,10 +69,10 @@
openoffice.orgVER-base,
ttf-dejavu,
${ooo-officebean-dep},
- ${ooo-binfilter-dep},
${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
${java-common-depends}
+Recommends: ${ooo-binfilter-dep}
Suggests: hunspell-dictionary,
myspell-dictionary,
openoffice.orgVER-help-${help-l10n-virtual-version},
@@ -150,7 +150,7 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- OpenOffice.org is called BrOffice.org in Brazil and this meta package
+ OpenOffice.org is called BrOffice.org in Brazil and this metapackage
changes an OpenOffice.org installation into a BrOffice.org branded one once
installed.
=== modified file 'rules'
--- a/rules 2008-06-06 11:00:27 +0000
+++ b/rules 2008-06-06 11:05:32 +0000
@@ -2756,7 +2756,7 @@
zip -d $(CURDIR)/$(PKGDIR)-wiki-publisher/$(OOBRANDDIR)/share/extension/install/wiki-publisher.oxt license/THIRDPARTYLICENSEREADME.html
endif
- for i in $(ARCH_INDEP_DEP_PACKAGES); do \
+ for i in $(ARCH_INDEP_PACKAGES); do \
install -D -m644 debian/presubj \
debian/$$i/usr/share/bug/$$i/presubj; \
if [ -e debian/$$i.control.bug ]; then \
@@ -2850,7 +2850,7 @@
cat debian/shlibs.override.stdlibs >> debian/shlibs.local
endif
# we need to do it in two steps. The new dpkg-shlibdeps doesn't find
- # /usr/lib/libgcj-bc.so when specifying -l/usr/lib/$(GCJ_JAWT_DIR)
+ # /usr/lib/libgcj-bc.so when specifying -l$(GCJ_JAWT_DIR)
# and therefore we must not use it for -gcj. But we *do* need it
# for -officebean (libjawt.so is referenced there)
LD_LIBRARY_PATH="/usr/lib/libfakeroot:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(PKGDIR)-base/$(OODIR)/program" \
Reply to: