tags 608432 patch
thanks
Hi,
On Thu, 30 Dec 2010 21:57:13 +0100
Martin Mares <m...@ucw.cz> wrote:
> When I run an application using desktop files (e.g., geeqie), I get the
> following warning message:
>
> Desktop file '/usr/share/applications/fontforge.desktop' should not include
> extension in Icon key: 'ffanvil32.xpm'
>
> Also, the `desktop-file-validate' utility warns about this problem (and
> one more). Could you please fix it?
Thanks for the report, now I start investigating...
It seems to be introduced in 0.0.20090224-1 as
debian/patches/023_fix_desktop_file
> fontforge (0.0.20090224-1) experimental; urgency=low
(snip)
> - added the patch 023_fix_desktop_file for adjusting the desktop file for
> Debian.
I guess it was intended to adjust for Debian menu policy, it says "The icons
should be in xpm format."
http://www.debian.org/doc/packaging-manuals/menu.html/ch3.html#s3.7
But it is for Debian menu, not for *.desktop file.
I suggest that
- remove its patch
- adjust icon directory in /usr/share/pixmaps
If it's okay, I'll commit to svn.
--
Regards,
Hideki Yamane henrich @ debian.or.jp/org
http://wiki.debian.org/HidekiYamane
diff -urN fontforge-0.0.20100501.orig/Packaging/fontforge.desktop fontforge-0.0.20100501/Packaging/fontforge.desktop
--- fontforge-0.0.20100501.orig/Packaging/fontforge.desktop 2011-05-04 17:23:02.225686237 +0900
+++ fontforge-0.0.20100501/Packaging/fontforge.desktop 2011-05-08 21:29:46.110011546 +0900
@@ -8,7 +8,7 @@
Comment[fr]=Un constructeur des polices
Comment[zh_TW]=FontForge æéåå編輯å¨
Exec=fontforge
-Icon=ffanvil32.xpm
+Icon=fontforge.png
Terminal=false
Type=Application
Categories=Application;Graphics;
diff -urN fontforge-0.0.20100501.orig/debian/dirs fontforge-0.0.20100501/debian/dirs
--- fontforge-0.0.20100501.orig/debian/dirs 2010-09-27 00:43:29.000000000 +0900
+++ fontforge-0.0.20100501/debian/dirs 2011-05-08 21:32:00.370677306 +0900
@@ -1,4 +1,4 @@
usr/bin
usr/share/fontforge/pixmaps
-usr/share/icons
+usr/share/pixmaps
usr/share/applications
diff -urN fontforge-0.0.20100501.orig/debian/ffanvil32.xpm fontforge-0.0.20100501/debian/ffanvil32.xpm
--- fontforge-0.0.20100501.orig/debian/ffanvil32.xpm 2006-08-27 19:28:08.000000000 +0900
+++ fontforge-0.0.20100501/debian/ffanvil32.xpm 1970-01-01 09:00:00.000000000 +0900
@@ -1,130 +0,0 @@
-/* XPM */
-static char * ffanvil32_kb_xpm[] = {
-"32 32 95 2",
-" c None",
-". c #BEBEBE",
-"+ c #0C0C0C",
-"@ c #4F4F4F",
-"# c #D4D4D4",
-"$ c #ABABAB",
-"% c #9F9F9F",
-"& c #B3B3B3",
-"* c #D3D3D3",
-"= c #D8D8D8",
-"- c #7E7E7E",
-"; c #585858",
-"> c #535353",
-", c #828282",
-"' c #B9B9B9",
-") c #8B8B8B",
-"! c #FFFFFF",
-"~ c #8F8F8F",
-"{ c #CFCFCF",
-"] c #B6B6B6",
-"^ c #7C7C7C",
-"/ c #555555",
-"( c #606060",
-"_ c #C9C9C9",
-": c #868686",
-"< c #565656",
-"[ c #3C3C3C",
-"} c #272727",
-"| c #121212",
-"1 c #BBBBBB",
-"2 c #AFAFAF",
-"3 c #676767",
-"4 c #595959",
-"5 c #4A4A4A",
-"6 c #353535",
-"7 c #1F1F1F",
-"8 c #0E0E0E",
-"9 c #A5A5A5",
-"0 c #5D5D5D",
-"a c #616161",
-"b c #515151",
-"c c #414141",
-"d c #2D2D2D",
-"e c #191919",
-"f c #0D0D0D",
-"g c #454545",
-"h c #AAAAAA",
-"i c #9B9B9B",
-"j c #474747",
-"k c #424242",
-"l c #4C4C4C",
-"m c #393939",
-"n c #2C2C2C",
-"o c #1D1D1D",
-"p c #1E1E1E",
-"q c #161616",
-"r c #0F0F0F",
-"s c #131313",
-"t c #181818",
-"u c #1A1A1A",
-"v c #5F5F5F",
-"w c #383838",
-"x c #B5B5B5",
-"y c #1C1C1C",
-"z c #2A2A2A",
-"A c #373737",
-"B c #858585",
-"C c #C5C5C5",
-"D c #151515",
-"E c #111111",
-"F c #323232",
-"G c #3A3A3A",
-"H c #3B3B3B",
-"I c #636363",
-"J c #242424",
-"K c #2F2F2F",
-"L c #626262",
-"M c #737373",
-"N c #232323",
-"O c #282828",
-"P c #333333",
-"Q c #2E2E2E",
-"R c #2B2B2B",
-"S c #292929",
-"T c #363636",
-"U c #666666",
-"V c #212121",
-"W c #A0A0A0",
-"X c #252525",
-"Y c #6D6D6D",
-"Z c #727272",
-"` c #484848",
-" . c #C1C1C1",
-".. c #979797",
-"+. c #ACACAC",
-" ",
-" ",
-" ",
-" . + @ ",
-" . + + + @ ",
-" + + + + + @ ",
-" @ + + + + + @ ",
-" . + + + + + + + ",
-" . + + + + + + + + . ",
-". + + + + + @ + . ",
-"+ + + @ ",
-"+ @ # $ % & * ",
-" = $ - ; > > > > > ; , ' ",
-" . ) > ! ! > ! ! > > > > > > > ; ~ { ",
-" ] ^ / > > ! > > ! > > ! / > > > > > > > > ( ",
-" _ : < > > ! ! ! ! ! ! ! ! > > > > > > > > @ [ } | 1 ",
-" 2 3 > > > > > > ! > > ! > 4 > > > > > > 5 6 7 8 + + 5 ",
-" 9 0 > > > > > > > ! > ; ! > a > > > b c d e + + + f g h ",
-"i j k j l b > > > ! ! ! ! ! ! ! ! m n o 8 + + + + p ^ ",
-"0 q + + + + r s q t e t q | f + + + + + + + + u ~ ",
-" 2 v t + + + + + + + + + + + + + + + + f w ",
-" x 3 p + + + + + + + + + + r y z A B C ",
-" B e D | E E e 7 } F G H H H w A @ ",
-" I J J J J J K H H H H H H H H H H G L ",
-" M N J J J J O G H H H m P Q R z S S } R ",
-" A t y N J J T H w K O J J J J J J J J @ ",
-" U t t e V R T R J J J J J J J J J J b ",
-" W J t t X J J J J J J J J J n Y C ",
-" Z y V J J J J Q ` 3 ~ . ",
-" ..+.C ",
-" ",
-" "};
diff -urN fontforge-0.0.20100501.orig/debian/fontforge.xpm fontforge-0.0.20100501/debian/fontforge.xpm
--- fontforge-0.0.20100501.orig/debian/fontforge.xpm 1970-01-01 09:00:00.000000000 +0900
+++ fontforge-0.0.20100501/debian/fontforge.xpm 2011-05-08 21:43:13.378014584 +0900
@@ -0,0 +1,130 @@
+/* XPM */
+static char *fontforge[] = {
+"32 32 95 2",
+" c None",
+". c #BEBEBE",
+"+ c #0C0C0C",
+"@ c #4F4F4F",
+"# c #D4D4D4",
+"$ c #ABABAB",
+"% c #9F9F9F",
+"& c #B3B3B3",
+"* c #D3D3D3",
+"= c #D8D8D8",
+"- c #7E7E7E",
+"; c #585858",
+"> c #535353",
+", c #828282",
+"' c #B9B9B9",
+") c #8B8B8B",
+"! c #FFFFFF",
+"~ c #8F8F8F",
+"{ c #CFCFCF",
+"] c #B6B6B6",
+"^ c #7C7C7C",
+"/ c #555555",
+"( c #606060",
+"_ c #C9C9C9",
+": c #868686",
+"< c #565656",
+"[ c #3C3C3C",
+"} c #272727",
+"| c #121212",
+"1 c #BBBBBB",
+"2 c #AFAFAF",
+"3 c #676767",
+"4 c #595959",
+"5 c #4A4A4A",
+"6 c #353535",
+"7 c #1F1F1F",
+"8 c #0E0E0E",
+"9 c #A5A5A5",
+"0 c #5D5D5D",
+"a c #616161",
+"b c #515151",
+"c c #414141",
+"d c #2D2D2D",
+"e c #191919",
+"f c #0D0D0D",
+"g c #454545",
+"h c #AAAAAA",
+"i c #9B9B9B",
+"j c #474747",
+"k c #424242",
+"l c #4C4C4C",
+"m c #393939",
+"n c #2C2C2C",
+"o c #1D1D1D",
+"p c #1E1E1E",
+"q c #161616",
+"r c #0F0F0F",
+"s c #131313",
+"t c #181818",
+"u c #1A1A1A",
+"v c #5F5F5F",
+"w c #383838",
+"x c #B5B5B5",
+"y c #1C1C1C",
+"z c #2A2A2A",
+"A c #373737",
+"B c #858585",
+"C c #C5C5C5",
+"D c #151515",
+"E c #111111",
+"F c #323232",
+"G c #3A3A3A",
+"H c #3B3B3B",
+"I c #636363",
+"J c #242424",
+"K c #2F2F2F",
+"L c #626262",
+"M c #737373",
+"N c #232323",
+"O c #282828",
+"P c #333333",
+"Q c #2E2E2E",
+"R c #2B2B2B",
+"S c #292929",
+"T c #363636",
+"U c #666666",
+"V c #212121",
+"W c #A0A0A0",
+"X c #252525",
+"Y c #6D6D6D",
+"Z c #727272",
+"` c #484848",
+" . c #C1C1C1",
+".. c #979797",
+"+. c #ACACAC",
+" ",
+" ",
+" ",
+" . + @ ",
+" . + + + @ ",
+" + + + + + @ ",
+" @ + + + + + @ ",
+" . + + + + + + + ",
+" . + + + + + + + + . ",
+". + + + + + @ + . ",
+"+ + + @ ",
+"+ @ # $ % & * ",
+" = $ - ; > > > > > ; , ' ",
+" . ) > ! ! > ! ! > > > > > > > ; ~ { ",
+" ] ^ / > > ! > > ! > > ! / > > > > > > > > ( ",
+" _ : < > > ! ! ! ! ! ! ! ! > > > > > > > > @ [ } | 1 ",
+" 2 3 > > > > > > ! > > ! > 4 > > > > > > 5 6 7 8 + + 5 ",
+" 9 0 > > > > > > > ! > ; ! > a > > > b c d e + + + f g h ",
+"i j k j l b > > > ! ! ! ! ! ! ! ! m n o 8 + + + + p ^ ",
+"0 q + + + + r s q t e t q | f + + + + + + + + u ~ ",
+" 2 v t + + + + + + + + + + + + + + + + f w ",
+" x 3 p + + + + + + + + + + r y z A B C ",
+" B e D | E E e 7 } F G H H H w A @ ",
+" I J J J J J K H H H H H H H H H H G L ",
+" M N J J J J O G H H H m P Q R z S S } R ",
+" A t y N J J T H w K O J J J J J J J J @ ",
+" U t t e V R T R J J J J J J J J J J b ",
+" W J t t X J J J J J J J J J n Y C ",
+" Z y V J J J J Q ` 3 ~ . ",
+" ..+.C ",
+" ",
+" "};
diff -urN fontforge-0.0.20100501.orig/debian/menu fontforge-0.0.20100501/debian/menu
--- fontforge-0.0.20100501.orig/debian/menu 2010-09-27 00:43:29.000000000 +0900
+++ fontforge-0.0.20100501/debian/menu 2011-05-08 21:31:13.062442721 +0900
@@ -4,4 +4,4 @@
longtitle="Font Editor for PS, TrueType and OpenType fonts" \
command="/usr/bin/fontforge" \
hints="Fonts" \
- icon="/usr/share/icons/ffanvil32.xpm"
+ icon="/usr/share/pixmaps/fontforge.xpm"
diff -urN fontforge-0.0.20100501.orig/debian/patches/023_fix_desktop_file.diff fontforge-0.0.20100501/debian/patches/023_fix_desktop_file.diff
--- fontforge-0.0.20100501.orig/debian/patches/023_fix_desktop_file.diff 2010-09-27 00:43:29.000000000 +0900
+++ fontforge-0.0.20100501/debian/patches/023_fix_desktop_file.diff 1970-01-01 09:00:00.000000000 +0900
@@ -1,16 +0,0 @@
-Adjusted the desktop file for Debian.
-
-This patch by KÄstutis BiliÅ«nas.
-This patch will not be submitted upstream.
-
---- a/Packaging/fontforge.desktop
-+++ b/Packaging/fontforge.desktop
-@@ -8,7 +8,7 @@
- Comment[fr]=Un constructeur des polices
- Comment[zh_TW]=FontForge æéåå編輯å¨
- Exec=fontforge
--Icon=fontforge.png
-+Icon=ffanvil32.xpm
- Terminal=false
- Type=Application
- Categories=Application;Graphics;
diff -urN fontforge-0.0.20100501.orig/debian/patches/series fontforge-0.0.20100501/debian/patches/series
--- fontforge-0.0.20100501.orig/debian/patches/series 2011-05-04 19:09:21.993007574 +0900
+++ fontforge-0.0.20100501/debian/patches/series 2011-05-08 21:29:56.726064193 +0900
@@ -1,7 +1,6 @@
005_x_www_browser.diff
008_libgif.diff
020_fix_pyext_path.diff
-023_fix_desktop_file.diff
024_def_background.diff
027_catch_ctrl-c_signal.diff
030_fix_stack_corruption.diff
diff -urN fontforge-0.0.20100501.orig/debian/rules fontforge-0.0.20100501/debian/rules
--- fontforge-0.0.20100501.orig/debian/rules 2011-05-04 20:16:50.745084241 +0900
+++ fontforge-0.0.20100501/debian/rules 2011-05-08 22:00:51.611262074 +0900
@@ -131,7 +131,8 @@
mv $(CURDIR)/debian/fontforge/usr/share/fontforge/python $(CURDIR)/debian/python-fontforge/usr/share/fontforge
cp -p Packaging/fontforge.desktop debian/fontforge/usr/share/applications/
- cp -p debian/ffanvil32.xpm debian/fontforge/usr/share/icons/
+ cp -p Packaging/fontforge.png debian/fontforge/usr/share/pixmaps/
+ cp -p debian/fontforge.xpm debian/fontforge/usr/share/pixmaps/
cp Packaging/fontforge.xml debian/fontforge.sharedmimeinfo
dh_install -s
