------------------------------------------------------------
revno: 1126
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-06-09 20:16:13 +0200
message:
don't change unopkg path anymore
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-06-09 17:44:12 +0000
+++ b/changelog 2008-06-09 18:16:13 +0000
@@ -12,11 +12,13 @@
- install also other resolutions than 48x48 for the ooo-build/desktop
icons, thanks Chris Cheney
* debian/rules, debian/broffice.org.*.in:
- - fixup openoffice.applications (closes: #485437)
+ - fixup openoffice.applications (closes: #485437) and stop specifying
+ unopkg with full paths (we don't do it for ooffice either and
+ /usr/bin/unopkg does it)
* debian/copyright:
- update
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 09 Jun 2008 19:41:01 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 09 Jun 2008 20:15:06 +0200
openoffice.org (1:2.4.1~rc2-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2008-06-09 17:44:12 +0000
+++ b/rules 2008-06-09 18:16:13 +0000
@@ -2399,7 +2399,6 @@
cat $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.applications \
| sed -e s/OFFICENAME/ooffice/g \
| sed -e s/\%PRODUCTNAME/OpenOffice.org/g \
- | sed -e 's,command=unopkg,command=/$(OODIR)/program/unopkg,' \
>
$(PKGDIR)-common/usr/share/application-registry/openoffice.applications
mkdir -p $(PKGDIR)-common/usr/share/mime/packages && \
mkdir -p $(PKGDIR)-common/usr/share/mime-info && \
@@ -2742,8 +2741,7 @@
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
- sed -e 's,Exec=unopkg,Exec=/$(OODIR)/program/unopkg,' \
- -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
+ sed -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
-e 's/ / /' \
< $$dirname/extension.desktop \
>
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop || exit 1
