------------------------------------------------------------
revno: 839
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2007-08-09 14:10:58 +0200
message:
generalize X-MandrivaLinux-* removal, update GSIs, -1
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-08-08 15:35:26 +0000
+++ b/changelog 2007-08-09 12:10:58 +0000
@@ -1,8 +1,9 @@
-openoffice.org (2.3.0~src680m225-0.1pre) experimental; urgency=low
+openoffice.org (2.3.0~src680m225-1) experimental; urgency=low
* new upstream snapshot (SRC680_m225)
* ooo-build:
- update (r10029)
+ - src: update GSIs from ftp.linux.cz: bg cs dz et fi mk sk
* debian/control.in:
- build-conflict against gjdoc (= 0.7.8-2) [RE]
- make -base suggest -report-builder and -report-builder enchance
@@ -28,7 +29,7 @@
* debian/rules, debian/control.in, debian/openoffice.org-report*:
component got renamed to sun-report-builder. sigh. adapt [RE]
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 8 Aug 2007 17:32:39 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 8 Aug 2007 18:39:20 +0200
openoffice.org (2.3.0~src680m224-1) experimental; urgency=high
=== modified file 'rules'
--- a/rules 2007-08-08 13:52:21 +0000
+++ b/rules 2007-08-09 12:10:58 +0000
@@ -1815,7 +1815,7 @@
#rm -r $(PKGDIR)-base
# invalid, according to lintian. make it shut up.
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-Office-Wordprocessors;//;
X-MandrivaLinux-Office-Spreadsheets;//;'
$(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
+ 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
else
# menu files from ooo-build/desktop
