./packages/openofficeorg/3.0.1/unstable r1439: merge from 3.1
------------------------------------------------------------
revno: 1439
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2009-03-23 00:10:37 +0100
message:
merge from 3.1
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-03-22 18:50:38 +0000
+++ b/changelog 2009-03-22 23:10:37 +0000
@@ -8,6 +8,8 @@
breaks various filters....
- add arm to OOO_MOZILLA_ARCHS again as it FTBFSes on the lenny backport
otherwise because iceape-dev is not installed.
+ - remove "openoffice" symlink, add "openoffice.org$(VER)" (closes: #511232),
+ upstream has openoffice.org3 launcher in /usr/bin, too
* debian/rules, debian/control.qa.in, debian/openoffice.org-qa-tools-*:
- remove -qa-*, broken and unused anyway
@@ -24,7 +26,7 @@
revision.
(Closes: Bug#520604)
- -- Rene Engelhard <rene@debian.org> Sun, 22 Mar 2009 19:48:15 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 22 Mar 2009 23:56:54 +0100
openoffice.org (1:3.0.1-7) unstable; urgency=high
=== modified file 'rules'
--- a/rules 2009-03-22 18:50:38 +0000
+++ b/rules 2009-03-22 23:10:37 +0000
@@ -2850,8 +2850,8 @@
$(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd
cp debian/catalog.xml $(PKGDIR)-dtd-officedocument1.0/$(OODIR)/share/dtd/officedocument/1_0
- # add "openoffice" symlink
- cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice
+ # add "openoffice.org" symlink
+ cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice.org$(VER)
ifeq "$(PACKAGE_SDK)" "y"
# add symlinks for docs and examples
Reply to: