------------------------------------------------------------ revno: 1536 committer: Rene Engelhard <[email protected]> branch nick: unstable timestamp: Sat 2009-05-09 00:01:24 +0200 message: add /usr/share/template stuff for KDE added: soffice-template.desktop.in modified: broffice.org.postrm.in broffice.org.preinst.in changelog rules
=== modified file 'broffice.org.postrm.in' --- a/broffice.org.postrm.in 2009-04-15 09:33:39 +0000 +++ b/broffice.org.postrm.in 2009-05-08 22:01:24 +0000 @@ -9,7 +9,7 @@ #INCLUDE_SHELL_LIB# -DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu" +DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu /usr/share/templates/soffice.odt.desktop /usr/share/templates/soffice.ods.desktop /usr/share/templates/soffice.odp.desktop /usr/share/templates/soffice.odg.desktop" DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp" LANGPACKISOS="@LANGPACKISOS@"
=== modified file 'broffice.org.preinst.in' --- a/broffice.org.preinst.in 2009-01-07 20:14:44 +0000 +++ b/broffice.org.preinst.in 2009-05-08 22:01:24 +0000 @@ -9,7 +9,7 @@ #INCLUDE_SHELL_LIB# -DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu" +DIVERSIONS="/@OOBRANDDIR@/program/bootstraprc /@OOBRANDDIR@/program/versionrc /@OOBRANDDIR@/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/applications/o...@[email protected] /usr/share/application-registry/openoffice.applications /usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop /usr/share/mime-info/openoffice.keys /@OOBRANDDIR@/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu /usr/share/templates/soffice.odt.desktop /usr/share/templates/soffice.ods.desktop /usr/share/templates/soffice.odp.desktop /usr/share/templates/soffice.odg.desktop" DIVERSIONS="$DIVERSIONS /@OOBRANDDIR@/program/intro.bmp /@OOBRANDDIR@/program/about.bmp" LANGPACKISOS="@LANGPACKISOS@" === modified file 'changelog' --- a/changelog 2009-05-08 16:30:52 +0000 +++ b/changelog 2009-05-08 22:01:24 +0000 @@ -14,8 +14,11 @@ (closes: #522022, #527558) * debian/copyright: - actually add Files: section matching the upstream tarballs + * debian/rules, debian/broffice.org.{preinst,postrm}.in, + soffice-template.desktop.in: add extra .desktop files and soffice.* from + extras/source/shellnew to /usr/share/templates for KDE (closes: #512737) - -- Rene Engelhard <[email protected]> Thu, 07 May 2009 16:41:06 +0200 + -- Rene Engelhard <[email protected]> Fri, 08 May 2009 00:35:00 +0200 openoffice.org (1:3.1.0-1) unstable; urgency=low === modified file 'rules' --- a/rules 2009-05-08 16:28:49 +0000 +++ b/rules 2009-05-08 22:01:24 +0000 @@ -1967,6 +1967,28 @@ done mv $(PKGDIR)-core/$(OOBRANDDIR)/program/kdefilepicker \ $(PKGDIR)-kde/$(OOBRANDDIR)/program + + # install files for KDEs "create new" ... + mkdir -p $(PKGDIR)-kde/usr/share/templates/.source + for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \ + cp $$i $(PKGDIR)-kde/usr/share/templates/.source/`basename $$i`; \ + done + cat debian/soffice-template.desktop.in \ + | sed -e "s/@APP@/Writer/" \ + | sed -e "s/@EXT@/odt/" \ + > $(PKGDIR)-kde/usr/share/templates/soffice.odt.desktop + cat debian/soffice-template.desktop.in \ + | sed -e "s/@APP@/Calc/" \ + | sed -e "s/@EXT@/ods/" \ + > $(PKGDIR)-kde/usr/share/templates/soffice.ods.desktop + cat debian/soffice-template.desktop.in \ + | sed -e "s/@APP@/Impress/" \ + | sed -e "s/@EXT@/odp/" \ + > $(PKGDIR)-kde/usr/share/templates/soffice.odp.desktop + cat debian/soffice-template.desktop.in \ + | sed -e "s/@APP@/Draw/" \ + | sed -e "s/@EXT@/odg/" \ + > $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop endif ifeq "$(ENABLE_KDEAB)" "y" rm -rf $(PKGDIR)-kab @@ -2126,7 +2148,7 @@ # we don't need the share/xdgs except qstart for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`; do \ rm -f $$f; done - for f in `find debian -name '*.desktop'`; do \ + for f in `find debian -name '*.desktop' ! -name "*soffice.od*`; do \ sed -i -e '/^Comment\[de\]/s/- *\([a-zA-Z0-9]*\) *macht.*glich.*$$/mit \1/' $$f; \ if ! grep -q X-KDE-Protocols $$f; then \ echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \ @@ -2437,6 +2459,7 @@ mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/program/resource mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Setup mkdir -p debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI + mkdir -p debian/broffice.org$(VER)/usr/share/templates cat $(PKGDIR)-common/$(OOBRANDDIR)/program/bootstraprc \ | sed -e "s/OpenO/BrO/" | sed -e "s/openo/bro/" \ > debian/broffice.org$(VER)/$(OOBRANDDIR)/program/bootstraprc @@ -2449,6 +2472,11 @@ cat $(PKGDIR)-common/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu \ | sed -e "s/OpenO/BrO/" \ > debian/broffice.org$(VER)/$(OOBRANDDIR)/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu + for i in odt ods odp odg; do \ + cat $(PKGDIR)-kde/usr/share/templates/soffice.$${i}.desktop \ + | sed -e "s/OpenO/BrO/" \ + > debian/broffice.org$(VER)/usr/share/templates/soffice.$${i}.desktop; \ + done for iso in $(LANGPACKISOS); do \ 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 \ === added file 'soffice-template.desktop.in' --- a/soffice-template.desktop.in 1970-01-01 00:00:00 +0000 +++ b/soffice-template.desktop.in 2009-05-08 22:01:24 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=OpenOffice.org @APP@ ... +Comment=Enter OpenOffice.org @APP@ filename: +Comment[de]=Name der OpenOffice.org @a...@-datei eingeben: +Type=Link +URL=.source/soffi...@ext@ +Icon=openofficeorg3-oasis-text +
