./packages/openofficeorg/3.2.1/unstable r2088: revert soffice-template.desktop.in move to minimalize diff (and the changelog entry was wrong anyways)
------------------------------------------------------------
revno: 2088
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-11-09 19:51:09 +0100
message:
revert soffice-template.desktop.in move to minimalize diff (and the changelog entry was wrong anyways)
renamed:
templates/soffice-template.desktop.in => soffice-template.desktop.in
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-11-08 21:30:43 +0000
+++ b/changelog 2010-11-09 18:51:09 +0000
@@ -9,14 +9,12 @@
* debian/udk*in, debian/xmerge-javadoc.in: Sun Microsystems, Inc -> Oracle
* debian/po/da.po: add Danish translation of the debconf templates,
thanks Joe Hansen (closes: #599429)
- * debian/soffice-template.desktop.in: update for LibreOffice and ..
- * debian/templates/soffice-template.desktop.in: ... here
* debian/templates/debian-presentation*: add Debian presentation template,
thanks Raphael Hertzog (closes: #602043)
* debian/rules: fix some more spanish calc functions (FIND/SEARCH), thanks
Manuel María Pérez Ayal
- -- Rene Engelhard <rene@debian.org> Mon, 08 Nov 2010 22:30:16 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 09 Nov 2010 19:50:05 +0100
openoffice.org (1:3.2.1-7) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2010-11-08 21:30:43 +0000
+++ b/rules 2010-11-09 18:51:09 +0000
@@ -2535,22 +2535,22 @@
for i in $(SOURCE_TREE)/extras/source/shellnew/*; do \
cp $$i $(PKGDIR)-kde/usr/share/templates/.source/`basename $$i`; \
done
- cat debian/templates/soffice-template.desktop.in \
+ cat debian/soffice-template.desktop.in \
| sed -e "s/@APP@/Writer/" \
| sed -e "s/@EXT@/odt/" \
| sed -e "s/@TYPE@/text/" \
> $(PKGDIR)-kde/usr/share/templates/soffice.odt.desktop
- cat debian/templates/soffice-template.desktop.in \
+ cat debian/soffice-template.desktop.in \
| sed -e "s/@APP@/Calc/" \
| sed -e "s/@EXT@/ods/" \
| sed -e "s/@TYPE@/spreadsheet/" \
> $(PKGDIR)-kde/usr/share/templates/soffice.ods.desktop
- cat debian/templates/soffice-template.desktop.in \
+ cat debian/soffice-template.desktop.in \
| sed -e "s/@APP@/Impress/" \
| sed -e "s/@EXT@/odp/" \
| sed -e "s/@TYPE@/presentation/" \
> $(PKGDIR)-kde/usr/share/templates/soffice.odp.desktop
- cat debian/templates/soffice-template.desktop.in \
+ cat debian/soffice-template.desktop.in \
| sed -e "s/@APP@/Draw/" \
| sed -e "s/@EXT@/odg/" \
| sed -e "s/@TYPE@/drawing/" \
=== renamed file 'templates/soffice-template.desktop.in' => 'soffice-template.desktop.in'
Reply to: