------------------------------------------------------------
revno: 2083
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2010-11-03 21:41:12 +0100
message:
merge debian presentation template from LibreOffice
added:
templates/
templates/debian-presentation-background.xcf
templates/debian-presentation.otp
renamed:
soffice-template.desktop.in => templates/soffice-template.desktop.in
modified:
changelog
copyright
rules
=== modified file 'changelog'
--- a/changelog 2010-10-13 13:26:08 +0000
+++ b/changelog 2010-11-03 20:41:12 +0000
@@ -5,6 +5,10 @@
* 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)
-- Rene Engelhard <[email protected]> Wed, 22 Sep 2010 17:58:25 +0200
=== modified file 'copyright'
--- a/copyright 2010-06-29 04:42:04 +0000
+++ b/copyright 2010-11-03 20:41:12 +0000
@@ -14,6 +14,14 @@
(These files are checked out from
http://hg.services.openoffice.org/re/DEV300_next/file/c3ffaa0d55a2/sysui/desktop/icons/hicolor
(3.3 tree) to have a
matching startcenter icon, not the old one which is in the 3.2 tree)
+File: debian/templates/debian-presentation.otp
+Copyright: Copyright (C) 2010 Raphaël Hertzog
+License: GPL-2+
+
+File: debian/templates/debian-presentation-background.xcf
+Copyright: Copyright Alexis Younes "ayo"
+License: GPL-2+
+
Files: ooo-build-*/*
Copyright: (c) 2002-2010 ooo-build/Go-OO Team
License: LGPL-3
=== modified file 'rules'
--- a/rules 2010-10-13 13:22:03 +0000
+++ b/rules 2010-11-03 20:41:12 +0000
@@ -2396,6 +2396,20 @@
> $$TMP && \
debian/scripts/cleandupes --base=openoffice.org$(VER) --prefix=debian <
$$TMP && rm -f $$TMP
+ifeq "$(DIST)" "Debian"
+ # install Debian presentation template
+ otps=`cd debian/templates; echo *.otp`; \
+ for iso in $(LANGPACKISOS); do \
+ [ "$$iso" = "en-US" ] && continue; \
+ pkgiso=`echo $$iso | tr \[:upper:\] \[:lower:\]`; \
+ mkdir -p
$(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt; \
+ for otp in $$otps; do \
+ ln -sf ../../en-US/presnt/$$otp \
+ $(PKGDIR)-l10n-$$pkgiso/$(OODIR)/share/template/$$iso/presnt/$$odt;
\
+ done; \
+ done
+endif
+
touch $@
native-jars: $(STAMP_NATIVE_JARS)
@@ -2519,22 +2533,22 @@
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 \
+ cat debian/templates/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/soffice-template.desktop.in \
+ cat debian/templates/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/soffice-template.desktop.in \
+ cat debian/templates/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/soffice-template.desktop.in \
+ cat debian/templates/soffice-template.desktop.in \
| sed -e "s/@APP@/Draw/" \
| sed -e "s/@EXT@/odg/" \
| sed -e "s/@TYPE@/drawing/" \
=== added directory 'templates'
=== added file 'templates/debian-presentation-background.xcf'
Binary files a/templates/debian-presentation-background.xcf 1970-01-01
00:00:00 +0000 and b/templates/debian-presentation-background.xcf 2010-11-03
20:41:12 +0000 differ
=== added file 'templates/debian-presentation.otp'
Binary files a/templates/debian-presentation.otp 1970-01-01 00:00:00
+0000 and b/templates/debian-presentation.otp 2010-11-03 20:41:12 +0000
differ
=== renamed file 'soffice-template.desktop.in' =>
'templates/soffice-template.desktop.in'
