[SCM] sweethome3d - Interior 2D design application with 3D preview branch, master, updated. debian/3.5+dfsg-1-7-gab3525f

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit 86324d85748fe18e6b8922ad9fa6c37122f9e827
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Sep 18 14:53:42 2012 +0200

    Remove gamma correction from icons (Closes: #687823).

diff --git a/debian/changelog b/debian/changelog
index 68a4b17..50d836a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sweethome3d (3.6+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #687996).
   * B-D on default-jdk, runtime on default-jre (Closes: #684298).
+  * Remove gamma correction from icons (Closes: #687823).
 
  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 18 Sep 2012 13:36:44 +0200
 
diff --git a/debian/rules b/debian/rules
index 9cf0b84..0424a9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,17 +17,14 @@ override_dh_auto_build:
 override_dh_auto_install:
 	mv install/SweetHome3D-$(VERSION).jar $(JARFILE)
 	# icons
-	mkdir -p $(ICONS)/16 $(ICONS)/22 $(ICONS)/48 $(ICONS)/128
-	convert $(ABOUT) -resize 16x16 \
-		-background 'rgba(0,0,0,0)' -gravity center -extent 16x16 $(ICONS)/16/sweethome3d.png
-	convert $(ABOUT) -resize 22x22 \
-		-background 'rgba(0,0,0,0)' -gravity center -extent 22x22 $(ICONS)/22/sweethome3d.png
-	convert $(ABOUT) -resize 48x48 \
-		-background 'rgba(0,0,0,0)' -gravity center -extent 48x48 $(ICONS)/48/sweethome3d.png
-	convert $(ABOUT) -resize 128x128 \
-		-background 'rgba(0,0,0,0)' -gravity center -extent 128x128 $(ICONS)/128/sweethome3d.png
-	convert $(ABOUT) -resize 32x32 \
-		-background 'rgba(0,0,0,0)' -gravity center -extent 32x32 $(ICONS)/sweethome3d.xpm
+	for i in 16 22 48 128; do \
+		mkdir -p $(ICONS)/$$i; \
+		convert $(ABOUT) -resize $${i}x$${i} -background 'rgba(0,0,0,0)' \
+			-colorspace RGB -gravity center -extent $${i}x$${i} \
+			$(ICONS)/$$i/sweethome3d.png; \
+	done
+	convert $(ABOUT) -resize 32x32 -background 'rgba(0,0,0,0)' \
+		-colorspace RGB -gravity center -extent 32x32 $(ICONS)/sweethome3d.xpm
 	dh_install
 
 override_dh_auto_clean:

-- 
sweethome3d - Interior 2D design application with 3D preview