diff -Nru lxappearance-obconf-0.2.0/debian/changelog lxappearance-obconf-0.2.0/debian/changelog --- lxappearance-obconf-0.2.0/debian/changelog 2012-06-06 16:05:59.000000000 +0000 +++ lxappearance-obconf-0.2.0/debian/changelog 2013-12-03 12:55:00.000000000 +0000 @@ -1,3 +1,16 @@ +lxappearance-obconf (0.2.0-4+rpi1) unstable; urgency=low + + * Based on proposed NMU by Mateusz Łukasik + * debian/control: + + remove Daniel Baumann from uploaders, (Closes: #704336) + + bump standard version, + + Use libmenu-cache-dev for build dependency, + + fix depends lxappearance-obconf-dbg. + * Add 01_openbox_3.5.2_fix.patch to fix FTBFS with openbox 3.5.2. + (Closes: #722112) + + -- Peter Michael Green Tue, 03 Dec 2013 12:54:41 +0000 + lxappearance-obconf (0.2.0-4) unstable; urgency=low * Removing alternative build-depends on lxappearance-dev now that diff -Nru lxappearance-obconf-0.2.0/debian/control lxappearance-obconf-0.2.0/debian/control --- lxappearance-obconf-0.2.0/debian/control 2012-06-06 16:03:51.000000000 +0000 +++ lxappearance-obconf-0.2.0/debian/control 2013-12-03 12:55:00.000000000 +0000 @@ -3,12 +3,12 @@ Priority: optional Maintainer: Debian LXDE Maintainers Uploaders: - Andrew Lee (李健秋) , Daniel Baumann + Andrew Lee (李健秋) Build-Depends: debhelper (>= 9), autotools-dev, intltool, docbook-xml, docbook-xsl, - libglib2.0-dev, libgtk2.0-dev, libimlib2-dev, libmenu-cache1-dev, libx11-dev, + libglib2.0-dev, libgtk2.0-dev, libimlib2-dev, libmenu-cache-dev, libx11-dev, lxappearance (>= 0.5.2), openbox-dev, xsltproc -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.lxde.org/ Vcs-Browser: http://git.lxde.org/gitweb/?p=debian/lxappearance-obconf.git Vcs-Git: git://git.lxde.org/git/debian/lxappearance-obconf.git @@ -26,7 +26,7 @@ Section: debug Priority: extra Architecture: any -Depends: ${misc:Depends}, lxappearance-obconf-dbg (= ${binary:Version}) +Depends: ${misc:Depends}, lxappearance-obconf (= ${binary:Version}) Description: LXDE GTK+ theme switcher (plugin - debug) LXAppearance is a GUI application for the Lightweight X11 Desktop Environment (LXDE). diff -Nru lxappearance-obconf-0.2.0/debian/patches/01_openbox_3.5.2_fix.patch lxappearance-obconf-0.2.0/debian/patches/01_openbox_3.5.2_fix.patch --- lxappearance-obconf-0.2.0/debian/patches/01_openbox_3.5.2_fix.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-obconf-0.2.0/debian/patches/01_openbox_3.5.2_fix.patch 2013-12-03 12:55:00.000000000 +0000 @@ -0,0 +1,44 @@ +Description: Fix build with openbox 3.5.2 +Index: lxappearance-obconf-0.2.0/src/preview.c +=================================================================== +--- lxappearance-obconf-0.2.0.orig/src/preview.c 2012-04-16 22:03:31.000000000 +0200 ++++ lxappearance-obconf-0.2.0/src/preview.c 2013-09-12 19:14:13.736415541 +0200 +@@ -549,28 +549,28 @@ + switch (*layout) { + case 'D': + a = focus ? +- theme->a_focused_unpressed_desk : +- theme->a_unfocused_unpressed_desk; ++ theme->btn_desk->a_focused_unpressed : ++ theme->btn_desk->a_unfocused_unpressed; + break; + case 'S': + a = focus ? +- theme->a_focused_unpressed_shade : +- theme->a_unfocused_unpressed_shade; ++ theme->btn_shade->a_focused_unpressed : ++ theme->btn_shade->a_unfocused_unpressed; + break; + case 'I': + a = focus ? +- theme->a_focused_unpressed_iconify : +- theme->a_unfocused_unpressed_iconify; ++ theme->btn_iconify->a_focused_unpressed : ++ theme->btn_iconify->a_unfocused_unpressed; + break; + case 'M': + a = focus ? +- theme->a_focused_unpressed_max : +- theme->a_unfocused_unpressed_max; ++ theme->btn_max->a_focused_unpressed : ++ theme->btn_max->a_unfocused_unpressed; + break; + case 'C': + a = focus ? +- theme->a_focused_unpressed_close : +- theme->a_unfocused_unpressed_close; ++ theme->btn_close->a_focused_unpressed : ++ theme->btn_close->a_unfocused_unpressed; + break; + default: + continue; diff -Nru lxappearance-obconf-0.2.0/debian/patches/series lxappearance-obconf-0.2.0/debian/patches/series --- lxappearance-obconf-0.2.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ lxappearance-obconf-0.2.0/debian/patches/series 2013-12-03 12:55:00.000000000 +0000 @@ -0,0 +1 @@ +01_openbox_3.5.2_fix.patch