[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. upstream/2.14.dfsg-76-g6a006d9

[Julian Taylor]

The following commit has been merged in the master branch:
commit 7fd13e59e19d23d34e148857a19f1feae82f3e34
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Wed Apr 6 12:34:14 2011 +0200

    use imagemagick instead of icoutils to extract KeePass.ico
    
    icoutils 0.29.1 required to extract compressed vista ico's is
    currently not availabe in debian.
    Use imagemagick for the extraction instead.

diff --git a/debian/control b/debian/control
index 023193e..41f2f58 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.
 Uploaders: Julian Taylor <jtaylor.debian at googlemail.com>
 Build-Depends: cli-common-dev (>= 0.7),
                debhelper (>= 7.0.50~),
+               imagemagick,
                mono-gmcs (>= 1.2.5),
                mono-xbuild
 Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index 994c1bb..591483d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,16 +29,16 @@ override_dh_auto_build:
 	xbuild /target:KeePass /property:Configuration=Release
 
 override_dh_install:
-	icotool -x $(CURDIR)/KeePass/Resources/Images/KeePass.ico
+	convert $(CURDIR)/KeePass/Resources/Images/KeePass.ico keepass2.png
 	mkdir -p $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/16x16/apps
-	mv KeePass_*_16x16x32.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/16x16/apps/keepass2.png
+	mv keepass2-8.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/16x16/apps/keepass2.png
 	mkdir -p $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/32x32/apps
-	mv KeePass_*_32x32x32.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/32x32/apps/keepass2.png
+	mv keepass2-7.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/32x32/apps/keepass2.png
 	mkdir -p $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/48x48/apps
-	mv KeePass_*_48x48x32.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/48x48/apps/keepass2.png
+	mv keepass2-6.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/48x48/apps/keepass2.png
 	mkdir -p $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/256x256/apps
-	mv KeePass_*_256x256x32.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/256x256/apps/keepass2.png
-	rm -f KeePass_*.png
+	mv keepass2-5.png $(CURDIR)/debian/keepass2/usr/share/icons/hicolor/256x256/apps/keepass2.png
+	rm -f keepass2*.png
 	dh_install
 	mv $(CURDIR)/debian/keepass2/usr/bin/keepass2.sh $(CURDIR)/debian/keepass2/usr/bin/keepass2
 

-- 
keepass2