./packages/openofficeorg/3.1/unstable r1604: more Ubuntu merge
------------------------------------------------------------
revno: 1604
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Sat 2009-08-01 22:19:17 +0200
message:
more Ubuntu merge
modified:
control.pdfimport.in
openoffice.org-base.lintian-overrides.in
openoffice.org-base.menu.in
openoffice.org-calc.lintian-overrides.in
openoffice.org-calc.menu.in
openoffice.org-common.links
openoffice.org-draw.lintian-overrides.in
openoffice.org-draw.menu.in
openoffice.org-impress.lintian-overrides.in
openoffice.org-impress.menu.in
openoffice.org-math.lintian-overrides.in
openoffice.org-math.menu.in
openoffice.org-writer.lintian-overrides.in
openoffice.org-writer.menu.in
rules
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2009-06-10 07:32:34 +0000
+++ b/control.pdfimport.in 2009-08-01 20:19:17 +0000
@@ -9,7 +9,7 @@
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains an extension to import PDF documents into
- OpenOffice.org.
+ This package contains an extension to open PDF documents with
+ OpenOffice.org Draw.
Homepage: http://extensions.services.openoffice.org/project/pdfimport
=== modified file 'openoffice.org-base.lintian-overrides.in'
--- a/openoffice.org-base.lintian-overrides.in 2009-02-15 10:04:33 +0000
+++ b/openoffice.org-base.lintian-overrides.in 2009-08-01 20:19:17 +0000
@@ -1,4 +1,4 @@
openoffice.org-base: binary-or-shlib-defines-rpath
-openoffice.org-base: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-base.xpm
+openoffice.org-base: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-base.xpm
openoffice.org-base: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-base:4
-openoffice.org-base: desktop-command-not-in-package /usr/share/applications/ooo-base.desktop ooffice
+openoffice.org-base: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-base.desktop ooffice
=== modified file 'openoffice.org-base.menu.in'
--- a/openoffice.org-base.menu.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-base.menu.in 2009-08-01 20:19:17 +0000
@@ -1,5 +1,5 @@
?package(openoffice.org-base):needs="X11" section="Applications/Data Management" \
title="OpenOffice.org Base" command="/usr/bin/oobase"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-base.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-base.xpm"
=== modified file 'openoffice.org-calc.lintian-overrides.in'
--- a/openoffice.org-calc.lintian-overrides.in 2009-02-15 10:04:33 +0000
+++ b/openoffice.org-calc.lintian-overrides.in 2009-08-01 20:19:17 +0000
@@ -1,4 +1,4 @@
openoffice.org-calc: binary-or-shlib-defines-rpath
-openoffice.org-calc: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-calc.xpm
+openoffice.org-calc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-calc.xpm
openoffice.org-calc: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-calc:5
-openoffice.org-calc: desktop-command-not-in-package /usr/share/applications/ooo-calc.desktop ooffice
+openoffice.org-calc: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-calc.desktop ooffice
=== modified file 'openoffice.org-calc.menu.in'
--- a/openoffice.org-calc.menu.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-calc.menu.in 2009-08-01 20:19:17 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Calc" command="/usr/bin/oocalc"\
hints="Spreadsheets"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-calc.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-calc.xpm"
=== modified file 'openoffice.org-common.links'
--- a/openoffice.org-common.links 2009-01-31 11:19:55 +0000
+++ b/openoffice.org-common.links 2009-08-01 20:19:17 +0000
@@ -34,63 +34,3 @@
usr/share/icons/hicolor/48x48/mimetypes/openofficeorg3-oasis-text.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
usr/share/icons/hicolor/48x48/mimetypes/openofficeorg3-oasis-text-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
usr/share/icons/hicolor/48x48/mimetypes/openofficeorg3-oasis-web-template.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-database.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-drawing.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-drawing-template.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-formula.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-master-document.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-presentation.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-presentation-template.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-spreadsheet.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-spreadsheet-template.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-text.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-text-template.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/locolor/16x16/mimetypes/openofficeorg3-oasis-web-template.png usr/share/icons/locolor/16x16/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-database.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-drawing.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-drawing-template.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-formula.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-master-document.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-presentation.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-presentation-template.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-spreadsheet.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-spreadsheet-template.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-text.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-text-template.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/locolor/32x32/mimetypes/openofficeorg3-oasis-web-template.png usr/share/icons/locolor/32x32/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-database.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-drawing.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-drawing-template.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-formula.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-master-document.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-presentation.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-presentation-template.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-spreadsheet.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-spreadsheet-template.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-text.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-text-template.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/gnome/16x16/mimetypes/openofficeorg3-oasis-web-template.png usr/share/icons/gnome/16x16/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-database.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-drawing.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-drawing-template.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-formula.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-master-document.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-presentation.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-presentation-template.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-spreadsheet.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-spreadsheet-template.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-text.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-text-template.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/gnome/32x32/mimetypes/openofficeorg3-oasis-web-template.png usr/share/icons/gnome/32x32/mimetypes/application-vnd.oasis.opendocument.web-template.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-database.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.database.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-drawing.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.drawing.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-drawing-template.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.drawing-template.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-formula.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.formula.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-master-document.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.master-document.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-presentation.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.presentation.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-presentation-template.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.presentation-template.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-spreadsheet.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-spreadsheet-template.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.spreadsheet-template.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-text.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.text.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-text-template.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.text-template.png
-usr/share/icons/gnome/48x48/mimetypes/openofficeorg3-oasis-web-template.png usr/share/icons/gnome/48x48/mimetypes/application-vnd.oasis.opendocument.web-template.png
=== modified file 'openoffice.org-draw.lintian-overrides.in'
--- a/openoffice.org-draw.lintian-overrides.in 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-draw.lintian-overrides.in 2009-08-01 20:19:17 +0000
@@ -1,4 +1,4 @@
openoffice.org-draw: binary-or-shlib-defines-rpath
-openoffice.org-draw: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-draw.xpm
+openoffice.org-draw: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-draw.xpm
openoffice.org-draw: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-draw:5
-openoffice.org-draw: desktop-command-not-in-package /usr/share/applications/ooo-draw.desktop ooffice
+openoffice.org-draw: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-draw.desktop ooffice
=== modified file 'openoffice.org-draw.menu.in'
--- a/openoffice.org-draw.menu.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-draw.menu.in 2009-08-01 20:19:17 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Draw" command="/usr/bin/oodraw"\
hints="Drawing"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-draw.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-draw.xpm"
=== modified file 'openoffice.org-impress.lintian-overrides.in'
--- a/openoffice.org-impress.lintian-overrides.in 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-impress.lintian-overrides.in 2009-08-01 20:19:17 +0000
@@ -1,4 +1,4 @@
openoffice.org-impress: binary-or-shlib-defines-rpath
-openoffice.org-impress: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-impress.xpm
+openoffice.org-impress: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-impress.xpm
openoffice.org-impress: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-impress:5
-openoffice.org-impress: desktop-command-not-in-package /usr/share/applications/ooo-impress.desktop ooffice
+openoffice.org-impress: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-impress.desktop ooffice
=== modified file 'openoffice.org-impress.menu.in'
--- a/openoffice.org-impress.menu.in 2007-08-02 12:00:20 +0000
+++ b/openoffice.org-impress.menu.in 2009-08-01 20:19:17 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Impress" command="/usr/bin/ooimpress"\
hints="Presentation"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-impress.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-impress.xpm"
=== modified file 'openoffice.org-math.lintian-overrides.in'
--- a/openoffice.org-math.lintian-overrides.in 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-math.lintian-overrides.in 2009-08-01 20:19:17 +0000
@@ -1,4 +1,4 @@
openoffice.org-math: binary-or-shlib-defines-rpath
-openoffice.org-math: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-math.xpm
+openoffice.org-math: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-math.xpm
openoffice.org-math: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-math:5
-openoffice.org-math: desktop-command-not-in-package /usr/share/applications/ooo-math.desktop ooffice
+openoffice.org-math: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-math.desktop ooffice
=== modified file 'openoffice.org-math.menu.in'
--- a/openoffice.org-math.menu.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-math.menu.in 2009-08-01 20:19:17 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Math" command="/usr/bin/oomath"\
hints="Equation,Editor,Formula"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-math.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-math.xpm"
=== modified file 'openoffice.org-writer.lintian-overrides.in'
--- a/openoffice.org-writer.lintian-overrides.in 2008-03-13 22:11:47 +0000
+++ b/openoffice.org-writer.lintian-overrides.in 2009-08-01 20:19:17 +0000
@@ -1,4 +1,4 @@
openoffice.org-writer: binary-or-shlib-defines-rpath
-openoffice.org-writer: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm
+openoffice.org-writer: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm
openoffice.org-writer: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-writer:5
-openoffice.org-writer: desktop-command-not-in-package /usr/share/applications/ooo-writer.desktop ooffice
+openoffice.org-writer: desktop-command-not-in-package /usr/share/applications/openoffice.org@VER@-writer.desktop ooffice
=== modified file 'openoffice.org-writer.menu.in'
--- a/openoffice.org-writer.menu.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-writer.menu.in 2009-08-01 20:19:17 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Writer" command="/usr/bin/oowriter"\
hints="Word Processors"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm"
+ icon="/usr/share/icons/hicolor/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm"
=== modified file 'rules'
--- a/rules 2009-08-01 19:53:31 +0000
+++ b/rules 2009-08-01 20:19:17 +0000
@@ -2186,7 +2186,7 @@
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
-e 's/ / /' \
< $$dirname/$$p.desktop \
- > $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop || exit 1 ;\
+ > $(PKGDIR)-$$p/usr/share/applications/openoffice.org$(VER)-$$p.desktop || exit 1 ;\
done
ifeq "$(BUILD_GTK)" "y"
@@ -2208,10 +2208,10 @@
echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
fi; \
done
- sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
+ sed -i -e 's/Office;/Office;Graphics;/' $(PKGDIR)-draw/usr/share/applications/openoffice.org$(VER)-draw.desktop
# invalid, according to lintian. make it shut up.
for i in writer calc impress draw math base; do \
- perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
+ perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/openoffice.org$(VER)-$$i.desktop; \
done
perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
else
@@ -2225,7 +2225,7 @@
-e 's/@STARTUPNOTIFY@/true/' \
-e '/^Categories/s/Office/Application;Office/' \
ooo-build/desktop/$$p.desktop \
- > $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop || exit 1 ;\
+ > $(PKGDIR)-$$p/usr/share/applications/openoffice.org$(VER)-$$p.desktop || exit 1 ;\
done
endif
# add version to .menu and .lintian-overrides
@@ -2553,9 +2553,9 @@
done
for i in writer calc draw impress math base startcenter; do \
if [ "$$i" = "startcenter" ]; then d=common; else d=$$i; fi; \
- cat $(PKGDIR)-$$d/usr/share/applications/ooo-$$i.desktop \
+ cat $(PKGDIR)-$$d/usr/share/applications/openoffice.org$(VER)-$$i.desktop \
| sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
- > debian/broffice.org$(VER)/usr/share/applications/ooo-$$i.desktop; \
+ > debian/broffice.org$(VER)/usr/share/applications/openoffice.org$(VER)-$$i.desktop; \
done
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org >/dev/null; pwd`" ;\
mkdir -p -m755 debian/broffice.org/usr/share/mimelnk/application ;\
@@ -2585,7 +2585,7 @@
fi
install -m644 $(SOURCE_TREE)/ooo_custom_images/broffice/introabout/about.bmp \
debian/broffice.org$(VER)/$(OOBRANDDIR)/program/about.bmp
- cd debian/broffice.org$(VER)/usr/bin && ln -s ooffice broffice
+ cd debian/broffice.org$(VER)/usr/bin && ln -s ooffice$(VER) broffice$(VER)
# this is referenced in .keys/.applications
for i in `find $(PKGDIR)-common/usr/share/icons -name "openofficeorg*png"`; do \
@@ -2617,6 +2617,7 @@
# Extract and install icons
cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract openoffice.org$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
+ rm -rf gnome locolor && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
done &&\
@@ -2633,11 +2634,11 @@
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
-e 's/ / /' \
< $$dirname/startcenter.desktop \
- > $(PKGDIR)-common/usr/share/applications/ooo$(VER)-startcenter.desktop || exit 1
+ > $(PKGDIR)-common/usr/share/applications/openoffice.org$(VER)-startcenter.desktop || exit 1
# remove Sun reference
- perl -pi -e 's/ Supported by Sun Microsystems.//' $(PKGDIR)-common//usr/share/applications/ooo$(VER)-startcenter.desktop
+ perl -pi -e 's/ Supported by Sun Microsystems.//' $(PKGDIR)-common//usr/share/applications/openoffice.org$(VER)-startcenter.desktop
# invalid, according to lintian. make it shut up.
- perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-common/usr/share/applications/ooo$(VER)-startcenter.desktop
+ perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-common/usr/share/applications/openoffice.org$(VER)-startcenter.desktop
endif
# install .applications, .keys, .mime and openoffice.org.xml for
@@ -2779,7 +2780,7 @@
endif
# convert icons to xpm; we need them for the Debian menu policy...
- cd $(PKGDIR)-common/usr/share/icons/gnome/32x32/apps && \
+ cd $(PKGDIR)-common/usr/share/icons/hicolor/32x32/apps && \
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
ifeq "$(ENABLE_JAVA)" "y"
@@ -2959,7 +2960,7 @@
done
perl -pi -e "s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
# add proper MimeType
- perl -pi -e 's,MimeType=,MimeType=application/vnd.openofficeorg.extension,' $(PKGDIR)-common/usr/share/applications/ooo-startcenter.desktop
+ perl -pi -e 's,MimeType=,MimeType=application/vnd.openofficeorg.extension,' $(PKGDIR)-common/usr/share/applications/openoffice.org$(VER)-startcenter.desktop
endif
# fix permission
Reply to: