[redeclipse] 365/494: remove icon size patch: already included

Martin Werner arand-guest at moszumanska.debian.org
Sun Jun 21 20:52:52 UTC 2015


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

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit 3c8153c544818aae8c321434cd468279169eefcf
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Jul 3 00:41:39 2012 +0200

    remove icon size patch: already included
---
 patches/backported-fix-icon-sizes.patch | 66 ---------------------------------
 patches/series                          |  1 -
 2 files changed, 67 deletions(-)

diff --git a/patches/backported-fix-icon-sizes.patch b/patches/backported-fix-icon-sizes.patch
deleted file mode 100644
index e0ca5d3..0000000
--- a/patches/backported-fix-icon-sizes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 32f8e90b46d86599a2de26d937b72655cbfd2873 Mon Sep 17 00:00:00 2001
-From: arand-2 <arand-2 at 2cd6abe5-5779-42d9-9038-cec04ae5ff40>
-Date: Sat, 25 Feb 2012 01:56:08 +0000
-Subject: [PATCH] system-install.mk: Fix icon sizes
-
-* Fix x32 and x48 icon sizes to match location, add x16 icon
-  - Worth backporting to Ubuntu for Unity
-
-git-svn-id: https://redeclipse.svn.sourceforge.net/svnroot/redeclipse@3614 2cd6abe5-5779-42d9-9038-cec04ae5ff40
----
- src/system-install.mk |   12 ++++++++++--
- 1 files changed, 10 insertions(+), 2 deletions(-)
-
---- a/src/system-install.mk
-+++ b/src/system-install.mk
-@@ -1,6 +1,7 @@
- GZIP=gzip
- 
- ICONS= \
-+	install/nix/redeclipse_x16.png \
- 	install/nix/redeclipse_x32.png \
- 	install/nix/redeclipse_x48.png \
- 	install/nix/redeclipse_x64.png \
-@@ -19,12 +20,15 @@
- menudir=$(DESTDIR)$(prefix)/share/applications
- icondir=$(DESTDIR)$(prefix)/share/icons/hicolor
- 
--install/nix/redeclipse_x32.png: redeclipse.ico
-+install/nix/redeclipse_x16.png: redeclipse.ico
- 	convert 'redeclipse.ico[0]' $@
- 
--install/nix/redeclipse_x48.png: redeclipse.ico
-+install/nix/redeclipse_x32.png: redeclipse.ico
- 	convert 'redeclipse.ico[1]' $@
- 
-+install/nix/redeclipse_x48.png: redeclipse.ico
-+	convert 'redeclipse.ico[2]' -resize 48x48 $@
-+
- install/nix/redeclipse_x64.png: redeclipse.ico
- 	convert 'redeclipse.ico[2]' $@
- 
-@@ -85,6 +89,7 @@
- 
- system-install-menus: icons
- 	install -d $(menudir)
-+	install -d $(icondir)/16x16/apps
- 	install -d $(icondir)/32x32/apps
- 	install -d $(icondir)/48x48/apps
- 	install -d $(icondir)/64x64/apps
-@@ -95,6 +100,8 @@
- 		-e 's, at REDECLIPSE@,$(redeclipse),g' \
- 		install/nix/redeclipse.desktop.am > \
- 		$(menudir)/$(redeclipse).desktop
-+	install -m644 install/nix/redeclipse_x16.png \
-+		$(icondir)/16x16/apps/$(redeclipse).png
- 	install -m644 install/nix/redeclipse_x32.png \
- 		$(icondir)/32x32/apps/$(redeclipse).png
- 	install -m644 install/nix/redeclipse_x48.png \
-@@ -134,6 +141,7 @@
- 
- system-uninstall-menus:
- 	@rm -fv $(menudir)/$(redeclipse).desktop
-+	@rm -fv $(icondir)/16x16/apps/$(redeclipse).png
- 	@rm -fv $(icondir)/32x32/apps/$(redeclipse).png
- 	@rm -fv $(icondir)/48x48/apps/$(redeclipse).png
- 	@rm -fv $(icondir)/64x64/apps/$(redeclipse).png
diff --git a/patches/series b/patches/series
index 15b0306..90ab62a 100644
--- a/patches/series
+++ b/patches/series
@@ -1,4 +1,3 @@
 windowed-by-default.patch
 build-with-system-enet.patch
-backported-fix-icon-sizes.patch
 build-with-ldflags.patch

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



More information about the Pkg-games-commits mailing list