diff -u gelemental-1.2.0/debian/changelog gelemental-1.2.0/debian/changelog --- gelemental-1.2.0/debian/changelog +++ gelemental-1.2.0/debian/changelog @@ -1,3 +1,18 @@ +gelemental (1.2.0-3ubuntu3~karmic1) karmic; urgency=low + + * Backport to karmic for testing. + + -- Cesare Tirabassi Mon, 23 Nov 2009 11:53:26 +0100 + +gelemental (1.2.0-3ubuntu3) lucid; urgency=low + + * debian/patches/add_new_wave_theme.dpatch: Added (LP: #486798). + - add the New Wave theme to the list of themes that have issues + with button colours. + * debian/patches/00list: updated IAW the patch. + + -- Cesare Tirabassi Mon, 23 Nov 2009 11:53:26 +0100 + gelemental (1.2.0-3ubuntu2) karmic; urgency=low * debian/patches/fix_gtkmm_2.18.dpatch: Added (LP: #441453). diff -u gelemental-1.2.0/debian/patches/00list gelemental-1.2.0/debian/patches/00list --- gelemental-1.2.0/debian/patches/00list +++ gelemental-1.2.0/debian/patches/00list @@ -3,0 +4 @@ +add_new_wave_theme only in patch2: unchanged: --- gelemental-1.2.0.orig/debian/patches/add_new_wave_theme.dpatch +++ gelemental-1.2.0/debian/patches/add_new_wave_theme.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## add_new_wave_theme.dpatch by Cesare Tirabassi +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add the New Wave theme to the list of themes that +## DP: have issues with button colours. +## DP: https://bugs.launchpad.net/ubuntu/+source/gelemental/+bug/486798 + +@DPATCH@ +diff -urNad gelemental-1.2.0~/src/buttons.cc gelemental-1.2.0/src/buttons.cc +--- gelemental-1.2.0~/src/buttons.cc 2007-09-25 06:49:33.000000000 +0200 ++++ gelemental-1.2.0/src/buttons.cc 2009-11-23 11:48:39.000000000 +0100 +@@ -106,6 +106,7 @@ + "Amaranth", + "Lush", + "Nuvola", ++ "New Wave", + NULL + }; +