diff -Nru conky-1.8.0/debian/NEWS conky-1.8.0/debian/NEWS --- conky-1.8.0/debian/NEWS 2010-04-01 14:42:19.000000000 +0000 +++ conky-1.8.0/debian/NEWS 2011-05-06 06:26:32.000000000 +0000 @@ -1,3 +1,10 @@ +conky (1.8.0-1ubuntu1) lucid; urgency=low + + ncurses support has been enabled for all binary packages + (upstream default). + + -- Cesare Tirabassi Fri, 23 Apr 2010 11:07:02 +0200 + conky (1.8.0-1) unstable; urgency=low Package maintenance moved back to Debian. diff -Nru conky-1.8.0/debian/README.source conky-1.8.0/debian/README.source --- conky-1.8.0/debian/README.source 2010-04-01 14:42:19.000000000 +0000 +++ conky-1.8.0/debian/README.source 2011-05-06 06:26:36.000000000 +0000 @@ -23,7 +23,7 @@ At this time it includes the following support, which is enabled by default upstream: -X11, XDamage, XDBE, Xft, MPD, MOC, math, hddtemp, portmon, +X11, XDamage, XDBE, Xft, MPD, MOC, math, hddtemp, portmon, ncurses, wireless, ALSA mixer, apcupsd, I/O stats, argb and Lua. conky-all @@ -32,14 +32,14 @@ conky-all includes almost all of the available support: X11, XDamage, XDBE, Xft, MPD, MOC, OpenMP, math, hddtemp, portmon, RSS, -Weather, wireless, IBM, nvidia, eve-online, Imlib2, ALSA mixer, +Weather, wireless, IBM, nvidia, eve-online, Imlib2, ALSA mixer, ncurses, apcupsd, I/O stats, argb, Lua and the cairo and imlib2 lua bindings. These are all the available features minus those related to media players -(at this time, audacious, xmms2 and bpmx) and ncurses. +(at this time, audacious, xmms2 and bpmx). Please check upstream documentation and source files when updating this package, some features might be removed or changed, others added, so that any update will stick to this general philosophy. - -- Cesare Tirabassi Sun, 24 Jan 2010 21:10:43 +0100 + -- Cesare Tirabassi Thu, 08 Apr 2010 16:14:16 +0200 diff -Nru conky-1.8.0/debian/changelog conky-1.8.0/debian/changelog --- conky-1.8.0/debian/changelog 2011-04-03 13:17:41.000000000 +0000 +++ conky-1.8.0/debian/changelog 2011-05-06 06:35:15.000000000 +0000 @@ -1,3 +1,19 @@ +conky (1.8.0-1.1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - Fix ncurses being enabled for all binary packages (upstream default) + - Cherry pick following fixes from the 1.8.1 branch: + + fix reversed $if_existing logic + + fix device name parsing for diskio variables + + fix X error when border_width is <1 + + fix parsing of TEXT section when first line is a comment + + fix battery_bar should also work without argument + + fix mixerbar showing wrong values + + fix read_tcp reversed connection check logic + + + -- Tarun Kumar Mall Fri, 06 May 2011 06:32:13 +0000 + conky (1.8.0-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -7,6 +23,20 @@ -- Luca Falavigna Sun, 03 Apr 2011 15:17:39 +0200 +conky (1.8.0-1ubuntu1) lucid; urgency=low + + * Fix ncurses being enabled for all binary packages (upstream default) + * Cherry pick following fixes from the 1.8.1 branch: + - fix reversed $if_existing logic + - fix device name parsing for diskio variables + - fix X error when border_width is <1 + - fix parsing of TEXT section when first line is a comment + - fix battery_bar should also work without argument + - fix mixerbar showing wrong values + - fix read_tcp reversed connection check logic + + -- Cesare Tirabassi Fri, 23 Apr 2010 11:07:02 +0200 + conky (1.8.0-1) unstable; urgency=low * New upstream release: @@ -594,3 +624,4 @@ * Initial Release. (closes: #320978) -- Jason Tan Wed, 24 Aug 2005 00:10:49 -0700 + diff -Nru conky-1.8.0/debian/control conky-1.8.0/debian/control --- conky-1.8.0/debian/control 2010-04-01 14:42:19.000000000 +0000 +++ conky-1.8.0/debian/control 2011-05-06 06:26:32.000000000 +0000 @@ -49,7 +49,7 @@ It includes the following support: . X11, XDamage, XDBE, Xft, MPD, MOC, math, hddtemp, portmon, - wireless, ALSA mixer, apcupsd, I/O stats, argb and Lua. + wireless, ncurses, ALSA mixer, apcupsd, I/O stats, argb and Lua. Package: conky-cli Architecture: any @@ -85,7 +85,7 @@ This is a full conky with most compile options enabled: . X11, XDamage, XDBE, Xft, MPD, MOC, OpenMP, math, hddtemp, portmon, RSS, - Weather, wireless, IBM, nvidia, eve-online, Imlib2, ALSA mixer, + Weather, wireless, IBM, nvidia, eve-online, Imlib2, ALSA mixer, ncurses, apcupsd, I/O stats, argb, Lua and the cairo and imlib2 lua bindings. . Use this if you are not sure what conky flavour you need. diff -Nru conky-1.8.0/debian/patches/debian-changes-1.8.0-1.1ubuntu1 conky-1.8.0/debian/patches/debian-changes-1.8.0-1.1ubuntu1 --- conky-1.8.0/debian/patches/debian-changes-1.8.0-1.1ubuntu1 1970-01-01 00:00:00.000000000 +0000 +++ conky-1.8.0/debian/patches/debian-changes-1.8.0-1.1ubuntu1 2011-05-06 07:02:54.000000000 +0000 @@ -0,0 +1,140 @@ +Description: Upstream changes introduced in version 1.8.0-1.1ubuntu1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + conky (1.8.0-1.1ubuntu1) oneiric; urgency=low + . + * Merge from debian unstable. Remaining changes: + - Fix ncurses being enabled for all binary packages (upstream default) + - Cherry pick following fixes from the 1.8.1 branch: + + fix reversed $if_existing logic + + fix device name parsing for diskio variables + + fix X error when border_width is <1 + + fix parsing of TEXT section when first line is a comment + + fix battery_bar should also work without argument + + fix mixerbar showing wrong values + + fix read_tcp reversed connection check logic + . + The person named in the Author field signed this changelog entry. +Author: Tarun Kumar Mall + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- conky-1.8.0.orig/src/read_tcp.c ++++ conky-1.8.0/src/read_tcp.c +@@ -87,7 +87,7 @@ void print_read_tcp(struct text_object * + addr.sin_family = AF_INET; + addr.sin_port = rtd->port; + memcpy(&addr.sin_addr, he->h_addr, he->h_length); +- if (!connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr))) { ++ if (connect(sock, (struct sockaddr*)&addr, sizeof(struct sockaddr)) != 0) { + NORM_ERR("read_tcp: Couldn't create a connection"); + return; + } +--- conky-1.8.0.orig/src/diskio.c ++++ conky-1.8.0/src/diskio.c +@@ -76,12 +76,6 @@ struct diskio_stat *prepare_diskio_stat( + if (!s) + return &stats; + +-#if defined(__FreeBSD__) +- if (strncmp(s, "/dev/", 5) == 0) { +- // supplied a /dev/device arg, so cut off the /dev part +- strncpy(device_name, s + 5, text_buffer_size); +- } else +-#endif + strncpy(device_name, s, text_buffer_size); + + snprintf(stat_name, text_buffer_size, "/dev/%s", device_name); +--- conky-1.8.0.orig/src/mixer.c ++++ conky-1.8.0/src/mixer.c +@@ -281,7 +281,7 @@ int mixer_is_mute(int i) + return !mixer_get(i); + } + +-#define mixer_to_255(i, x) x ++#define mixer_to_255(i, x) x * 2.55 + #endif /* MIXER_IS_ALSA */ + + void parse_mixer_arg(struct text_object *obj, const char *arg) +--- conky-1.8.0.orig/src/core.c ++++ conky-1.8.0/src/core.c +@@ -280,11 +280,11 @@ struct text_object *construct_text_objec + END OBJ(battery_bar, 0) + char bat[64]; + if (arg) { +- arg = scan_bar(obj, arg); + sscanf(arg, "%63s", bat); + } else { + strcpy(bat, "BAT0"); + } ++ scan_bar(obj, bat); + obj->data.s = strndup(bat, text_buffer_size); + #endif /* !__OpenBSD__ */ + +@@ -372,18 +372,18 @@ struct text_object *construct_text_objec + scan_loadgraph_arg(obj, arg); + #endif /* X11 */ + END OBJ(diskio, &update_diskio) +- parse_diskio_arg(obj, arg); ++ parse_diskio_arg(obj, dev_name(arg)); + END OBJ(diskio_read, &update_diskio) +- parse_diskio_arg(obj, arg); ++ parse_diskio_arg(obj, dev_name(arg)); + END OBJ(diskio_write, &update_diskio) +- parse_diskio_arg(obj, arg); ++ parse_diskio_arg(obj, dev_name(arg)); + #ifdef X11 + END OBJ(diskiograph, &update_diskio) +- parse_diskiograph_arg(obj, arg); ++ parse_diskiograph_arg(obj, dev_name(arg)); + END OBJ(diskiograph_read, &update_diskio) +- parse_diskiograph_arg(obj, arg); ++ parse_diskiograph_arg(obj, dev_name(arg)); + END OBJ(diskiograph_write, &update_diskio) +- parse_diskiograph_arg(obj, arg); ++ parse_diskiograph_arg(obj, dev_name(arg)); + #endif /* X11 */ + END OBJ(color, 0) + #ifdef X11 +@@ -1327,7 +1327,7 @@ int extract_variable_text_internal(struc + strfold(p, 1); + } else if (*p == '#') { + char c; +- if (remove_comment(p, &c) && p > orig_p && c == '\n') { ++ if (remove_comment(p, &c) && p >= orig_p && c == '\n') { + /* if remove_comment removed a newline, we need to 'back up' with p */ + p--; + } +--- conky-1.8.0.orig/src/conky.c ++++ conky-1.8.0/src/conky.c +@@ -1330,7 +1330,7 @@ void generate_text_internal(char *p, int + DO_JUMP; + } else if (spc) { + *spc = '\0'; +- if (check_contains(obj->data.s, spc + 1)) ++ if (!check_contains(obj->data.s, spc + 1)) + DO_JUMP; + *spc = ' '; + } +@@ -4609,7 +4609,7 @@ char load_config_file(const char *f) + CONF("border_width") { + if (value) { + window.border_width = strtol(value, 0, 0); +- if (window.border_width < 0) window.border_width = 0; ++ if (window.border_width < 1) window.border_width = 1; + } else { + CONF_ERR; + } diff -Nru conky-1.8.0/debian/patches/series conky-1.8.0/debian/patches/series --- conky-1.8.0/debian/patches/series 2011-04-03 13:05:23.000000000 +0000 +++ conky-1.8.0/debian/patches/series 2011-05-06 06:37:24.000000000 +0000 @@ -1 +1,2 @@ 70b6f35a.patch +debian-changes-1.8.0-1.1ubuntu1 diff -Nru conky-1.8.0/debian/rules conky-1.8.0/debian/rules --- conky-1.8.0/debian/rules 2010-04-01 14:42:19.000000000 +0000 +++ conky-1.8.0/debian/rules 2011-05-06 06:26:36.000000000 +0000 @@ -6,10 +6,10 @@ # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) -DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) CFLAGS = -Wall -g LDFLAGS = -Wl,--as-needed @@ -25,11 +25,11 @@ LINUX_CONF_ARGS_ALL=--enable-wlan --enable-ibm endif -ifeq ($(DEB_HOST_ARCH_CPU),i386) +ifeq ($(DEB_HOST_ARCH),i386) ENABLE_NVIDIA=--enable-nvidia endif -ifeq ($(DEB_HOST_ARCH_CPU),amd64) +ifeq ($(DEB_HOST_ARCH),amd64) ENABLE_NVIDIA=--enable-nvidia endif @@ -60,8 +60,7 @@ ../configure $(COMMON_CONFIGURE_FLAGS) \ --disable-lua --disable-double-buffer --disable-x11 \ --disable-xdamage --disable-own-window --disable-xft \ - --disable-hddtemp --disable-alsa --disable-portmon \ - --enable-ncurses + --disable-hddtemp --disable-alsa --disable-portmon cd build-all && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ ../configure $(COMMON_CONFIGURE_FLAGS) \