[SCM] jedit - Java plugin-based editor for programmers branch, master, updated. debian/5.0.0+dfsg-1-2-g36f65b6

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 36f65b63de9c01d74f7f9699fe371a1d1cd4b790
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Fri Apr 5 02:14:31 2013 +0200

    Fix icons gamma correction.

diff --git a/debian/changelog b/debian/changelog
index 14ce42a..959ed5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jedit (5.0.0+dfsg-2) UNRELEASED; urgency=low
 
   * B-D: Replace openjdk|sunjdk with default-jdk (Closes: #683502).
+  * Fix icons gamma correction.
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Mon, 25 Mar 2013 02:11:24 +0100
 
diff --git a/debian/rules b/debian/rules
index ff3fb98..d18e3fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ VERSION    := $(shell dpkg-parsechangelog|egrep '^Version:'|cut -f2 -d' '|cut -f
 PROPERTIES := $(CURDIR)/debian/build.properties
 ICON       := $(CURDIR)/build/doc/jedit.png
 DESTDIR    := $(CURDIR)/debian/jedit
+ICONS      := $(DESTDIR)/usr/share/icons/hicolor
 TMPDIR     := get-orig-source-tmp
 
 %:
@@ -31,17 +32,15 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_install
 	# icons
-	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/16x16/apps
-	convert $(ICON) -scale 16x16 \
-		$(DESTDIR)/usr/share/icons/hicolor/16x16/apps/jedit.png
-	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/22x22/apps
-	convert $(ICON) -scale 22x22 \
-		$(DESTDIR)/usr/share/icons/hicolor/22x22/apps/jedit.png
-	install -d -m 755 $(DESTDIR)/usr/share/icons/hicolor/48x48/apps
-	convert $(ICON) -scale 48x48 \
-		$(DESTDIR)/usr/share/icons/hicolor/48x48/apps/jedit.png
+	for i in 16 22 48; do \
+		mkdir -p $(ICONS)/$${i}x$${i}/apps; \
+		convert $(ICON) -colorspace RGB \
+			-resize $${i}x$${i} -colorspace sRGB \
+			$(ICONS)/$${i}x$${i}/apps/jedit.png; \
+	done
 	install -d -m 755 $(DESTDIR)/usr/share/pixmaps
-	convert $(ICON) -scale 32x32 \
+	convert $(ICON) -colorspace RGB \
+		-resize 32x32 -colorspace sRGB \
 		$(DESTDIR)/usr/share/pixmaps/jedit.xpm
 	# desktop
 	cp package-files/linux/deb/jedit.desktop debian/jedit.desktop

-- 
jedit - Java plugin-based editor for programmers