r831 ./packages/openofficeorg/2.3/experimental: lintian fixes
------------------------------------------------------------
revno: 831
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2007-08-07 01:43:32 +0200
message:
lintian fixes
modified:
changelog
openoffice.org-base.overrides.lintian.in
openoffice.org-calc.overrides.lintian.in
openoffice.org-draw.overrides.lintian.in
openoffice.org-gtk.overrides.lintian
openoffice.org-impress.overrides.lintian.in
openoffice.org-math.overrides.lintian.in
openoffice.org-writer.overrides.lintian.in
rules
template.desktop.in
=== modified file 'changelog'
--- a/changelog 2007-08-06 22:43:37 +0000
+++ b/changelog 2007-08-06 23:43:32 +0000
@@ -3,15 +3,20 @@
* debian/control.in:
- build-conflict against gjdoc (= 0.7.8-2) [RE]
* debian/rules:
- - clean up multi-threaded build support [CC]
+ - clean up multi-threaded build support [CC, RE]
+ - remove share/xdgs .desktop files (except qstart.desktop), not
+ needed
* debian/*:
- remove Ubuntu conditionals added in -1 again, it makes
the rules for Debian even harder to read/understand than
- it's even now...
+ it's even now... [RE]
* debian/soffice.sh, debian/rules:
- install /etc/openoffice/soffice.sh, merged from Ubuntu. [CC, RE]
+ * debian/rules, debian/overrides.lintian:
+ - fix or override (package depends on package containing the file)
+ lintians new desktop warnings [RE]
- -- Rene Engelhard <rene@debian.org> Mon, 6 Aug 2007 18:20:32 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 7 Aug 2007 01:42:04 +0200
openoffice.org (2.3.0~src680m224-1) experimental; urgency=high
=== modified file 'openoffice.org-base.overrides.lintian.in'
--- a/openoffice.org-base.overrides.lintian.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-base.overrides.lintian.in 2007-08-06 23:43:32 +0000
@@ -1,3 +1,4 @@
openoffice.org-base: binary-or-shlib-defines-rpath
openoffice.org-base: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-base.xpm
openoffice.org-base: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-base:4
+openoffice.org-base: desktop-command-not-in-package ./usr/share/applications/ooo-base.desktop ooffice
=== modified file 'openoffice.org-calc.overrides.lintian.in'
--- a/openoffice.org-calc.overrides.lintian.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-calc.overrides.lintian.in 2007-08-06 23:43:32 +0000
@@ -1,3 +1,4 @@
openoffice.org-calc: binary-or-shlib-defines-rpath
openoffice.org-calc: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-calc.xpm
openoffice.org-calc: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-calc:5
+openoffice.org-calc: desktop-command-not-in-package ./usr/share/applications/ooo-calc.desktop ooffice
=== modified file 'openoffice.org-draw.overrides.lintian.in'
--- a/openoffice.org-draw.overrides.lintian.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-draw.overrides.lintian.in 2007-08-06 23:43:32 +0000
@@ -1,3 +1,4 @@
openoffice.org-draw: binary-or-shlib-defines-rpath
openoffice.org-draw: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-draw.xpm
openoffice.org-draw: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-draw:5
+openoffice.org-draw: desktop-command-not-in-package ./usr/share/applications/ooo-draw.desktop ooffice
=== modified file 'openoffice.org-gtk.overrides.lintian'
--- a/openoffice.org-gtk.overrides.lintian 2006-07-16 19:42:06 +0000
+++ b/openoffice.org-gtk.overrides.lintian 2007-08-06 23:43:32 +0000
@@ -1,1 +1,2 @@
openoffice.org-gtk: binary-or-shlib-defines-rpath
+openoffice.org-gtk: desktop-command-not-in-package ./usr/lib/openoffice/share/xdg/qstart.desktop ooffice
=== modified file 'openoffice.org-impress.overrides.lintian.in'
--- a/openoffice.org-impress.overrides.lintian.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-impress.overrides.lintian.in 2007-08-06 23:43:32 +0000
@@ -1,3 +1,4 @@
openoffice.org-impress: binary-or-shlib-defines-rpath
openoffice.org-impress: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-impress.xpm
openoffice.org-impress: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-impress:5
+openoffice.org-impress: desktop-command-not-in-package ./usr/share/applications/ooo-impress.desktop ooffice
=== modified file 'openoffice.org-math.overrides.lintian.in'
--- a/openoffice.org-math.overrides.lintian.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-math.overrides.lintian.in 2007-08-06 23:43:32 +0000
@@ -1,3 +1,4 @@
openoffice.org-math: binary-or-shlib-defines-rpath
openoffice.org-math: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-math.xpm
openoffice.org-math: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-math:5
+openoffice.org-math: desktop-command-not-in-package ./usr/share/applications/ooo-math.desktop ooffice
=== modified file 'openoffice.org-writer.overrides.lintian.in'
--- a/openoffice.org-writer.overrides.lintian.in 2007-07-30 12:10:15 +0000
+++ b/openoffice.org-writer.overrides.lintian.in 2007-08-06 23:43:32 +0000
@@ -1,3 +1,4 @@
openoffice.org-writer: binary-or-shlib-defines-rpath
openoffice.org-writer: menu-icon-missing /usr/share/icons/gnome/32x32/apps/openofficeorg@ICONVERSION@-writer.xpm
openoffice.org-writer: menu-item-contains-unknown-tag kderemove /usr/share/menu/openoffice.org-writer:5
+openoffice.org-writer: desktop-command-not-in-package ./usr/share/applications/ooo-writer.desktop ooffice
=== modified file 'rules'
--- a/rules 2007-08-06 22:43:37 +0000
+++ b/rules 2007-08-06 23:43:32 +0000
@@ -1800,6 +1800,9 @@
-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 \
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; \
@@ -1810,6 +1813,10 @@
sed -i -e 's/Office;/Office;System;/' $(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
#mv $(PKGDIR)-base/usr/share/applications/ooo$(VER)-base.desktop $(PKGDIR)-core/usr/share/applications
#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//' $(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
+ done
else
# menu files from ooo-build/desktop
for p in writer calc impress draw math base; do \
=== modified file 'template.desktop.in'
--- a/template.desktop.in 2007-08-02 12:26:21 +0000
+++ b/template.desktop.in 2007-08-06 23:43:32 +0000
@@ -7,5 +7,5 @@
Icon=ooo-template.png
Terminal=false
Type=Application
-Categories=GNOME;Application;Office;X-Ximian-Main;
+Categories=Office
StartupNotify=true
Reply to: