[eureka] 03/04: Remove eureka-desktop.patch, fixed upstream. Refresh the other two patches.

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository eureka.

commit db5b479654fdebced0fb86eccd82138e19d11df9
Author: Fabian Greffrath <fabian at debian.org>
Date:   Sat Jan 30 15:28:57 2016 +0100

    Remove eureka-desktop.patch, fixed upstream. Refresh the other two patches.
---
 debian/patches/eureka-desktop.patch     | 23 -----------------------
 debian/patches/reproducible-build.patch |  2 +-
 debian/patches/series                   |  1 -
 debian/patches/xdg-install.patch        |  4 ++--
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/debian/patches/eureka-desktop.patch b/debian/patches/eureka-desktop.patch
deleted file mode 100644
index 2c892d3..0000000
--- a/debian/patches/eureka-desktop.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Updated eureka.desktop file with:
- 1. %f on Exec line and a MimeType line, so can handle wad files from
-    file-system exploring/navigation programs
- 2. replaced "X-DoomEditor" category with "ActionGame"
- 3. added Keywords line
-Origin: https://sourceforge.net/p/eureka-editor/code/1740
-
---- a/misc/eureka.desktop
-+++ b/misc/eureka.desktop
-@@ -2,9 +2,11 @@
- Name=Eureka DOOM Editor
- GenericName=DOOM Editor
- Comment=Edit maps for the game DOOM
--Exec=eureka
-+Exec=eureka %f
- Icon=eureka
- Terminal=false
- Type=Application
--Categories=Game;X-DoomEditor;
-+Categories=Game;ActionGame;
- StartupNotify=false
-+MimeType=application/x-doom-wad;
-+Keywords=doom;heretic;level;map;wad;editor;builder;yadex;
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index d427933..353fa2d 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -6,7 +6,7 @@ Author: Fabian Greffrath <fabian+debian at greffrath.com>
 
 --- a/src/main.cc
 +++ b/src/main.cc
-@@ -839,7 +839,7 @@ static void ShowHelp()
+@@ -821,7 +821,7 @@ static void ShowHelp()
  
  static void ShowVersion()
  {
diff --git a/debian/patches/series b/debian/patches/series
index e149a1e..265de1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 xdg-install.patch
 reproducible-build.patch
-eureka-desktop.patch
diff --git a/debian/patches/xdg-install.patch b/debian/patches/xdg-install.patch
index 4315721..e8ebf83 100644
--- a/debian/patches/xdg-install.patch
+++ b/debian/patches/xdg-install.patch
@@ -3,10 +3,10 @@ Author: Fabian Greffrath <fabian+debian at greffrath.com>
 
 --- a/Makefile
 +++ b/Makefile
-@@ -171,8 +171,8 @@ install: stripped
+@@ -169,8 +169,8 @@ install: stripped
+ 	install -o root -m 644 common/*.* $(INSTALL_DIR)/common
  	install -o root -m 644 ports/*.* $(INSTALL_DIR)/ports
  #	install -o root -m 644 mods/*.*  $(INSTALL_DIR)/mods
- #	install -o root -m 644 ups/*.*  $(INSTALL_DIR)/ups
 -	xdg-desktop-menu  install --novendor misc/eureka.desktop
 -	xdg-icon-resource install --novendor --size 32 misc/eureka.xpm
 +#	xdg-desktop-menu  install --novendor misc/eureka.desktop

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