------------------------------------------------------------
revno: 1362
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2009-01-02 06:53:34 +0100
message:
- for writer/calc/impress/draw/math/base, do our changes on
the versions in share/xdg directly
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-01-02 05:09:15 +0000
+++ b/changelog 2009-01-02 05:53:34 +0000
@@ -6,6 +6,8 @@
- apply Python26 patchset if building with python 2.6
- install libsalalloc_malloc.so.3 into -qa-tools
- remove rest of if(n)eq ETCH_BACKPORT conditionals
+ - for writer/calc/impress/draw/math/base, do our changes on
+ the versions in share/xdg directly
* debian/control.reportdesign.in:
- add missing Depends: on ${java-runtime-depends}
* debian/control.in:
@@ -17,7 +19,7 @@
* debian/rules, debian/broffice.org.{preinst,postrm}.in: also change
UI-brand.xcu for BrOffice.org
- -- Rene Engelhard <r...@debian.org> Fri, 02 Jan 2009 06:08:18 +0100
+ -- Rene Engelhard <r...@debian.org> Fri, 02 Jan 2009 06:53:22 +0100
openoffice.org (1:3.0.1~rc1-2) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2009-01-02 05:09:15 +0000
+++ b/rules 2009-01-02 05:53:34 +0000
@@ -2156,15 +2156,13 @@
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
- # menu files from sysui
- dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
- sed -e 's,Exec=$${UNIXPRODUCTNAME}$${PRODUCTVERSION} \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
- -e
's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME}[0123456789]\+,Icon=ooo,' \
- -e 's,Name=$${PRODUCTNAME}
$${PRODUCTVERSION},Name=OpenOffice.org $(VER),' \
+ sed -e 's,Exec=openoffice.org$(VER) \(.*\)
%U,Exec=ooffice$(VER) \1 %U,' \
+ -e 's,Icon=openofficeorg[0123456789]\+,Icon=ooo,' \
+ -e 's,Name=OpenOffice.org $(OOVER),Name=OpenOffice.org
$(VER),' \
-e 's/ / /' \
- < $$dirname/$$p.desktop \
+ < $(PKGDIR)-$$p/$(OOBRANDDIR)/share/xdg/$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
done
@@ -2178,7 +2176,7 @@
-e "s/ / /" \
$(PKGDIR)-gtk/$(OOBRANDDIR)/share/xdg/qstart.desktop
endif
- # we don't need the share/xdgs except qstart
+ # we don't need the share/xdgs (anymore) 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 \
