------------------------------------------------------------
revno: 928
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2007-10-24 07:47:46 +0200
message:
fix qstart.desktop installation
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-10-23 20:31:55 +0000
+++ b/changelog 2007-10-24 05:47:46 +0000
@@ -1,12 +1,15 @@
-openoffice.org (1:2.3.0-3.4pre) experimental; urgency=low
+openoffice.org (1:2.3.0-3.4pre) experimental; urgency=medium
* debian/control.mozilla.in:
- recommend konqueror-nsplugins (closes: #446911)
* debian/control.in:
- build-conflict against libicu-dev (= 3.8~d01-1) and rebuild against
libicu-dev 3.8-1 (closes: #447735)
+ * deian/rules:
+ - fix qstart.desktop installation. Yes, it's not obsolete (why did I thnk
+ that?) and ended up in the wrong package (closes: #447732)
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 23 Oct 2007 22:26:44 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 24 Oct 2007 01:22:49 +0200
openoffice.org (1:2.3.0-3) experimental; urgency=medium
=== modified file 'rules'
--- a/rules 2007-10-20 13:21:29 +0000
+++ b/rules 2007-10-24 05:47:46 +0000
@@ -1403,6 +1403,11 @@
cd debian/tmp/pkg; \
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
+ # Gtk quickstarter for the eggtrtray stuff, so to -gtk (via -gnome)
+ mkdir -p -m755 debian/tmp/pkg/openoffice.org-gnome/$(OODIR)/share/xdg
+ mv
debian/tmp/pkg/openoffice.org-common/$(OODIR)/share/xdg/qstart.desktop \
+ debian/tmp/pkg/openoffice.org-gnome/$(OODIR)/share/xdg
+
# move gengal stuff into -dev
mkdir -p debian/tmp/pkg/openoffice.org-dev/$(OODIR)/program
mv debian/tmp/pkg/openoffice.org-core/$(OODIR)/program/gengal* \
@@ -1616,12 +1621,8 @@
rm -rf $(PKGDIR)-gtk
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
-ifeq "$(PACKAGE_QUICKSTART)" "y"
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
-else
- rm -rf $(PKGDIR)-gnome/$(OODIR)/share
-endif
mv $(PKGDIR)-gtk/$(OODIR)/program/ucpgvfs1.uno.so \
$(PKGDIR)-gnome/$(OODIR)/program/
mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-set-default-application \
@@ -1757,7 +1758,16 @@
< $$dirname/$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop
|| exit 1 ;\
done
- # we don't need the share/xdgs
+
+ # 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`; \
+ sed -i -e "s,Exec=openoffice.org$$PRODUCTVERSION,Exec=ooffice$(VER)," \
+ -e "s,Name=OpenOffice.org $$PRODUCTVERSION,Name=OpenOffice.org
$(VER)," \
+ -e "s/ / /" \
+ $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
+ # we don't need the share/xdgs 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 \
@@ -1773,6 +1783,7 @@
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
else
# menu files from ooo-build/desktop
for p in writer calc impress draw math base; do \
