------------------------------------------------------------
revno: 911
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2007-10-16 17:12:04 +0200
message:
lintian fixes, reindent changelog
modified:
changelog
openoffice.org-base.overrides.lintian.in
openoffice.org-calc.overrides.lintian.in
openoffice.org-draw.overrides.lintian.in
openoffice.org-impress.overrides.lintian.in
openoffice.org-math.overrides.lintian.in
openoffice.org-writer.overrides.lintian.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-16 11:36:17 +0000
+++ b/changelog 2007-10-16 15:12:04 +0000
@@ -22,11 +22,12 @@
* debian/copyright:
- point to /usr/share/common-licenses/LGPL-2.1 instead of just LGPL
as OOo is LGPL 2.1 only
- * debian/control.mozilla.in, debian/rules:
- - don't build mozilla-openoffice.org on amd64/ppc64, broken
- * merge from Ubuntu:
- - debian/control.in: Build openoffice.org-officebean only on architectures
- with java support
+ * debian/control.mozilla.in, debian/rules:
+ - don't build mozilla-openoffice.org on amd64/ppc64, broken
+ * debian/*.overrides.lintian.in: adapt for new lintian
+ * merge from Ubuntu:
+ - debian/control.in: Build openoffice.org-officebean only on architectures
+ with java support
[ Mirco Bauer ]
* debian/rules:
@@ -36,7 +37,7 @@
* debian/control.mono.in:
- enhanced package description
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 16 Oct 2007 13:36:07 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 16 Oct 2007 16:23:06 +0200
openoffice.org (1:2.3.0-1) experimental; urgency=low
=== modified file 'openoffice.org-base.overrides.lintian.in'
--- a/openoffice.org-base.overrides.lintian.in 2007-08-06 23:43:32 +0000
+++ b/openoffice.org-base.overrides.lintian.in 2007-10-16 15:12:04 +0000
@@ -1,4 +1,4 @@
openoffice.org-base: binary-or-shlib-defines-rpath
openoffice.org-base: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-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
+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-08-06 23:43:32 +0000
+++ b/openoffice.org-calc.overrides.lintian.in 2007-10-16 15:12:04 +0000
@@ -1,4 +1,4 @@
openoffice.org-calc: binary-or-shlib-defines-rpath
openoffice.org-calc: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-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
+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-08-06 23:43:32 +0000
+++ b/openoffice.org-draw.overrides.lintian.in 2007-10-16 15:12:04 +0000
@@ -1,4 +1,4 @@
openoffice.org-draw: binary-or-shlib-defines-rpath
openoffice.org-draw: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-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
+openoffice.org-draw: desktop-command-not-in-package
/usr/share/applications/ooo-draw.desktop ooffice
=== modified file 'openoffice.org-impress.overrides.lintian.in'
--- a/openoffice.org-impress.overrides.lintian.in 2007-08-06 23:43:32
+0000
+++ b/openoffice.org-impress.overrides.lintian.in 2007-10-16 15:12:04
+0000
@@ -1,4 +1,4 @@
openoffice.org-impress: binary-or-shlib-defines-rpath
openoffice.org-impress: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-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
+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-08-06 23:43:32 +0000
+++ b/openoffice.org-math.overrides.lintian.in 2007-10-16 15:12:04 +0000
@@ -1,4 +1,4 @@
openoffice.org-math: binary-or-shlib-defines-rpath
openoffice.org-math: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-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
+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-08-06 23:43:32
+0000
+++ b/openoffice.org-writer.overrides.lintian.in 2007-10-16 15:12:04
+0000
@@ -1,4 +1,4 @@
openoffice.org-writer: binary-or-shlib-defines-rpath
openoffice.org-writer: menu-icon-missing
/usr/share/icons/gnome/32x32/apps/[EMAIL PROTECTED]@-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
+openoffice.org-writer: desktop-command-not-in-package
/usr/share/applications/ooo-writer.desktop ooffice
=== modified file 'rules'
--- a/rules 2007-10-16 14:06:49 +0000
+++ b/rules 2007-10-16 15:12:04 +0000
@@ -2509,6 +2509,7 @@
-e 's/ / /' \
< $$dirname/extension.desktop \
>
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop || exit 1
+ sed -i -e 's/Application;//'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
sed -i -e 's/Office;/Office;System;/'
$(PKGDIR)-common/usr/share/applications/ooo$(VER)-extension.desktop
endif
