LibreOffice Branding: first cut

3 files changed, 12 insertions, 12 deletions

diff --git a/sysui/desktop/debian/control b/sysui/desktop/debian/control
index 608496d9e2f4..da25ee454292 100644
--- a/sysui/desktop/debian/control
+++ b/sysui/desktop/debian/control
@@ -1,6 +1,6 @@
 Description: %productname desktop integration
-Maintainer: OpenOffice.org
+Maintainer: LibreOffice
 Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+Provides: libreoffice-desktop-integration, libreoffice-unbundled
+Conflicts: libreoffice-desktop-integration, libreoffice-debian-menus, libreoffice-bundled
+Replaces: libreoffice-desktop-integration, libreoffice-debian-menus
diff --git a/sysui/desktop/debian/openoffice.org-debian-menus b/sysui/desktop/debian/openoffice.org-debian-menus
index bf30a918cf0b..c477d7363546 100644
--- a/sysui/desktop/debian/openoffice.org-debian-menus
+++ b/sysui/desktop/debian/openoffice.org-debian-menus
@@ -1,39 +1,39 @@
-?package(openoffice.org-writer):needs="X11" section="Apps/Editors"\
+?package(libreoffice-writer):needs="X11" section="Apps/Editors"\
   title="%PRODUCTNAME Writer" command="%PREFIX -writer"\
   hints="Word Processors"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-writer.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-writer.png"
 
-?package(openoffice.org-calc):needs="X11" section="Apps/Math"\
+?package(libreoffice-calc):needs="X11" section="Apps/Math"\
   title="%PRODUCTNAME Calc" command="%PREFIX -calc"\
   hints="Spreadsheets"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-calc.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-calc.png"
 
-?package(openoffice.org-draw):needs="X11" section="Apps/Graphics"\
+?package(libreoffice-draw):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Draw" command="%PREFIX -draw"\
   hints="Drawing"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-draw.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-draw.png"
 
-?package(openoffice.org-impress):needs="X11" section="Apps/Graphics"\
+?package(libreoffice-impress):needs="X11" section="Apps/Graphics"\
   title="%PRODUCTNAME Impress" command="%PREFIX -impress"\
   hints="Presentation"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-impress.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-impress.png"
 
-?package(openoffice.org-base):needs="X11" section="Apps/Databases"\
+?package(libreoffice-base):needs="X11" section="Apps/Databases"\
   title="%PRODUCTNAME Base" command="%PREFIX -base"\
   hints="Database"\
   kderemove="y"\
   icon="/usr/share/icons/hicolor/32x32/apps/%ICONPREFIX-base.png"\
   icon16x16="/usr/share/icons/hicolor/16x16/apps/%ICONPREFIX-base.png"
 
-?package(openoffice.org-core02):needs="X11" section="Apps/System"\
+?package(libreoffice-core02):needs="X11" section="Apps/System"\
   title="%PRODUCTNAME Printer Administration"\
   command="%PREFIX-printeradmin"\
   hints="Setup,Printer,Config"\
diff --git a/sysui/desktop/debian/postinst b/sysui/desktop/debian/postinst
index 19753b529e97..67161dfa2ef6 100644
--- a/sysui/desktop/debian/postinst
+++ b/sysui/desktop/debian/postinst
@@ -80,7 +80,7 @@ if [ "$1" = "configure" ]
 then
   # backing out existing entries to avoid duplicates
   sed '
-/^# OpenOffice.org/d
+/^# LibreOffice/d
 /^application\/vnd\.oasis\.opendocument/d
 /^application\/vnd\.openofficeorg/d
 /^application\/vnd\.sun/d
@@ -96,7 +96,7 @@ then
 
   # now append our stuff to the temporary file
   cat >> /etc/mailcap.tmp$$ << END
-# OpenOffice.org
+# LibreOffice
 application/vnd.oasis.opendocument.text; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-template; %PREFIX -view %s
 application/vnd.oasis.opendocument.text-web; %PREFIX -view %s