./packages/libreoffice/3.3.0/experimental r2159: more icon/launcher changes; fix up broffice.org
------------------------------------------------------------
revno: 2159
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2010-10-22 11:27:10 +0200
message:
more icon/launcher changes; fix up broffice.org
modified:
changelog
rules
soffice-template.desktop.in
=== modified file 'changelog'
--- a/changelog 2010-10-22 09:11:22 +0000
+++ b/changelog 2010-10-22 09:27:10 +0000
@@ -18,9 +18,9 @@
- use new --enable-broffice
- remove manual installing of LibO splash (LibO now also supports intro.png)
- update .desktop file/icon installation to actually give sensible results
- (Exec= and Icon=)
+ (Exec= and Icon=; fix up broffice.org changes)
* debian/broffice.org.p*.in: adapt diversions for new intro.png
-
+ * debian/soffice-template.desktop.in: update for LibreOffice
-- Rene Engelhard <rene@debian.org> Thu, 21 Oct 2010 12:58:31 +0200
libreoffice (1:3.3.0~beta2-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2010-10-22 09:11:22 +0000
+++ b/rules 2010-10-22 09:27:10 +0000
@@ -3054,18 +3054,15 @@
mkdir -p debian/broffice.org$(VER)/usr/share/templates
endif
cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \
- | sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \
+ | sed -e "s/LibreOffice/BrOffice.org/" | sed -e "s/libreoffice/broffice.org/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc
- cat $(PKGDIR)-common/$(OOBRANDDIR)/program/versionrc \
- | sed -e "s/en-US/pt-BR/" | sed -e "s/OpenO/BrO/" \
- > debian/broffice.org$(VER)/$(OOBRANDDIR)/program/versionrc
cat $(PKGDIR)-common/$(OOBRANDDIR)/share/registry/brand.xcd \
| sed -e 's,<prop oor:name="ooName"><value>LibreOffice</value>,<prop oor:name="ooName"><value>BrOffice.org</value>,' \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/brand.xcd
ifeq "$(BUILD_KDE)" "y"
for i in odt ods odp odg; do \
cat $(PKGDIR)-kde/usr/share/templates/soffice.$${i}.desktop \
- | sed -e "s/OpenO/BrO/" \
+ | sed -e "s/LibreOffice/BrOffice.org/" \
> debian/broffice.org$(VER)/usr/share/templates/soffice.$${i}.desktop; \
done
endif
@@ -3073,14 +3070,14 @@
if [ "$$iso" = "en-US" ]; then p=common; else p=l10n-`echo $$iso | tr A-Z a-z`; fi; \
if [ -f $(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res ]; then \
cat $(PKGDIR)-$$p/$(OOBRANDDIR)/program/resource/ooo$$iso.res \
- | sed -e "s/OpenO/BrO/" \
+ | sed -e "s/LibreOffice/BrOffice.org/" \
> debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource/ooo$$iso.res; \
fi; \
done
for i in writer calc draw impress math base startcenter javafilter; do \
case "$$i" in startcenter) d=common ;; javafilter) d=filter-mobiledev ;; *) d=$$i;; esac; \
cat $(PKGDIR)-$$d/usr/share/applications/libreoffice$(VER)-$$i.desktop \
- | sed -e "s/ooff/broff/" | sed -e "s/OpenO/BrO/" \
+ | sed -e "s/libreoffice/brofffice/" | sed -e "s/LibreOffice/BrOffice.org/" \
> debian/broffice.org$(VER)/usr/share/applications/libreoffice$(VER)-$$i.desktop; \
done
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/broffice.org >/dev/null; pwd`" ;\
=== modified file 'soffice-template.desktop.in'
--- a/soffice-template.desktop.in 2010-10-12 00:40:55 +0000
+++ b/soffice-template.desktop.in 2010-10-22 09:27:10 +0000
@@ -4,5 +4,5 @@
Comment[de]=Name der LibreOffice @APP@-Datei eingeben:
Type=Link
URL=.source/soffice.@EXT@
-Icon=openofficeorg3-oasis-@TYPE@
+Icon=libreoffice3-oasis-@TYPE@
Reply to: