------------------------------------------------------------
revno: 806
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Fri 2007-10-19 19:28:34 +0200
message:
really fixooo-extension.desktop installation (merge from 2.3)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 17:21:54 +0000
+++ b/changelog 2007-10-19 17:28:34 +0000
@@ -11,6 +11,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 and actually install it in the right
+ target...
+ we build against libcurl3-gnutls, so build against libneon26-gnutls for
consistency
+ use LC_ALL=C instead of LANG=C for date call, else LC_ALL or LC_TIME
=== modified file 'rules'
--- a/rules 2007-10-19 17:21:54 +0000
+++ b/rules 2007-10-19 17:28:34 +0000
@@ -1678,13 +1678,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`; \
@@ -1704,9 +1698,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 \
+ 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)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
done
perl -pi -e 's/Application;//'
$(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
@@ -2384,7 +2377,19 @@
debian/$$i/usr/share/bug/$$i/control; \
fi ;\
done
-
+
+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
