./packages/openofficeorg/3.1/experimental r1409: merge
------------------------------------------------------------
revno: 1409
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-02-15 11:06:02 +0100
message:
merge
modified:
changelog
openoffice.org-base.lintian-overrides.in
openoffice.org-calc.lintian-overrides.in
------------------------------------------------------------
revno: 1332.1.68
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sun 2009-02-15 11:04:33 +0100
message:
+ * debian/openoffice.org-{base,calc}.overrides.lintian: override
+ desktop-command-not-in-package here, too (like in all the other modules)
modified:
changelog
openoffice.org-base.lintian-overrides.in
openoffice.org-calc.lintian-overrides.in
=== modified file 'changelog'
--- a/changelog 2009-02-15 03:04:45 +0000
+++ b/changelog 2009-02-15 10:06:02 +0000
@@ -54,6 +54,8 @@
- add Recommends openoffice.org-math to openoffice.org-writer
- specify ARCH_FLAGS as -O0 when DEB_BULD_OPTIONS contains noopt
(closes: #514166)
+ * debian/openoffice.org-{base,calc}.overrides.lintian: override
+ desktop-command-not-in-package here, too (like in all the other modules)
[ Chris Halls ]
* ooo-build/patches/dev300/sfx2-recent-files.diff:
=== modified file 'openoffice.org-base.lintian-overrides.in'
--- a/openoffice.org-base.lintian-overrides.in 2008-03-19 13:49:06 +0000
+++ b/openoffice.org-base.lintian-overrides.in 2009-02-15 10:04:33 +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.lintian-overrides.in'
--- a/openoffice.org-calc.lintian-overrides.in 2008-03-19 13:49:06 +0000
+++ b/openoffice.org-calc.lintian-overrides.in 2009-02-15 10:04:33 +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
Reply to: