[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-38-g08958e4
The following commit has been merged in the debian-experimental-4.0 branch:
commit 73cf6b24a5d4e08138cc256ac1e5ef00dc9a9560
Author: Benjamin Drung <bdrung@debian.org>
Date: Fri Mar 8 18:18:59 2013 +0100
Remove lintian override file generation.
diff --git a/libreoffice-base.lintian-overrides.in b/libreoffice-base.lintian-overrides
similarity index 88%
rename from libreoffice-base.lintian-overrides.in
rename to libreoffice-base.lintian-overrides
index 7601a10..05a158c 100644
--- a/libreoffice-base.lintian-overrides.in
+++ b/libreoffice-base.lintian-overrides
@@ -1,5 +1,5 @@
libreoffice-base: binary-or-shlib-defines-rpath
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: desktop-command-not-in-package usr/share/applications/libreoffice-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
similarity index 88%
rename from libreoffice-calc.lintian-overrides.in
rename to libreoffice-calc.lintian-overrides
index 51b083a..f609e67 100644
--- a/libreoffice-calc.lintian-overrides.in
+++ b/libreoffice-calc.lintian-overrides
@@ -1,5 +1,5 @@
libreoffice-calc: binary-or-shlib-defines-rpath
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: desktop-command-not-in-package usr/share/applications/libreoffice-calc.desktop libreoffice
libreoffice-calc: menu-command-not-in-package usr/share/menu/libreoffice-calc:5 usr/bin/libreoffice
diff --git a/libreoffice-core.lintian-overrides.in b/libreoffice-core.lintian-overrides
similarity index 100%
rename from libreoffice-core.lintian-overrides.in
rename to libreoffice-core.lintian-overrides
diff --git a/libreoffice-draw.lintian-overrides.in b/libreoffice-draw.lintian-overrides
similarity index 88%
rename from libreoffice-draw.lintian-overrides.in
rename to libreoffice-draw.lintian-overrides
index 7215752..abe8a40 100644
--- a/libreoffice-draw.lintian-overrides.in
+++ b/libreoffice-draw.lintian-overrides
@@ -1,5 +1,5 @@
libreoffice-draw: binary-or-shlib-defines-rpath
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: desktop-command-not-in-package usr/share/applications/libreoffice-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
similarity index 88%
rename from libreoffice-impress.lintian-overrides.in
rename to libreoffice-impress.lintian-overrides
index 7580bef..e9d52cf 100644
--- a/libreoffice-impress.lintian-overrides.in
+++ b/libreoffice-impress.lintian-overrides
@@ -1,5 +1,5 @@
libreoffice-impress: binary-or-shlib-defines-rpath
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: desktop-command-not-in-package usr/share/applications/libreoffice-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
similarity index 88%
rename from libreoffice-math.lintian-overrides.in
rename to libreoffice-math.lintian-overrides
index 32b504a..0d9f69d 100644
--- a/libreoffice-math.lintian-overrides.in
+++ b/libreoffice-math.lintian-overrides
@@ -1,5 +1,5 @@
libreoffice-math: binary-or-shlib-defines-rpath
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: desktop-command-not-in-package usr/share/applications/libreoffice-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
similarity index 88%
rename from libreoffice-writer.lintian-overrides.in
rename to libreoffice-writer.lintian-overrides
index d9afff3..58abc04 100644
--- a/libreoffice-writer.lintian-overrides.in
+++ b/libreoffice-writer.lintian-overrides
@@ -1,5 +1,5 @@
libreoffice-writer: binary-or-shlib-defines-rpath
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: desktop-command-not-in-package usr/share/applications/libreoffice-writer.desktop libreoffice
libreoffice-writer: menu-command-not-in-package usr/share/menu/libreoffice-writer:5 usr/bin/libreoffice
diff --git a/rules b/rules
index e9f451f..2e34c45 100755
--- a/rules
+++ b/rules
@@ -1283,9 +1283,6 @@ clean-debdir:
rm -f debian/libreoffice-dev-doc.doc-base.*
rm -f debian/*.menu
- for i in base calc core common draw impress math writer; do \
- rm -f debian/libreoffice-$$i.lintian-overrides; \
- done
rm -f debian/*.install debian/*.dirs debian/*.changelog
rm -f debian/catalog.xml
rm -f debian/openoffice.org-dtd-officedocument1.0.xmlcatalogs
@@ -2226,17 +2223,12 @@ endif
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop; \
done
perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
- # add version to .menu and .lintian-overrides
+ # add version to .menu
for i in base calc draw impress math writer; do \
cat debian/libreoffice-$$i.menu.in \
| sed -e s/@VER@// \
> debian/libreoffice-$$i.menu; \
done; \
- for i in base calc core draw impress math writer; do \
- cat debian/libreoffice-$$i.lintian-overrides.in \
- | sed -e s/@VER@// \
- > debian/libreoffice-$$i.lintian-overrides; \
- done
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
--
LibreOffice packaging repository
Reply to: