[SCM] jxplorer - Java LDAP browser branch, master, updated. debian/3.3.1+dfsg-1-1-g1ea900c

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 1ea900c8b6219ba81871216d2017d48d691b33bb
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Apr 4 01:40:01 2013 +0200

    Fix icons gamma correction.

diff --git a/debian/changelog b/debian/changelog
index 7b8d9db..c7ff8f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jxplorer (3.3.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Fix icons gamma correction.
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Thu, 04 Apr 2013 01:34:46 +0200
+
 jxplorer (3.3.1+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index c6fef3b..992a91b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ export CLASSPATH
 
 VERSION := $(shell dpkg-parsechangelog|sed -n '/^Version/{s/Version: \(.*\)-[0-9]*$$/\1/;s/+dfsg//p}')
 USRSHARE:= debian/jxplorer/usr/share
+ICONS := $(USRSHARE)/icons/hicolor
 TEMPDIR := .tmp-orig-source
 
 %:
@@ -37,17 +38,15 @@ override_dh_auto_clean:
 
 override_dh_install:
 	dh_install
-	install -d -m 755 $(USRSHARE)/icons/hicolor/16x16/apps
-	convert images/logo_64.png -scale 16x16 \
-		$(USRSHARE)/icons/hicolor/16x16/apps/jxplorer.png
-	install -d -m 755 $(USRSHARE)/icons/hicolor/22x22/apps
-	convert images/logo_64.png -scale 22x22 \
-		$(USRSHARE)/icons/hicolor/22x22/apps/jxplorer.png
-	install -d -m 755 $(USRSHARE)/icons/hicolor/48x48/apps
-	convert images/logo_64.png -scale 48x48 \
-		$(USRSHARE)/icons/hicolor/48x48/apps/jxplorer.png
+	for i in 16 22 48; do \
+		mkdir -p $(ICONS)/$${i}x$${i}/apps; \
+		convert images/logo_64.png -colorspace RGB \
+			-resize $${i}x$${i} -colorspace sRGB \
+			$(ICONS)/$${i}x$${i}/apps/jxplorer.png; \
+	done
 	install -d -m 755 $(USRSHARE)/pixmaps
-	convert images/logo_64.png -scale 32x32 \
+	convert images/logo_64.png -colorspace RGB \
+		-resize 32x32 -colorspace sRGB \
 		$(USRSHARE)/pixmaps/jxplorer.xpm
 	install -d -m 755 $(USRSHARE)/applications
 	install -m 644 debian/jxplorer.desktop \

-- 
jxplorer - Java LDAP browser