------------------------------------------------------------
revno: 909
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-10-16 13:36:17 +0200
message:
really fix ooo-extension.desktop installation
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-10-15 12:18:11 +0000
+++ b/changelog 2007-10-16 11:36:17 +0000
@@ -10,7 +10,8 @@
- migrate from num-cpus= to parallel= in DEB_BUILD_OPTIONS, the latter
is the quasi standard and will also be used by -j of the new
dpkg-buildpackage
- - fix ooo-extension.desktop fixing
+ - fix ooo-extension.desktop fixing and actually install it in the right
+ target...
- we build against libcurl3-gnutls, so build against -gnutls for neon, too
- default to -P<number of cores> for PARALLEL_BUILD=y
- build against neon 0.27.x
@@ -35,7 +36,7 @@
* debian/control.mono.in:
- enhanced package description
- -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 15 Oct 2007 13:51:32 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 16 Oct 2007 13:36:07 +0200
openoffice.org (1:2.3.0-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-10-15 12:18:11 +0000
+++ b/control 2007-10-16 11:36:17 +0000
@@ -2844,6 +2844,7 @@
.
Note that currently the use of Mono for add-ins & scripting inside
OpenOffice.org is *not* yet supported.
+
Package: openoffice.org-qa-tools
Section: devel
Priority: extra
=== modified file 'rules'
--- a/rules 2007-10-14 23:32:28 +0000
+++ b/rules 2007-10-16 11:36:17 +0000
@@ -1780,13 +1780,7 @@
-e 's/ / /' \
< $$dirname/$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
- done; \
- mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
- sed -e 's,Exec=unopkg,Exec=/$(OODIR)/program/unopkg,' \
- -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
- -e 's/ / /' \
- < $$dirname/extension.desktop \
- >
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop || exit 1
+ done
# qstart.desktop is different to the above. Should be handled by
--with-unix-wrapper of ooo-build
# but that somehow doesn't work as expected. FIXME.
PRODUCTVERSION=`grep PRODUCTVERSION
$(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 |
sed -e s/\ //g`; \
@@ -1806,10 +1800,8 @@
sed -i -e '/^MimeType/s,text/rtf,text/rtf;application/rtf,' \
$(PKGDIR)-writer/usr/share/applications/ooo$(VER)-writer.desktop
sed -i -e 's/Office;/Office;Graphics;/'
$(PKGDIR)-draw/usr/share/applications/ooo$(VER)-draw.desktop
- sed -i -e 's/Office;/Office;System;/'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
# invalid, according to lintian. make it shut up.
- for i in writer calc impress draw math base extension; do \
- if [ "$$i" = "extension" ]; then p=common; else p=$$i; fi; \
+ for i in writer calc impress draw math base; do \
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//;
s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;'
$(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$i.desktop; \
done
perl -pi -e 's/Application;//'
$(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
@@ -2508,6 +2500,18 @@
$(PKGDIR)-common/$(OODIR)/program/intro.bmp; \
fi
+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`" ;\
+ mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
+ sed -e 's,Exec=unopkg,Exec=/$(OODIR)/program/unopkg,' \
+ -e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=OpenOffice.org
$(VER),' \
+ -e 's/ / /' \
+ < $$dirname/extension.desktop \
+ >
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop || exit 1
+ sed -i -e 's/Office;/Office;System;/'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
+endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
