diff -u imlib-1.9.15/debian/changelog imlib-1.9.15/debian/changelog --- imlib-1.9.15/debian/changelog +++ imlib-1.9.15/debian/changelog @@ -1,3 +1,10 @@ +imlib (1.9.15-3ubuntu2) gutsy; urgency=low + + * Include patch (max24bpp.patch) to fix mishandling of 32-bit + visuals (LP: #70367) + + -- Cesare Tirabassi Thu, 16 Aug 2007 15:25:20 +0200 + imlib (1.9.15-3ubuntu1) gutsy; urgency=low * Merge from Debian unstable (LP: #132724), remaining changes: only in patch2: unchanged: --- imlib-1.9.15.orig/debian/max24bpp.patch +++ imlib-1.9.15/debian/max24bpp.patch @@ -0,0 +1,40 @@ +--- misc.c.orig 2007-08-16 15:20:53.000000000 +0200 ++++ misc.c 2007-08-16 15:21:32.000000000 +0200 +@@ -455,6 +455,8 @@ + if (xvir[i].depth > max) + max = xvir[i].depth; + } ++ if (max > 24) ++ max = 24; + if (max > 8) + { + id->x.depth = max; +@@ -1004,6 +1006,8 @@ + if (xvir[i].depth > max) + max = xvir[i].depth; + } ++ if (max > 24) ++ max = 24; + if (max > 8) + { + id->x.depth = max; +--- misc.c.orig 2007-08-16 15:17:23.000000000 +0200 ++++ misc.c 2007-08-16 15:18:25.000000000 +0200 +@@ -423,6 +423,8 @@ + if (xvir[i].depth > max) + max = xvir[i].depth; + } ++ if (max > 24) ++ max = 24; + if (max > 8) + { + id->x.depth = max; +@@ -1026,6 +1028,8 @@ + if (xvir[i].depth > max) + max = xvir[i].depth; + } ++ if (max > 24) ++ max = 24; + if (max > 8) + { + id->x.depth = max; only in patch2: unchanged: --- imlib-1.9.15.orig/Imlib/misc.c +++ imlib-1.9.15/Imlib/misc.c @@ -423,6 +423,8 @@ if (xvir[i].depth > max) max = xvir[i].depth; } + if (max > 24) + max = 24; if (max > 8) { id->x.depth = max; @@ -1026,6 +1028,8 @@ if (xvir[i].depth > max) max = xvir[i].depth; } + if (max > 24) + max = 24; if (max > 8) { id->x.depth = max; only in patch2: unchanged: --- imlib-1.9.15.orig/gdk_imlib/misc.c +++ imlib-1.9.15/gdk_imlib/misc.c @@ -455,6 +455,8 @@ if (xvir[i].depth > max) max = xvir[i].depth; } + if (max > 24) + max = 24; if (max > 8) { id->x.depth = max; @@ -1004,6 +1006,8 @@ if (xvir[i].depth > max) max = xvir[i].depth; } + if (max > 24) + max = 24; if (max > 8) { id->x.depth = max;