------------------------------------------------------------
revno: 808
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2007-07-30 14:10:15 +0200
message:
- update ooo-build
- mention new he GSI
- move Star* into a -filter-binfilter.mime
- add version number to the icon= entry dynamically
added:
openoffice.org-filter-binfilter.mime
renamed:
openoffice.org-base.menu => openoffice.org-base.menu.in
openoffice.org-base.overrides.lintian =>
openoffice.org-base.overrides.lintian.in
openoffice.org-calc.menu => openoffice.org-calc.menu.in
openoffice.org-calc.overrides.lintian =>
openoffice.org-calc.overrides.lintian.in
openoffice.org-draw.menu => openoffice.org-draw.menu.in
openoffice.org-draw.overrides.lintian =>
openoffice.org-draw.overrides.lintian.in
openoffice.org-impress.menu => openoffice.org-impress.menu.in
openoffice.org-impress.overrides.lintian =>
openoffice.org-impress.overrides.lintian.in
openoffice.org-math.menu => openoffice.org-math.menu.in
openoffice.org-math.overrides.lintian =>
openoffice.org-math.overrides.lintian.in
openoffice.org-writer.menu => openoffice.org-writer.menu.in
openoffice.org-writer.overrides.lintian =>
openoffice.org-writer.overrides.lintian.in
modified:
changelog
openoffice.org-calc.mime
openoffice.org-draw.mime
openoffice.org-impress.mime
openoffice.org-math.mime
openoffice.org-writer.mime
rules
openoffice.org-base.menu.in
openoffice.org-base.overrides.lintian.in
openoffice.org-calc.menu.in
openoffice.org-calc.overrides.lintian.in
openoffice.org-draw.menu.in
openoffice.org-draw.overrides.lintian.in
openoffice.org-impress.menu.in
openoffice.org-impress.overrides.lintian.in
openoffice.org-math.menu.in
openoffice.org-math.overrides.lintian.in
openoffice.org-writer.menu.in
openoffice.org-writer.overrides.lintian.in
=== added file 'openoffice.org-filter-binfilter.mime'
--- a/openoffice.org-filter-binfilter.mime 1970-01-01 00:00:00 +0000
+++ b/openoffice.org-filter-binfilter.mime 2007-07-30 12:10:15 +0000
@@ -0,0 +1,8 @@
+application/vnd.stardivision.calc; soffice -calc '%s';edit=soffice -calc
'%s';test=test "$DISPLAY" != "" ;description="StarCalc 5.0";
nametemplate=%s.sdc; priority=5
+application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="StarChart 5.0";
nametemplate=%s.sds; priority=5
+application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="StarDraw 5.0";
nametemplate=%s.sda; priority=5
+application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="StarImpress 5.0";
nametemplate=%s.sdd; priority=5
+application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math
'%s'; test=test "$DISPLAY" != "" ; description="StarMath 5.0";
nametemplate=%s.sdf; priority=5
+application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0 Master
Document"; nametemplate=%s.sgl; priority=5
+application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0";
nametemplate=%s.sdw; priority=5
+
=== renamed file 'openoffice.org-base.menu' => 'openoffice.org-base.menu.in'
--- a/openoffice.org-base.menu 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-base.menu.in 2007-07-30 12:10:15 +0000
@@ -1,5 +1,5 @@
?package(openoffice.org-base):needs="X11" section="Applications/Data
Management" \
title="OpenOffice.org Base" command="/usr/bin/oobase"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-base.xpm"
+ icon="/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-base.xpm"
=== renamed file 'openoffice.org-base.overrides.lintian' =>
'openoffice.org-base.overrides.lintian.in'
--- a/openoffice.org-base.overrides.lintian 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-base.overrides.lintian.in 2007-07-30 12:10:15 +0000
@@ -1,3 +1,3 @@
openoffice.org-base: binary-or-shlib-defines-rpath
-openoffice.org-base: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/openofficeorg23-base.xpm
+openoffice.org-base: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-base.xpm
openoffice.org-base: menu-item-contains-unknown-tag kderemove
/usr/share/menu/openoffice.org-base:4
=== renamed file 'openoffice.org-calc.menu' => 'openoffice.org-calc.menu.in'
--- a/openoffice.org-calc.menu 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-calc.menu.in 2007-07-30 12:10:15 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Calc" command="/usr/bin/oocalc"\
hints="Spreadsheets"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-calc.xpm"
+ icon="/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-calc.xpm"
=== renamed file 'openoffice.org-calc.overrides.lintian' =>
'openoffice.org-calc.overrides.lintian.in'
--- a/openoffice.org-calc.overrides.lintian 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-calc.overrides.lintian.in 2007-07-30 12:10:15 +0000
@@ -1,3 +1,3 @@
openoffice.org-calc: binary-or-shlib-defines-rpath
-openoffice.org-calc: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/openofficeorg23-calc.xpm
+openoffice.org-calc: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-calc.xpm
openoffice.org-calc: menu-item-contains-unknown-tag kderemove
/usr/share/menu/openoffice.org-calc:5
=== renamed file 'openoffice.org-draw.menu' => 'openoffice.org-draw.menu.in'
--- a/openoffice.org-draw.menu 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-draw.menu.in 2007-07-30 12:10:15 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Draw" command="/usr/bin/oodraw"\
hints="Drawing"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-draw.xpm"
+ icon="/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-draw.xpm"
=== renamed file 'openoffice.org-draw.overrides.lintian' =>
'openoffice.org-draw.overrides.lintian.in'
--- a/openoffice.org-draw.overrides.lintian 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-draw.overrides.lintian.in 2007-07-30 12:10:15 +0000
@@ -1,3 +1,3 @@
openoffice.org-draw: binary-or-shlib-defines-rpath
-openoffice.org-draw: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/openofficeorg23-draw.xpm
+openoffice.org-draw: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-draw.xpm
openoffice.org-draw: menu-item-contains-unknown-tag kderemove
/usr/share/menu/openoffice.org-draw:5
=== renamed file 'openoffice.org-impress.menu' =>
'openoffice.org-impress.menu.in'
--- a/openoffice.org-impress.menu 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-impress.menu.in 2007-07-30 12:10:15 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Impress" command="/usr/bin/ooimpress"\
hints="Presentation"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-impress.xpm"
+ icon="/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-impress.xpm"
=== renamed file 'openoffice.org-impress.overrides.lintian' =>
'openoffice.org-impress.overrides.lintian.in'
--- a/openoffice.org-impress.overrides.lintian 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-impress.overrides.lintian.in 2007-07-30 12:10:15
+0000
@@ -1,3 +1,3 @@
openoffice.org-impress: binary-or-shlib-defines-rpath
-openoffice.org-impress: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/openofficeorg23-impress.xpm
+openoffice.org-impress: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-impress.xpm
openoffice.org-impress: menu-item-contains-unknown-tag kderemove
/usr/share/menu/openoffice.org-impress:5
=== renamed file 'openoffice.org-math.menu' => 'openoffice.org-math.menu.in'
--- a/openoffice.org-math.menu 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-math.menu.in 2007-07-30 12:10:15 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Math" command="/usr/bin/oomath"\
hints="Equation,Editor,Formula"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-math.xpm"
+ icon="/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-math.xpm"
=== renamed file 'openoffice.org-math.overrides.lintian' =>
'openoffice.org-math.overrides.lintian.in'
--- a/openoffice.org-math.overrides.lintian 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-math.overrides.lintian.in 2007-07-30 12:10:15 +0000
@@ -1,3 +1,3 @@
openoffice.org-math: binary-or-shlib-defines-rpath
-openoffice.org-math: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/openofficeorg23-math.xpm
+openoffice.org-math: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-math.xpm
openoffice.org-math: menu-item-contains-unknown-tag kderemove
/usr/share/menu/openoffice.org-math:5
=== renamed file 'openoffice.org-writer.menu' => 'openoffice.org-writer.menu.in'
--- a/openoffice.org-writer.menu 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-writer.menu.in 2007-07-30 12:10:15 +0000
@@ -2,5 +2,5 @@
title="OpenOffice.org Writer" command="/usr/bin/oowriter"\
hints="Word Processors"\
kderemove="y"\
- icon="/usr/share/icons/gnome/32x32/apps/openofficeorg23-writer.xpm"
+ icon="/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-writer.xpm"
=== renamed file 'openoffice.org-writer.overrides.lintian' =>
'openoffice.org-writer.overrides.lintian.in'
--- a/openoffice.org-writer.overrides.lintian 2007-07-18 20:45:28 +0000
+++ b/openoffice.org-writer.overrides.lintian.in 2007-07-30 12:10:15
+0000
@@ -1,3 +1,3 @@
openoffice.org-writer: binary-or-shlib-defines-rpath
-openoffice.org-writer: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/openofficeorg23-writer.xpm
+openoffice.org-writer: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-writer.xpm
openoffice.org-writer: menu-item-contains-unknown-tag kderemove
/usr/share/menu/openoffice.org-writer:5
=== modified file 'changelog'
--- a/changelog 2007-07-28 12:02:50 +0000
+++ b/changelog 2007-07-30 12:10:15 +0000
@@ -9,12 +9,16 @@
(closes: #386250)
* ooo-build:
- use trunk again
- - update (r9957)
+ - update (r9962)
+ apply Split section. Fixes the binfilter split so that StarWriter
3.0-5.0 etc. do not appear anymore when -filter-binfilter is not
installed (indirectly closes: #421274)
- + src/: add updated GSIs from ftp.linux.cz:
+ - src/:
+ + add updated GSIs from ftp.linux.cz:
af bg cs cy da dz eo et fi ga ku lt mk tg
+ + add he GSI from Issue 79651
+ . fixes hardcoded 2.0.3 in recovery dialog (closes: #432770)
+ . removes bogus 2.0.3 from Help->About ttle (closes: #432771)
* debian/rules, debian/Adobe-Core35_AFMs-314.tar.gz.uu: remove, unneeded
[RE]
* debian/rules:
@@ -64,10 +68,13 @@
libuno_purpenvhelpergcc3 [RE]
* debian/rules, debian/openoffice.org-reportdesigner*: properly
install/package the reportdesigner extension [RE]
+ * debian/*.mime: move Star* into a -filter-binfilter.mime [RE]
+ * debian/rules, debian/*.menu.in, debian/*.overrides.lintian.in:
+ add version number to the icon= entry dynamically
(CC = Chris Cheney)
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 28 Jul 2007 13:12:42 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 30 Jul 2007 11:40:17 +0200
openoffice.org (2.2.1-6) unstable; urgency=low
=== modified file 'openoffice.org-calc.mime'
--- a/openoffice.org-calc.mime 2006-11-01 21:56:26 +0000
+++ b/openoffice.org-calc.mime 2007-07-30 12:10:15 +0000
@@ -3,8 +3,6 @@
application/vnd.oasis.opendocument.chart; soffice -calc '%s'; edit=soffice
-calc '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Chart";
nametemplate=%s.odc
application/vnd.sun.xml.calc; soffice -calc '%s'; edit=soffice -calc '%s';
test=test "$DISPLAY" != "" ; description="OpenOffice.org Spreadsheet";
nametemplate=%s.sxc; priority=8
application/vnd.sun.xml.calc.template; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Spreadsheet
Template"; nametemplate=%s.stc; priority=8
-application/vnd.stardivision.calc; soffice -calc '%s';edit=soffice -calc
'%s';test=test "$DISPLAY" != "" ;description="StarCalc 5.0";
nametemplate=%s.sdc; priority=5
-application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="StarChart 5.0";
nametemplate=%s.sds; priority=5
application/msexcel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel Document";
priority=3
application/vnd.ms-excel; soffice -calc '%s'; edit=soffice -calc '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel
Document"; priority=3
application/x-msexcel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel Document";
priority=3
=== modified file 'openoffice.org-draw.mime'
--- a/openoffice.org-draw.mime 2006-11-01 21:56:26 +0000
+++ b/openoffice.org-draw.mime 2007-07-30 12:10:15 +0000
@@ -2,4 +2,3 @@
application/vnd.oasis.opendocument.graphics-template; soffice -draw '%s';
edit=soffice -draw '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument
Drawing Template"; nametemplate=%s.otg
application/vnd.sun.xml.draw; soffice -draw '%s'; edit=soffice -draw '%s';
test=test "$DISPLAY" != "" ; description="OpenOffice.org Drawing";
nametemplate=%s.sxd; priority=8
application/vnd.sun.xml.draw.template; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Drawing
Template"; nametemplate=%s.std; priority=8
-application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="StarDraw 5.0";
nametemplate=%s.sda; priority=5
=== modified file 'openoffice.org-impress.mime'
--- a/openoffice.org-impress.mime 2007-06-28 13:41:26 +0000
+++ b/openoffice.org-impress.mime 2007-07-30 12:10:15 +0000
@@ -2,7 +2,6 @@
application/vnd.oasis.opendocument.presentation-template; soffice -impress
'%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""
;description="OpenDocument Presentation Template"; nametemplate=%s.otp
application/vnd.sun.xml.impress; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Presentation";
nametemplate=%s.sxi; priority=8
application/vnd.sun.xml.impress.template; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org
Presentation Template"; nametemplate=%s.sti; priority=8
-application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="StarImpress 5.0";
nametemplate=%s.sdd; priority=5
application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
=== modified file 'openoffice.org-math.mime'
--- a/openoffice.org-math.mime 2006-11-01 21:56:26 +0000
+++ b/openoffice.org-math.mime 2007-07-30 12:10:15 +0000
@@ -1,2 +1,1 @@
application/vnd.oasis.opendocument.formula; soffice -math '%s'; edit=soffice
-math '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Formula";
nametemplate=%s.odf
-application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math
'%s'; test=test "$DISPLAY" != "" ; description="StarMath 5.0";
nametemplate=%s.sdf; priority=5
=== modified file 'openoffice.org-writer.mime'
--- a/openoffice.org-writer.mime 2007-02-13 16:49:57 +0000
+++ b/openoffice.org-writer.mime 2007-07-30 12:10:15 +0000
@@ -5,8 +5,6 @@
application/vnd.sun.xml.writer; soffice -writer '%s'; edit=soffice -writer
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Text Document";
nametemplate=%s.sxw; priority=8
application/vnd.sun.xml.writer.global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Master
Document"; nametemplate=%s.sxg; priority=8
application/vnd.sun.xml.writer.template; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Text
Document Template"; nametemplate=%s.stw; priority=8
-application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0 Master
Document"; nametemplate=%s.sgl; priority=5
-application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0";
nametemplate=%s.sdw; priority=5
application/msword; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.doc; description="Microsoft Word Document";
priority=3
application/vnd.ms-word; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.doc; description="Microsoft Word
Document"; priority=3
application/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.rtf; description="Rich Text Format";
priority=3
=== modified file 'rules'
--- a/rules 2007-07-28 12:02:50 +0000
+++ b/rules 2007-07-30 12:10:15 +0000
@@ -948,6 +948,10 @@
rm -f debian/shlibs.local
rm -f debian/openoffice.org-dev-doc.doc-base.*
+ rm -f debian/*.menu
+ for i in base calc impress math writer; do \
+ rm -f debian/openoffice.org-$$i.overrides.lintian; \
+ done
$(MAKE) -f debian/rules control
@@ -1759,6 +1763,16 @@
>
$(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop || exit 1 ;\
done
endif
+ # add version to .menu and .overrides.lintian
+ ICONVERSION=`grep PRODUCTVERSION
$(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 |
sed -e s/\ //g | sed -e s/\\\.//`; \
+ for i in base calc impress math writer; do \
+ cat debian/openoffice.org$(VER)-$$i.menu.in \
+ | sed -e s/@ICONVERSION@/$$ICONVERSION/ \
+ > debian/openoffice.org$(VER)-$$i.menu; \
+ cat debian/openoffice.org$(VER)-$$i.overrides.lintian.in \
+ | sed -e s/@ICONVERSION@/$$ICONVERSION/ \
+ > debian/openoffice.org$(VER)-$$i.overrides.lintian; \
+ done
ifeq "$(BUILD_PYUNO)" "y"
# PyUNO packging
