[Pkg-lyx-devel] [lyx] 09/09: Make sure desktop file and icons are installed in the appropriate location

[Nick Andrik]

This is an automated email from the git hooks/post-receive script.

andrikos-guest pushed a commit to branch master
in repository lyx.

commit 75449dffb47469ef085cb9e34d326ee0b79d6546
Author: Nick Andrik <nick.andrik at gmail.com>
Date:   Mon Oct 13 04:14:18 2014 +0200

    Make sure desktop file and icons are installed in the appropriate location
---
 debian/lyx-common.links | 1 -
 debian/rules            | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/lyx-common.links b/debian/lyx-common.links
index 07acb72..8c9397a 100644
--- a/debian/lyx-common.links
+++ b/debian/lyx-common.links
@@ -1,3 +1,2 @@
-usr/share/lyx/images/lyx.png usr/share/icons/hicolor/48x48/apps/lyx.png
 usr/share/mythes usr/share/lyx/thes
 usr/share/lyx/scripts/bash_completion usr/share/bash-completion/completions/lyx
diff --git a/debian/rules b/debian/rules
index 4218e98..1d565cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,9 +31,9 @@ override_dh_auto_install:
 	mv debian/lyx-common/usr/bin debian/lyx/usr/bin
 	mv debian/lyx-common/usr/share/man debian/lyx/usr/share/man
 
-# move desktop file and svg icon to the arch package
+# move desktop file and icons to general lyx directory
+	mkdir -p debian/lyx/usr/share
 	mv debian/lyx-common/usr/share/applications debian/lyx/usr/share
-	rm -r debian/lyx-common/usr/share/icons/hicolor/48x48/
 	mv debian/lyx-common/usr/share/icons debian/lyx/usr/share
 
 # move fonts to font package

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lyx/lyx.git