r863 ./packages/openofficeorg/2.3/experimental: don't suggest openoffice.org-officebean anymore; use zip -d~
------------------------------------------------------------
revno: 863
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2007-08-23 00:39:32 +0200
message:
don't suggest openoffice.org-officebean anymore; use zip -d~
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-08-22 08:24:49 +0000
+++ b/changelog 2007-08-22 22:39:32 +0000
@@ -4,7 +4,7 @@
- doesn't "translate" function names into german in hebrew calc anymore
(closes: #365964)
* ooo-build:
- - update (r10110)
+ - update (r10111)
- ooo59127.vcl.honourcairofont.diff: fix for gdk hang. [CC]
(closes: #433870)
- cairo-canvas-ppc-fix.diff: fix endianness to fix yellow color in
@@ -26,7 +26,7 @@
* merge from Ubuntu:
- fix JAWT_DEPENDS for new gcj-4.2
- -- Rene Engelhard <rene@debian.org> Wed, 22 Aug 2007 10:21:34 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Aug 2007 00:21:59 +0200
openoffice.org (1:2.3.0~oog680m1-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-08-21 17:39:50 +0000
+++ b/control 2007-08-22 22:39:32 +0000
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc amd64 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-officebean, ${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
-Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, openoffice.org-officebean, java-gcj-compat | j2re1.4 | java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
+Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu | ttf-bitstream-vera, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, java-gcj-compat | j2re1.4 | java2-runtime, openclipart-openoffice.org, pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
Provides: openoffice.org2
=== modified file 'control.in'
--- a/control.in 2007-08-21 17:39:50 +0000
+++ b/control.in 2007-08-22 22:39:32 +0000
@@ -86,7 +86,6 @@
msttcorefonts,
openoffice.orgVER-gnome | openoffice.orgVER-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
- openoffice.orgVER-officebean,
java-gcj-compat | j2re1.4 | java2-runtime,
openclipart-openoffice.org,
pstoedit,
=== modified file 'rules'
--- a/rules 2007-08-22 08:24:49 +0000
+++ b/rules 2007-08-22 22:39:32 +0000
@@ -2041,13 +2041,9 @@
install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
# unneeded license files
- perl -e 'use Archive::Zip;
- $$zip=Archive::Zip->new("$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt");
- $$zip->removeMember( "THIRDPARTYREADMELICENSE.html" );
- $$zip->removeMember( "license_en-US.html" );
- $$zip->removeMember( "readme_en-US.html" );
- $$zip->removeMember( "readme_en-US.txt" );
- $$zip->writeToFileNamed("$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt");'
+ for i in THIRDPARTYREADMELICENSE.html license_en-US.html readme_en-US.html readme_en-US.txt; do \
+ zip -d $(CURDIR)/$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt $$i; \
+ done
endif
rm -rf $(PKGDIR)-sdbc-postgresql
Reply to: