=== modified file 'debian/changelog'
--- debian/changelog	2010-01-19 21:34:49 +0000
+++ debian/changelog	2010-02-08 21:17:35 +0000
@@ -1,3 +1,11 @@
+picard (0.12.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    - change icon generation rules
+
+ -- Krzysztof Klimonda <kklimonda@syntaxhighlighted.com>  Mon, 08 Feb 2010 02:02:24 +0100
+
 picard (0.11-2ubuntu4) lucid; urgency=low
 
   * rebuild for ffmpeg versioned symbols

=== modified file 'debian/rules'
--- debian/rules	2009-10-02 15:10:11 +0000
+++ debian/rules	2010-02-08 21:22:49 +0000
@@ -35,10 +35,11 @@
 	dh_installdirs
 	# Let's create some icons
 	mkdir -p $(DESTDIR)/usr/share/pixmaps
-	for size in 16 22 24 32; do \
-		convert $(CURDIR)/picard-32.png -resize $${size} $(DESTDIR)/usr/share/pixmaps/picard-$${size}.xpm || exit 1; \
-		mkdir -p $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps || exit 1;  \
-		convert $(CURDIR)/picard-32.png -resize $${size} $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/picard.png || exit 1; \
+	convert $(CURDIR)/resources/images/32x32/picard.png -resize 22 $(DESTDIR)/usr/share/pixmaps/picard-22.xpm
+	mkdir -p $(DESTDIR)/usr/share/icons/hicolor/22x22/apps
+	convert $(CURDIR)/resources/images/32x32/picard.png -resize 22 $(DESTDIR)/usr/share/icons/hicolor/22x22/apps/picard.png
+	for size in 16 24 32; do \
+		convert $(CURDIR)/resources/images/$${size}x$${size}/picard.png $(DESTDIR)/usr/share/pixmaps/picard-$${size}.xpm || exit 1; \
 	done
 	# And fix the shebang
 	sed -i 's,^#!/usr/bin/python.*,#!/usr/bin/python,' $(DESTDIR)/usr/bin/picard