diff -u hardinfo-0.5.1/debian/changelog hardinfo-0.5.1/debian/changelog --- hardinfo-0.5.1/debian/changelog +++ hardinfo-0.5.1/debian/changelog @@ -1,3 +1,11 @@ +hardinfo (0.5.1-1.1ubuntu4) oneiric; urgency=low + + * debian/patches/03-detect-lxde.patch + - Detect LXDE and Lubuntu from XDG_CURRENT_DESKTOP and + DESKTOP_SESSION environment variables. (LP: #778148) + + -- Jonathan Marsden Thu, 07 May 2011 10:22:53 -0700 + hardinfo (0.5.1-1.1ubuntu3) maverick; urgency=low * debian/control diff -u hardinfo-0.5.1/debian/patches/series hardinfo-0.5.1/debian/patches/series --- hardinfo-0.5.1/debian/patches/series +++ hardinfo-0.5.1/debian/patches/series @@ -2,0 +3 @@ +03-detect-lxde.patch only in patch2: unchanged: --- hardinfo-0.5.1.orig/debian/patches/03-detect-lxde.patch +++ hardinfo-0.5.1/debian/patches/03-detect-lxde.patch @@ -0,0 +1,23 @@ +#launchpad bug : https://bugs.edge.launchpad.net/ubuntu/+source/hardinfo/+bug/778148 +Index: hardinfo-0.5.1/arch/linux/common/os.h +=================================================================== +--- hardinfo-0.5.1.orig/arch/linux/common/os.h 2009-04-06 06:43:15.000000000 -0700 ++++ hardinfo-0.5.1/arch/linux/common/os.h 2011-05-05 20:38:45.962029060 -0700 +@@ -151,8 +151,17 @@ + is defined */ + os->desktop = g_strdup("XFCE 4"); + } else { ++ if (g_getenv("XDG_CURRENT_DESKTOP")) { ++ os->desktop = g_getenv("XDG_CURRENT_DESKTOP"); ++ if (g_getenv("DESKTOP_SESSION")) { ++ os->desktop = g_strdup_printf("%s (%s)", ++ g_getenv("XDG_CURRENT_DESKTOP"), ++ g_getenv("DESKTOP_SESSION")); ++ } ++ } else { + os->desktop = g_strdup_printf("Unknown (Window Manager: %s)", + windowman); ++ } + } + } else { + os->desktop = g_strdup("Unknown");