[SCM] Packaging for Red Eclipse branch, master, updated. debian/1.2-1-4-g772849a

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit d3094e936e3c4a6592622d1454e00f793a1f64f7
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Feb 25 03:43:59 2012 +0100

    Add patch to fix icon size and location

diff --git a/debian/patches/backported-fix-icon-sizes.patch b/debian/patches/backported-fix-icon-sizes.patch
new file mode 100644
index 0000000..d6dc91c
--- /dev/null
+++ b/debian/patches/backported-fix-icon-sizes.patch
@@ -0,0 +1,71 @@
+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(-)
+
+diff --git a/src/system-install.mk b/src/system-install.mk
+index 1d316b4..f157ecf 100644
+--- a/src/system-install.mk
++++ b/src/system-install.mk
+@@ -1,6 +1,7 @@
+ GZIPPER=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 @@ mandir=$(DESTDIR)$(prefix)/share/man
+ 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-docs: $(MANPAGES)
+ 
+ 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 @@ system-install-menus: icons
+ 		-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-docs:
+ 
+ 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
+-- 
+1.7.9
+
diff --git a/debian/patches/series b/debian/patches/series
index d40e02c..96b12ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 windowed-by-default.patch
 build-with-debug-symbols.patch
 build-with-system-enet.patch
+backported-fix-icon-sizes.patch

-- 
Packaging for Red Eclipse