[wesnoth] 01/01: remove all references to icons/{wesnoth_editor-icon.png, wesnoth_editor.desktop}

[Vincent Cheng]

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

vcheng pushed a commit to branch devel
in repository wesnoth.

commit 07bb49fdea11455bd681760599313882ab7e6708
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon Dec 28 15:17:19 2015 -0800

    remove all references to icons/{wesnoth_editor-icon.png,wesnoth_editor.desktop}
    
    These files were removed from upstream's tarballs starting with 1.13.2
---
 debian/rules                          | 4 ----
 debian/wesnoth-1.13-core.install      | 1 -
 debian/wesnoth-1.13-data.install      | 1 -
 debian/wesnoth-BRANCH-core.install.in | 1 -
 debian/wesnoth-BRANCH-data.install.in | 1 -
 5 files changed, 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 081b94b..ee8430f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,8 +141,6 @@ binary-indep: install
 
 	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-icon.png \
 		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)-icon.png
-	mv debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth_editor-icon.png \
-		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)_editor-icon.png
 
 	# /usr/share/doc symlinks
 	for i in wesnoth wesnoth-core wesnoth-music wesnoth-$(BRANCH_VERSION); do \
@@ -183,8 +181,6 @@ binary-arch: install
 	# move the desktop files to their proper name
 	mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth.desktop \
 		debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth-$(BRANCH_VERSION).desktop
-	mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth_editor.desktop \
-		debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth-$(BRANCH_VERSION)_editor.desktop
 	# add branch name to desktop entries
 	sed -i -e "/^Name/ s/$$/ ($(BRANCH_VERSION))/" \
 		debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/*.desktop
diff --git a/debian/wesnoth-1.13-core.install b/debian/wesnoth-1.13-core.install
index ed571c9..f42ed80 100644
--- a/debian/wesnoth-1.13-core.install
+++ b/debian/wesnoth-1.13-core.install
@@ -5,6 +5,5 @@ debian/wesnoth-1.13_editor /usr/games
 debian/tmp/usr/share/man/man6/wesnoth.6
 debian/tmp/usr/share/man/*/man6/wesnoth.6
 icons/wesnoth.desktop /usr/share/applications
-icons/wesnoth_editor.desktop /usr/share/applications
 debian/wesnoth-1.13-icon.xpm /usr/share/pixmaps
 debian/wesnoth-1.13_editor-icon.xpm /usr/share/pixmaps
diff --git a/debian/wesnoth-1.13-data.install b/debian/wesnoth-1.13-data.install
index 4d41313..73cf3de 100644
--- a/debian/wesnoth-1.13-data.install
+++ b/debian/wesnoth-1.13-data.install
@@ -1,5 +1,4 @@
 icons/wesnoth-icon.png /usr/share/icons/hicolor/64x64/apps
-icons/wesnoth_editor-icon.png /usr/share/icons/hicolor/64x64/apps
 debian/tmp/usr/share/games/wesnoth/1.13/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/1.13/data/COPYING.txt
 debian/tmp/usr/share/games/wesnoth/1.13/data/ai
diff --git a/debian/wesnoth-BRANCH-core.install.in b/debian/wesnoth-BRANCH-core.install.in
index 4660ec2..42d4be2 100644
--- a/debian/wesnoth-BRANCH-core.install.in
+++ b/debian/wesnoth-BRANCH-core.install.in
@@ -5,6 +5,5 @@ debian/wesnoth-BRANCH_editor /usr/games
 debian/tmp/usr/share/man/man6/wesnoth.6
 debian/tmp/usr/share/man/*/man6/wesnoth.6
 icons/wesnoth.desktop /usr/share/applications
-icons/wesnoth_editor.desktop /usr/share/applications
 debian/wesnoth-BRANCH-icon.xpm /usr/share/pixmaps
 debian/wesnoth-BRANCH_editor-icon.xpm /usr/share/pixmaps
diff --git a/debian/wesnoth-BRANCH-data.install.in b/debian/wesnoth-BRANCH-data.install.in
index 7103b8c..d074666 100644
--- a/debian/wesnoth-BRANCH-data.install.in
+++ b/debian/wesnoth-BRANCH-data.install.in
@@ -1,5 +1,4 @@
 icons/wesnoth-icon.png /usr/share/icons/hicolor/64x64/apps
-icons/wesnoth_editor-icon.png /usr/share/icons/hicolor/64x64/apps
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/*.cfg
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/COPYING.txt
 debian/tmp/usr/share/games/wesnoth/BRANCH/data/ai

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