r852 ./packages/openofficeorg/2.3/experimental: fix snafu when getting changes over; more .desktop fixes
------------------------------------------------------------
revno: 852
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-08-15 13:04:31 +0200
message:
fix snafu when getting changes over; more .desktop fixes
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-08-15 10:18:10 +0000
+++ b/changelog 2007-08-15 11:04:31 +0000
@@ -27,13 +27,16 @@
provide libicu-dev)
- update for OOG680
- handle epochs in $(BINARY_VERSION)
+ - fix X-KDE-Protocols addition to not add it a second, third etc. time on
+ incremental builds
+ - ooo-extension.desktop also needs Application; removed
* debian/control.{postgresql,}.in, debian/rules,
debian/openoffice.org-sdbc-postgresql.*: package PostgreSQL SDBC Driver
from http://dba.openoffice.org/drivers/postgresql/ (closes: #346475)
* debian/copyright: update from THIRDPARTYLICENSE.html, removing stuff which
is not (anymore) in OOos source...
- -- Rene Engelhard <rene@debian.org> Wed, 15 Aug 2007 12:09:15 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 15 Aug 2007 13:02:44 +0200
openoffice.org (2.3.0~src680m225-1) experimental; urgency=low
=== modified file 'rules'
--- a/rules 2007-08-15 10:39:24 +0000
+++ b/rules 2007-08-15 11:04:31 +0000
@@ -22,7 +22,7 @@
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d- -f1)
BASE_VERSION:=$(UPSTREAM_VERSION)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | | sed -e s/^[0-9]:// | tr [~] [\\-])
+HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
#HELP_L10N_VIRTUAL_VERSION:=2.2
BINARY_VERSION=$(SOURCE_VERSION)
@@ -1802,14 +1802,16 @@
rm -f $$f; done
for f in `find debian -name '*.desktop'`; do \
sed -i -e '/^Comment\[de\]/s/- *\([a-zA-Z0-9]*\) *macht.*glich.*$$/mit \1/' $$f; \
- echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
+ if ! grep -q X-KDE-Protocols $$i; then \
+ echo 'X-KDE-Protocols=file,http,smb,ftp,webdav' >> $$f; \
+ fi; \
done
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; do \
+ for i in writer calc impress draw math base extension; 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
Reply to: