Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv28200
Modified Files:
changelog rules
Log Message:
- Fix Gnome desktop Exec= line, thanks to MK for spotting the problem
(closes: #214673)
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- changelog 7 Oct 2003 17:10:33 -0000 1.201
+++ changelog 8 Oct 2003 11:25:30 -0000 1.202
@@ -8,8 +8,11 @@
- add zlib1g-dev to Build-Depends: [RE]
* debian/openoffice.org-bin.install:
- Add wildcard suffix for Sparc libraries [CH]
+ * debian/rules:
+ - Fix Gnome desktop Exec= line, thanks to MK for spotting the problem
+ (closes: #214673) [CH]
- -- Chris Halls <[EMAIL PROTECTED]> Tue, 7 Oct 2003 19:09:31 +0200
+ -- Chris Halls <[EMAIL PROTECTED]> Wed, 8 Oct 2003 13:23:24 +0200
openoffice.org (1.1.0-1) unstable; urgency=low
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- rules 6 Oct 2003 16:49:17 -0000 1.134
+++ rules 8 Oct 2003 11:25:30 -0000 1.135
@@ -746,6 +746,16 @@
$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/bin/configimport.bin \
$(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program
+ # convert program/icon paths in desktop shortcuts in gnome (arch-dep)
package
+ for I in $(MAINPKGDIR)-gnome/usr/share/applications/*.desktop; do \
+ sed -e
's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
+ -e
's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),'
\
+ -e 's,/oooffice ,/ooffice ,' \
+ -e
's,Icon=.*/\([^/]*\.png\),Icon=/usr/lib/openoffice$(VER)/share/icons/\1,' \
+ < "$$I" > "$$I.new" ;\
+ rm "$$I"; mv "$$I.new" "$$I" ;\
+ done
+
touch $@
# Install files generated by setup into package directories
@@ -774,8 +784,7 @@
done
# convert program/icon paths in desktop shortcuts
- for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop \
- $(MAINPKGDIR)-gnome/usr/share/applications/*.desktop; do \
+ for I in $(MAINPKGDIR)/usr/share/applnk/*/*.desktop; do \
sed -e
's,Exec="\?/.*\(/usr/lib/openoffice$(VER)/program/setup\)"\?,Exec=\1,' \
-e
's,Exec="\?/.*/usr/lib/openoffice$(VER)/program/s\?\([^"]*\)"\?,Exec=/usr/bin/oo\1$(VER),'
\
-e 's,/oooffice ,/ooffice ,' \
