[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-73-ge57f76e



The following commit has been merged in the debian-experimental-3.5 branch:
commit a8f75c90e6a69f0e5bfabbc217dab6f60cd3464f
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Mar 13 08:16:59 2012 +0000

    fix up merge; remove @ICONVERSION@ fron .lintian-overrides.in again

diff --git a/libreoffice-base.lintian-overrides.in b/libreoffice-base.lintian-overrides.in
index 004e630..7601a10 100644
--- a/libreoffice-base.lintian-overrides.in
+++ b/libreoffice-base.lintian-overrides.in
@@ -1,5 +1,5 @@
 libreoffice-base: binary-or-shlib-defines-rpath
-libreoffice-base: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-base.xpm
+libreoffice-base: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice-base.xpm
 libreoffice-base: menu-item-contains-unknown-tag kderemove usr/share/menu/libreoffice-base:4
 libreoffice-base: desktop-command-not-in-package usr/share/applications/libreoffice@VER@-base.desktop libreoffice
 libreoffice-base: menu-command-not-in-package usr/share/menu/libreoffice-base:4 usr/bin/libreoffice
diff --git a/libreoffice-calc.lintian-overrides.in b/libreoffice-calc.lintian-overrides.in
index 78c2b0e..51b083a 100644
--- a/libreoffice-calc.lintian-overrides.in
+++ b/libreoffice-calc.lintian-overrides.in
@@ -1,5 +1,5 @@
 libreoffice-calc: binary-or-shlib-defines-rpath
-libreoffice-calc: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-calc.xpm
+libreoffice-calc: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice-calc.xpm
 libreoffice-calc: menu-item-contains-unknown-tag kderemove usr/share/menu/libreoffice-calc:5
 libreoffice-calc: desktop-command-not-in-package usr/share/applications/libreoffice@VER@-calc.desktop libreoffice
 libreoffice-calc: menu-command-not-in-package usr/share/menu/libreoffice-calc:5 usr/bin/libreoffice
diff --git a/libreoffice-draw.lintian-overrides.in b/libreoffice-draw.lintian-overrides.in
index a1a42cb..7215752 100644
--- a/libreoffice-draw.lintian-overrides.in
+++ b/libreoffice-draw.lintian-overrides.in
@@ -1,5 +1,5 @@
 libreoffice-draw: binary-or-shlib-defines-rpath
-libreoffice-draw: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-draw.xpm
+libreoffice-draw: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice-draw.xpm
 libreoffice-draw: menu-item-contains-unknown-tag kderemove usr/share/menu/libreoffice-draw:5
 libreoffice-draw: desktop-command-not-in-package usr/share/applications/libreoffice@VER@-draw.desktop libreoffice
 libreoffice-draw: menu-command-not-in-package usr/share/menu/libreoffice-draw:5 usr/bin/libreoffice
diff --git a/libreoffice-impress.lintian-overrides.in b/libreoffice-impress.lintian-overrides.in
index 4826523..7580bef 100644
--- a/libreoffice-impress.lintian-overrides.in
+++ b/libreoffice-impress.lintian-overrides.in
@@ -1,5 +1,5 @@
 libreoffice-impress: binary-or-shlib-defines-rpath
-libreoffice-impress: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-impress.xpm
+libreoffice-impress: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice-impress.xpm
 libreoffice-impress: menu-item-contains-unknown-tag kderemove usr/share/menu/libreoffice-impress:5
 libreoffice-impress: desktop-command-not-in-package usr/share/applications/libreoffice@VER@-impress.desktop libreoffice
 libreoffice-impress: menu-command-not-in-package usr/share/menu/libreoffice-impress:5 usr/bin/libreoffice
diff --git a/libreoffice-math.lintian-overrides.in b/libreoffice-math.lintian-overrides.in
index 3523f3c..32b504a 100644
--- a/libreoffice-math.lintian-overrides.in
+++ b/libreoffice-math.lintian-overrides.in
@@ -1,5 +1,5 @@
 libreoffice-math: binary-or-shlib-defines-rpath
-libreoffice-math: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-math.xpm
+libreoffice-math: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice-math.xpm
 libreoffice-math: menu-item-contains-unknown-tag kderemove usr/share/menu/libreoffice-math:5
 libreoffice-math: desktop-command-not-in-package usr/share/applications/libreoffice@VER@-math.desktop libreoffice
 libreoffice-math: menu-command-not-in-package usr/share/menu/libreoffice-math:5 usr/bin/libreoffice
diff --git a/libreoffice-writer.lintian-overrides.in b/libreoffice-writer.lintian-overrides.in
index 0ad53e8..d9afff3 100644
--- a/libreoffice-writer.lintian-overrides.in
+++ b/libreoffice-writer.lintian-overrides.in
@@ -1,5 +1,5 @@
 libreoffice-writer: binary-or-shlib-defines-rpath
-libreoffice-writer: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice@ICONVERSION@-writer.xpm
+libreoffice-writer: menu-icon-missing usr/share/icons/hicolor/32x32/apps/libreoffice-writer.xpm
 libreoffice-writer: menu-item-contains-unknown-tag kderemove usr/share/menu/libreoffice-writer:5
 libreoffice-writer: desktop-command-not-in-package usr/share/applications/libreoffice@VER@-writer.desktop libreoffice
 libreoffice-writer: menu-command-not-in-package usr/share/menu/libreoffice-writer:5 usr/bin/libreoffice

-- 
LibreOffice packaging repository


Reply to: