[Pkg-lyx-devel] [lyx] 01/01: LyX upstream provides its own .desktop file now. Remove the debian version and move the upstream file to the arch package. Closes: #762986, #763230

[Sven Hoexter]

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

hoexter pushed a commit to branch master
in repository lyx.

commit 652debe69ae8b3496fedd9b800f0b77f1856afdc
Author: Sven Hoexter <sven at timegate.de>
Date:   Mon Sep 29 11:39:46 2014 +0200

    LyX upstream provides its own .desktop file now. Remove the debian version and move the upstream file to the arch package. Closes: #762986, #763230
---
 debian/changelog   |  5 ++++-
 debian/lyx.desktop | 14 --------------
 debian/lyx.install |  1 -
 debian/rules       |  5 +++++
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1003f71..668a510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 lyx (2.1.2-2) UNRELEASED; urgency=low
 
-  * Update d/watch to the 2.1.x series path. 
+  * Update d/watch to the 2.1.x series path.
+  * LyX upstream provides its own .desktop file now. Remove the debian
+    version and move the upstream file to the arch package.
+    Closes: #762986, #763230
 
  -- Sven Hoexter <hoexter at debian.org>  Fri, 26 Sep 2014 14:35:37 +0200
 
diff --git a/debian/lyx.desktop b/debian/lyx.desktop
deleted file mode 100644
index 649b30c..0000000
--- a/debian/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/debian/lyx.install b/debian/lyx.install
index 870100f..9845f88 100644
--- a/debian/lyx.install
+++ b/debian/lyx.install
@@ -1,2 +1 @@
-debian/lyx.desktop /usr/share/applications
 debian/lyx-32x32.xpm /usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 108b35e..63cb95b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,11 @@ 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
+	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
 	mkdir -p debian/fonts-lyx/usr/share/fonts/truetype
 	mv debian/lyx-common/usr/share/lyx/fonts \

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