--- conky-1.7.1.1.orig/debian/menu +++ conky-1.7.1.1/debian/menu @@ -0,0 +1,2 @@ +?package(conky):needs="text" section="Applications/System/Monitoring"\ + title="Conky" command="/usr/bin/conky" --- conky-1.7.1.1.orig/debian/README.Debian +++ conky-1.7.1.1/debian/README.Debian @@ -0,0 +1,22 @@ +Notes for conky (1.6.0-1) +========================= + +Build-time switches/options +--------------------------- + +The Debian package is built using the default values of the enable/disable +switches for configure. In particular, it does not enable "audacious", +"bmpx", "smapi", "nvidia" or "eve-online". Users who want a version +of conky with these features enabled will have to re-build the package +after appropriate changes. + +Runtime configuration +--------------------- + +In any case it is *strongly* recommended that each user of "conky" +create a configuration file in $HOME/.conkyrc based on the sample in +/usr/share/doc/conky/examples/conky.conf.gz. This way any +unexpected error messages from conky would be your own fault :-) + +-- Kapil Hari Paranjape Wed, 23 Jul 2008 12:22:19 +0000 + --- conky-1.7.1.1.orig/debian/copyright +++ conky-1.7.1.1/debian/copyright @@ -0,0 +1,430 @@ +Files under debian/: +-------------------- +This package was debianized by Jason Tan . + +The Debian package was maintained by Bartosz Fenski +from version 1.4.1-1 to 1.4.4-1. + +The Debian package is currently maintained by +Kapil Hari Paranjape + +Some modifications were made by Steve Langasek +and Laszlo Boszormenyi (GCS) . + +The files under debian/ constitute source for the Debian packaging. +Each such file should be deemed to carry a notice as follows: + + Copyright (c) 2005 Jason Tan + Copyright (c) 2006 Steve Langasek, Laszlo Boszormenyi, Bartosz Fenski + Copyright (c) 2007 Kapil Hari Paranjape + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Upstream source: +---------------- +The upstream source was downloaded from +http://www.sourceforge.net/projects/conky + +THe upstream source is a fork of the torsmo project. + +The current upstream maintainer is +Brendan Matthews . +The complete list of authors of the upstream code can be found in the +file AUTHORS which is reproduced below. + +The upstream COPYING file contains the copyright assertion which +states: + + Any original torsmo code is licensed under the BSD license (see + LICENSE.BSD for a copy) + + All code written since the fork of torsmo is licensed under the GPL + (see LICENSE.GPL for a copy), except where noted differently (such as + in portmon code, timed thread code, and audacious code which are + LGPL, and prss which is an MIT-style license). + + Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen + Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. + (see AUTHORS) + All rights reserved. + +Full texts of licenses: +----------------------- +On Debian systems: the complete text of the BSD License, the GPL and +the LGPL can be found in the files with the same names under the +directory `/usr/share/common-licenses/'. The complete text for the +MIT-style license for the "prss" code is reproduced from "src/prss.c" +below: + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Full text of AUTHORS file from upstream: +---------------------------------------- +NOTE: Since moving to Git, I am no longer going to continue to update this file +(in favour of Git's log stuff). If you want to add yourself here when you +submit a patch, feel free. + +Authors of conky in alphapetical order (please, send mail if I forgot +somebody or email address / name is wrong): + +adi + Outline stuff + ACPI fan & adapter + +Adi Zaimi + original top code + +Alex + Iconv patch + +affinity + X-Mozilla-Status support + +akash + battery_percent and battery_bar + +Asbjørn Zweidorff Kjær + support for EVE-Online skill monitoring + +Aseem Mohanty + if_up patch + +Ben Kibbey + $tail fifo patch + multiple mailbox patch + +Blondak + diskio read & write patch + +Bobby Beckmann + Interface IP and Wireless Quality patch + +Byron Clark + sysfs AC adapter support patch + +David Carter + CPU usage being reported incorrectly by top + +Brenden Matthews + project maintainer + +Bruce Merry + Xdbe (double buffering) + +btlee + linkstatus patch (http://forums.gentoo.org/viewtopic-p-2765647.html#2765647) + +calmar + mboxscan + +cromka + if_existing patch for string matching + +dan-h + adt746x fix + +Dan Piponi + original top code + +Dave Clark + original top code + +David McCabe + utime + +garo + developer + +Ram Yalamanchili + tztime + +Daniel Thiele + APM support for FreeBSD + +Denis + WM_CLASS patch + statfs patch + +Dennis Frommknecht + NVCtrl, temperature monitoring for nvdia-based graphics cards + +Dennis Kaandorp + adt746x stuff + +Elisey O. Savateev + Fixed if_mounted on FreeBSD + +Egor(knick_) + Iconv patch + +Erik Scharwaechter + $if_empty patch + +Falk Feuersenger + I2C divisor from a file + +Fanat1k + Iconv patch + +flitsch + hwmon support + +fow + mpd_title max length + +Gwenhael LE MOINE + Manual setting of the position + WM_CLASS for window when drawing to own window + +Hannu Saransaari + Main code + +Henri Häkkinen + MOC support + +hinokind + support negative values in human_readable() + +Jaromir Smrcek + APC UPS daemon support + +Jason Mitchell + developer + UTF8 fix + Source clean up + +Jason Tan + developer + debian package maintainer + +Joe Myre - + developer + +jack_mort - gentoo forums + $tab patch + +Jarmo Hekkanen + SETI stuff + +Jeremy Burch + $cached and $buffers + +JL Farinacci + pad_percents + +Johannes Winkelmann + disk I/O on linux + more consistent cpu freq handling on linux + capitalize Hertz in cpu frequeny + +jolapache + maildir format + +Jonas Koelker + reload on SIGHUP patch + pad percantages fix patch + +Joshua Gerrish + mpd password patch + +Jørgen P. Tjernø + Restores default settings before loading new config file in SIGHUP + Some cleaning and commenting apparently :) + SIGHUP config file reload + +Kapil Hari Paranjape + ibm_volume patch + kFreeBSD support patch + realtime clock patch + sysfs battery patch + mail_spool patch + +Kevin Lyles + add long options patch + add cpu separate option patch + add time to top patch + simplify round_to_int patch + goto width fix patch + offset width fix patch + individual diskio patch + short_units & human_readable patch + +killfire + fs_used_perc and fs_bar_free patch + +Lars Kotthoff + $loadgraph, show_graph_scale patch + +Lassi Selander + XMMS2 patch + XMMS2 fixes + +Lauri Hakkarainen + Some translating, web and other stuff + +Leszek Krupiñski + Battery number for ACPI battery + Load average bug fix + +Lucas Brutschy + MLDonkey patch + if constructs patch + +Marcus Huesgen + battery_bar fix + +Markus Meissner + NVIDIA Graficcard support with libXNVCtrl patch + +Michal Januszewski + hddtemp support + +Michal Ziabkowski + $if_up memleak fix + +Miroslav Lichvar + move audacious thread init to update_audacious() patch + x86_64 freq_dyn patch + buffer overflow in update_net_stats() patch + +Moncelier Camille + METAR patch + +Morgan Veyret + own_window_type dock patch + +Nattfodd + Fixed top_mem dupes + +nathanj439 + MPD time fix + +Nikos Ntarmos + FreeBSD total memory patch + +norsetto + fix SIGUSR1/SIGHUP segfault + +Pascal Eberhard + graph and bar fix for right alignment + +Peter Tarjan + IBM acpi support patch + SMP support for freq stuff + CPU voltage patch + +Petr Holub + fix autotools on FreeBSD in autogen.sh + Improved battery readout on FreeBSD + +Philip Kovacs + tcp port monitor with hashing functionality + + Audacious, Xmms, BMP, Infopipe stuff + Various Xlib changes, e.g. own_window hints, etc. + +Phil + multiple batteries support + tp_smapi support + if_up patch + fix sysfs crashing patch + +Psychon + a bunch of code cleanups + +roiban adi + hex colour patch + +Ryan Tandy + fs_type patch + if_mpd_playing patch + +Rui Paulo + NetBSD support + +Roland Shoemaker + user info patch + conky version info patch + +Roman Bogorodskiy + FreeBSD support + BMPx support + +Ryan Twitchell + head/tail rewrite patch + +Mikko Sysikaski + prss.c and prss.h + +Sceptik + --quiet patch + +Stepan Zastupov + WiFi signal level detection support on FreeBSD + +Szymon Boniecki + Reads current LC_TIME + +Thomas Cort + CPU frequency patch for alpha + +Toni + exec*/tail/head output evalution + +Toni Spets hifi + OpenBSD support + Linux wifi code + RSS code (created together with Mikko Sysikaski) + Lua scripting + +Tris + Scroll step patch + +tyir + MPD features patch 1319461 + +Vivenzio Pagliari + Some useful patches for port monitoring + PowerBook battery patch + +Walt Nelson + $freq fix + +Warren Dukes + libmpdclient + +warudemaru + rss and vsize for top + +wedge + battery time fix for 2.6.24 + +William DiPlacido + Frequency from /proc/cpuinfo + Some other SETI stuff + +zimba-tm + alignment none patch + +zotrix + FreeBSD patch for <10 procs --- conky-1.7.1.1.orig/debian/watch +++ conky-1.7.1.1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/conky/conky-([\d\.]+)\.tar\.gz debian uupdate --- conky-1.7.1.1.orig/debian/docs +++ conky-1.7.1.1/debian/docs @@ -0,0 +1,7 @@ +AUTHORS +README +NEWS +TODO +doc/docs.html +doc/variables.html +doc/config_settings.html --- conky-1.7.1.1.orig/debian/control +++ conky-1.7.1.1/debian/control @@ -0,0 +1,28 @@ +Source: conky +Section: utils +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Kapil Hari Paranjape +Build-Depends: debhelper (>= 5.0.0), quilt, libx11-dev, libxft-dev, + libxdamage-dev, libxext-dev, pkg-config (>= 0.19), libglib2.0-dev, + libxml2-dev, libcurl4-gnutls-dev, libtool, automake1.10, + liblua5.1-0-dev, libimlib2-dev, + libiw-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libkvm-dev [kfreebsd-i386 kfreebsd-amd64], + libdevstat-dev [kfreebsd-i386 kfreebsd-amd64] +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/conky +Homepage: http://conky.sf.net +Standards-Version: 3.8.1 + +Package: conky +Architecture: any +Depends: ${shlibs:Depends} +Suggests: mpd +Description: highly configurable system monitor for X based on torsmo + Conky is a system monitor for X originally based on the torsmo code. + Since its original conception, Conky has changed a fair bit from its + predecessor. Conky can display just about anything, either on your + root desktop or in its own window. Conky has many built-in objects, + as well as the ability to execute programs and scripts, then display + the output from stdout. + --- conky-1.7.1.1.orig/debian/compat +++ conky-1.7.1.1/debian/compat @@ -0,0 +1 @@ +5 --- conky-1.7.1.1.orig/debian/conky.py +++ conky-1.7.1.1/debian/conky.py @@ -0,0 +1,21 @@ +'''apport package hook for conky + +Collect conky conf file, conky user's conf file and any specified lua script + +Copyright 2009 Cesare Tirabassi + +''' + +from apport.hookutils import * +from os import path +import re + +def add_info(report): + attach_conffiles(report, 'conky') + conkyrc_path = path.expanduser('~/.conkyrc') + if path.exists(conkyrc_path): + attach_file(report, conkyrc_path) + for file in re.findall("^lua_load\s+(.*?)$", + open(conkyrc_path).read(), + re.MULTILINE): + attach_file_if_exists(report, file) --- conky-1.7.1.1.orig/debian/NEWS +++ conky-1.7.1.1/debian/NEWS @@ -0,0 +1,63 @@ +conky (1.7.0-0ubuntu1) karmic; urgency=low + + The sample version of the config file is not distributed anymore. + A number of features and fixes have been added since the previous + release as documented in the man page and the upstream changelog. + + -- Cesare Tirabassi Sat, 16 May 2009 12:04:10 +0200 + +conky (1.5.1-1) unstable; urgency=low + + The system default config file for conky is an external + conffile '/etc/conky/conky.conf' (since upstream version 1.4.9) + a sample version of this file is in the doc/examples directory. + A number of features and fixes have been added since the previous + release as documented in the man page and the upstream changelog. + + -- Kapil Hari Paranjape Wed, 02 Apr 2008 06:50:26 +0530 + +conky (1.4.9-4) unstable; urgency=low + + Based on requests from some users and from the Ubuntu team the + support for RSS feed monitoring has been enabled in this build. + + -- Kapil Hari Paranjape Fri, 22 Feb 2008 06:19:29 +0530 + +conky (1.4.9-1) unstable; urgency=low + + Since enabling the wireless support meant adding "only" 62K of + library dependency it has been enabled in this build. + + -- Kapil Hari Paranjape Mon, 03 Dec 2007 09:24:31 +0530 + +conky (1.4.7-1) unstable; urgency=low + + The previous version of "conky" packaged for Debian was 1.4.4 + so there have been a number of changes to "conky" and its + configuration in the intervening period. Please look at the + upstream documentation (Changelog, NEWS, man pages) for further + details. + + Some new config parameters have been added but if you have a + configuration file for version 1.4.4-1 it should work without any + problems with this version. If it does not, please report it as a + bug to the Debian BTS. + + Some of the notable additions to "conky" are build-time options + that support "audacious", "beep media player", "RSS feeds" and + "wireless devices". These are *not* enabled in the current Debian + packaging. Users who want these features will have to re-build + "conky" with appropriate changes. + + The hard-coded default configuration of "conky" shows the tail of + the file /var/log/Xorg.0.log. However, this causes "conky" to + exit with an error for those users who do not have such a file or + do not have access to it. The Debian version of "conky" disables + this portion of the hard-coded configuration. + + One of the significant upstream changes is "Clarifying + licensing". This is documented further in the "copyright" file in + this directory. + + -- Kapil Hari Paranjape Fri, 21 Sep 2007 06:24:31 +0530 + --- conky-1.7.1.1.orig/debian/rules +++ conky-1.7.1.1/debian/rules @@ -0,0 +1,114 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# 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) + +CFLAGS = -Wall -g +LDFLAGS = -Wl,--as-needed + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +ifeq ($(DEB_HOST_ARCH_OS),linux) + EXTRA_CONF_ARGS=--enable-wlan +endif + +DEB_QUILT_PATCHES = debian/patches + +patch: debian/patch-stamp +debian/patch-stamp: + QUILT_PATCHES=$(DEB_QUILT_PATCHES) quilt push -a || test $$? = 2 + + touch debian/patch-stamp + +unpatch: + QUILT_PATCHES=$(DEB_QUILT_PATCHES) quilt pop -a -R || test $$? = 2 + + rm -rf ./.pc + rm -f debian/patch-stamp + +configure: debian/configure-stamp +debian/configure-stamp: debian/patch-stamp + dh_testdir + + chmod +x ./autogen.sh + AUTOMAKE=automake-1.10 ./autogen.sh + + rm -f config.cache config.guess config.sub + ln -sf /usr/share/misc/config.sub . + ln -sf /usr/share/misc/config.guess . + + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --sysconfdir=/etc \ + --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --enable-lua --enable-imlib2 \ + --enable-debug --enable-rss $(EXTRA_CONF_ARGS) + + touch debian/configure-stamp + +build: debian/build-stamp +debian/build-stamp: debian/configure-stamp debian/patch-stamp + dh_testdir + + $(MAKE) + + touch debian/build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f debian/build-stamp debian/configure-stamp + [ ! -f Makefile ] || $(MAKE) clean + [ ! -f Makefile ] || $(MAKE) distclean + + # Remove autoconf generated files + rm -f ./config.guess ./config.sub ./data/Makefile.in \ + ./configure ./configure.ac ./doc/Makefile.in \ + ./ltmain.sh ./Makefile.in \ + ./src/config.h.in ./src/Makefile.in ./aclocal.m4 \ + ./m4/libtool.m4 ./m4/ltversion.m4 ./m4/lt~obsolete.m4 \ + ./m4/ltoptions.m4 ./m4/ltsugar.m4 + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + # perl -pi -e 'BEGIN{undef $$/;} s/\.SH COMPILING.*?(\.SH.*)/$$1/sg' doc/conky.1 + $(MAKE) install DESTDIR=$(CURDIR)/debian/conky + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installmenu + dh_installman doc/conky.1 + dh_install debian/conky.py usr/share/apport/package-hooks/ + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure patch reverse-patch --- conky-1.7.1.1.orig/debian/changelog +++ conky-1.7.1.1/debian/changelog @@ -0,0 +1,382 @@ +conky (1.7.1.1-0ubuntu1) karmic; urgency=low + + * New upstream release: + - fixed a pretty serious bug in 1.7.1 that caused rendering of + fonts to be completely messed up in specific circumstances. + * Add debian/patches/fix_fs_free.patch (LP: #385504): + - revert commit b6e691e8ac1d09df7a01c25583b785025a6212a6 + - correct fs_used/fs_used_perc to use fs_free not fs_avail + + -- Cesare Tirabassi Thu, 11 Jun 2009 09:28:12 +0200 + +conky (1.7.1-0ubuntu2) karmic; urgency=low + + * Install an apport hook to retrieve in case of crash the configuration + file (if changed), the user's configuration file and any user's + specified lua scripts. + + -- Cesare Tirabassi Tue, 09 Jun 2009 19:07:01 +0200 + +conky (1.7.1-0ubuntu1) karmic; urgency=low + + * New upstream release: + - Lua scripting support + - Image drawing via Imlib2 + - Built in support for APC UPS daemon monitoring + - Several new variables such as $combine and $eval + - Gauge widgets + * Enable lua and imlib2 support + * Add liblua5.1-0-dev and libimlib2-dev as + Build-Depends in debian/control + * Update debian/copyright author's list + * Set LDFLAGS to -Wl,--as-needed to avoid linking against + unneeded libraries. + + -- Cesare Tirabassi Mon, 08 Jun 2009 11:12:18 +0200 + +conky (1.7.0-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #371043): + - update debian/copyright copyright dates and author's list + - remove following patches, now applied upstream or not needed anymore: + + fix_exec_buffer_size.patch + + ifaddr_buffer_overflow + + x86_64_rdtsc + + move_compile_end_man_page + + fix_hyphen_man_page + + fix_mem_res.patch + - remove installation of example configuration file (removed upstream) + - update debian/NEWS accordingly + * No change bump of Standards-Version to 3.8.1 + + -- Cesare Tirabassi Sat, 16 May 2009 12:04:10 +0200 + +conky (1.6.1-0ubuntu4) jaunty; urgency=low + + * debian/patches: + - fix_mem_res.patch (LP: #329789): + fix ${top_mem} not displaying correctly memory usage + for mem_res and mem_vsize. + Thanks to lolikandr for the patch. + + -- Cesare Tirabassi Mon, 16 Feb 2009 13:12:00 +0100 + +conky (1.6.1-0ubuntu3) intrepid; urgency=low + + * debian/patches: + - fix_exec_buffer_size.patch (LP: #279493, LP: #279791): + fix SIGSEGV due to wrong buffer size being used in all exec* calls. + + -- Cesare Tirabassi Fri, 10 Oct 2008 22:40:09 +0200 + +conky (1.6.1-0ubuntu2) intrepid; urgency=low + + * debian/patches: + - import ifaddr_buffer_overflow patch from Debian: fix buffer overflow in + update_net_stats. Thanks to Miroslav Lichvar and Kapil Paranjape + - move_compile_end_man_page: remove extra blank spaces + + -- Cesare Tirabassi Thu, 18 Sep 2008 12:42:54 +0200 + +conky (1.6.1-0ubuntu1) intrepid; urgency=low + + * New upstream release (1.6.1). + * debian/patches: + - remove patch man_page_typo_first_char since it is applied upstream. + - refreshed patches move_compile_end_man_page and fix_hyphen_man_page. + * debian/rules: + remove in clean target additional autoconf files created in m4/ + + -- Cesare Tirabassi Fri, 15 Aug 2008 15:18:25 +0200 + +conky (1.6.0-1ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable (LP: #217455). Remaining changes: + - debian/control: Add mpd to Suggests + + -- Cesare Tirabassi Fri, 25 Jul 2008 13:30:37 +0200 + +conky (1.6.0-1) unstable; urgency=low + + * New upstream release (1.6.0). + - incorporates debian patches + + for mail spool. + + for usage message. + + for null text strings. + - fix segfault on signal. (Closes: #474732) + - uses variable output_methods instead of out_to_console. + (Closes: #487184) + - has default arguments for 'diskiograph'. (Closes: #487770) + - numerous other new features. See upstream Changelog. + * debian/patches: + - fix_mail_spool, upstream_fix_usage, + upstream_null_text: removed these patches as they are no longer + required. + - avoid_linking_with_libm: removed this patch as conky uses "log" + from the C math library. + - fix_hyphen_man_page, move_compile_end_man_page: refreshed these + patches taking into account new changes to upstream man page. + - man_page_typo_first_char: fix un-needed extra first char on the + first line of the manpage. + - x86_64_rdtsc: patch for 'freq_dyn' on x86_64 from Miroslav Lichvar. + * debian/README.Debian: updated remark about features not compiled in. + * debian/copyright: wrapped long lines. Thanks "lintian". + * debian/control: + - removed 'misc:Depends' entry from Depends. + - Standards-Version bumped to 3.8.0. No other changes required. + + -- Kapil Hari Paranjape Thu, 24 Jul 2008 00:55:04 +0000 + +conky (1.5.1-1ubuntu1) hardy; urgency=low + + * debian/control: Add mpd to Suggests (LP: #212905) + * debian/patches/ubuntu_fix_sigsev: + fix conky SIGSEGV when reloading the configuration file (LP: #212292) + Thanks to Cesare Tirabassi for the patch. + * debian/patches/ubuntu_fix_conky.conf_warning: + correct conky.conf use_spacer setting (see LP #212913) + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Stefan Ebner Mon, 14 Apr 2008 22:38:38 +0200 + +conky (1.5.1-1) unstable; urgency=low + + * New upstream release (1.5.1). + - incorporates debian patches for + + kfreebsd support + + use clock gettime + + ibm acpi volume + + some man page fixes + + sysfs battery + - numerous other new features. see upstream + Changelog. + * debian/{NEWS,README.Debian}: Updated for new version. + * debian/patches: + - cleaned out patches already applied upstream. + as mentioned above. + - refreshed the patches still required + + avoid_linking_with_libm + + fix_hyphen_man_page + + move_compile_end_man_page + + fix_mail_spool + - incorporate patches from upstream svn repository. + + upstream_fix_usage: Fixes the usage message + + upstream_null_text: Handle null "text" entry + in configuration. + * bumped up "debhelper" compatibility level to 5 + now that 'sarge' need not be supported. Closes: #466755. + - debian/compat: value now 5. + - debian/control: debhelper dependency version now + at least 5.0.0. + * debian/rules: reflect change of name of sample + config file from conkyrc.sample to conky.conf. + + -- Kapil Hari Paranjape Wed, 02 Apr 2008 14:56:01 +0530 + +conky (1.4.9-4) unstable; urgency=low + + * debian/patches/sysfs_battery: + - handle systems where the POWER_SUPPLY_CHARGE_* values + define battery status. Thanks to Stefan Ebner for + help in debugging this. + (Closes: #466878) + - close battery status info file after each update. + * Enable support for RSS feed monitoring. + - debian/rules: added "--enable-rss" to configure rules. + - debian/control: additional build-dependencies on "libxml2-dev" + and "libcurl4-gnutls-dev". + - debian/NEWS.Debian: added comment about this change. + * Use autotools and libtool during build. (Thanks to tips from + Henrique de Moraes Holschuh.) + - debian/control: additional build-dependencies on "libtool" + and "automake1.10" + - debian/rules: added run of "autogen.sh" in "configure-stamp" + target. + - debian/rules: Define "RSS_LIBS" environment variable for + "configure" to over-ride "pkg-config" which adds "libgssapi_krb5" + to link libraries. + - debian/rules: modified "clean" rule to clean autoconf generated + files. + * Cleanup souce package of "src/tags" cruft left in by mistake + in the previous upload. + + -- Kapil Hari Paranjape Sat, 23 Feb 2008 05:57:23 +0530 + +conky (1.4.9-3) unstable; urgency=low + + * debian/patches/sysfs_battery: Added support for + battery info in sysfs. (Closes: #463981, #464703). + * debian/patches/fix_mail_spool: Make the value of + "mail_spool" over-ride environment variable "$MAIL". + (Closes: #454656). + + -- Kapil Hari Paranjape Mon, 18 Feb 2008 10:20:24 +0530 + +conky (1.4.9-2) unstable; urgency=low + + * Added support for non-Linux architectures. Closes: #456931. + Thanks to Petr Salinger. + - debian/rules: Use DEB_HOST_ARCH_OS to decide whether to add + wireless support. + - debian/control: Do not depend on "libiw-dev" for kfreebsd-* + and hurd-i386 + - debian/control: Depend on "libkvm-dev" and "libdevstat-dev" for + kfreebsd-*. + - debian/patches/freebsd_support_upstream: patches to src to recognise + kfreebsd-* architecture as similar to freebsd (latter is + supported upstream) sent upstream. + - debian/patches/freebsd_support: patches incorporating above + changes after running GNU autoconf tools. + * debian/patches: + - ibm_acpi_volume: Re-added. Upstream's correction has a flaw. + * debian/control: Standards Version 3.7.3. No changes required. + * debian/rules: + - Required "configure" rule to depend on patch stamp. + - Removed workaround for configure.ac in "clean" rule. + Not required. + * Fixed lintian bugs. Thanks to lintian.debian.org. + - debian/changelog: wrapped entries that were too long. + - debian/copyright: used unicode encoding for names. + + -- Kapil Hari Paranjape Wed, 26 Dec 2007 08:41:25 +0530 + +conky (1.4.9-1) unstable; urgency=low + + * New upstream release. Closes: #453498, #453834. + - Fix number of bugs (see upstream changelog). + - Externalise default configuration to a file (/etc/conky/conky.conf + on Debian). + - Improved music player support. + - Multiple mailboxes support. + * Enabled wireless monitoring. Closes: #445561, #445690. + - debian/rules: added "--enable-wlan" to configure rules. + - debian/control: additional build-dependency on "libiw-dev". + - debian/NEWS.Debian: added comment about this change. + * debian/patches: + - fix_its_man_page: Corrected possessive "it's" by "its" in man page. + Closes: #445918. + - dont_tail_xorglog: Removed. Not required as equivalent patch applied + upstream. + - ibm_acpi_volume: Removed. Not required as equivalent patch applied + upstream. + - use_clock_gettime_correctly: Fix src/timed_thread.c to use realtime + clock correctly. + - avoid_linking_with_libm: Fix src/Makefile.in to avoid needless linking + with libm. + * debian/rules: + - Define "XFT_LIBS" environment variable for "configure" to avoid linking + with "libfontconfig" from which no symbols are used. + * debian/control: Added "Homepage" and "Vc-Svn" fields. + + -- Kapil Hari Paranjape Tue, 4 Dec 2007 14:14:46 +0530 + +conky (1.4.7-1) unstable; urgency=low + + * New upstream release. Closes: #419066. See NEWS.Debian for + more about all the changes since the earlier version. + * New maintainer with the permission of earlier maintainer. + Thanks to Bartosz Fenski for maintaining this package so far. + * debian/watch: added this file pointing to sf.net upstream source. + * debian/control: + - added quilt to Build-Depends. + - added pkg-config, libglib2.0-0 to Build-Depends. + - removed libxt-dev from Build-Depends. + - updated Standards-Version to 3.7.2. No other changes required. + * debian/patches: + - ibm_acpi_volume: prevent volume always returning 0. Closes: #415782. + - dont_tail_xorglog: default configuration does not try to read + /var/log/Xorg.0.log. Closes: #353410, #401200. + - move_compile_end_man_page: move COMPILING section to the + end of the man page to implement a different fix for #368176. + - fix_hyphen_man_page: correct the use of "hyphen-as-minus" in the + man page. + * debian/rules: + - added support for patching/unpatching using quilt. + - modified configure rule to build based on current upstream + defaults. + - removed call to perl that removed COMPILING section from + manpage. + - changed "clean" target to catch errors from upstream targets + "clean" and "distclean". + * debian/NEWS: added explanation of new features for this + version. + * debian/README.Debian: added remarks about configuration issues + specific to Debian package. + * debian/copyright: rewritten to reflect upstream's work on + clarifying provenance of and licenses to the code. + * debian/menu: replaced "Apps/Tools" with + "Applications/System/Monitoring". + + -- Kapil Hari Paranjape Fri, 21 Sep 2007 09:24:48 +0530 + +conky (1.4.4-1) unstable; urgency=low + + * New upstream release. + * COMPILING section has been removed from manpage. (Closes: #368176) + + -- Bartosz Fenski Sat, 18 Nov 2006 11:18:46 +0100 + +conky (1.4.2-1) unstable; urgency=low + + * New upstream release. + - fixes problems on powerpc. (Closes: #359974) + + -- Bartosz Fenski Thu, 18 May 2006 16:20:22 +0200 + +conky (1.4.1-1) unstable; urgency=low + + * New maintainer. (Closes: #357341) + * ACK previous NMUs. (Closes: #346643, #335543, #344235, #348967, + #345951, #352909) + + -- Bartosz Fenski Sat, 18 Mar 2006 00:29:47 +0100 + +conky (1.4.1-0.2) unstable; urgency=low + + * NMU to fix sigaction related compilation problem on 64 bit archs. + + -- Laszlo Boszormenyi (GCS) Thu, 16 Mar 2006 19:39:26 +0000 + +conky (1.4.1-0.1) unstable; urgency=low + + * NMU for a general bugfix release. + * Enable portmon code (closes: #344235). + * Enable mldonkey code (closes: #335543). + + -- Laszlo Boszormenyi (GCS) Wed, 15 Mar 2006 18:55:07 +0000 + +conky (1.4.0-0.1) unstable; urgency=low + + * NMU for new upstream release. + * Apply manpage typos correction (closes: #348967), thanks to A Costa + ! + * Fix BMP lib opening and change conkyrc sample to use UTF8. + + -- Laszlo Boszormenyi (GCS) Thu, 23 Feb 2006 17:42:50 +0000 + +conky (1.3.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Build-depend on libx11-dev, libxext-dev, libxft-dev, and x-dev instead of + on the obsolete xlibs-dev; thanks to Justin Pryzby + for testing. The build-dependency on + libxt-dev can be dropped once upstream has moved to a new version of + autoconf. Closes: #346643. + + -- Steve Langasek Wed, 18 Jan 2006 03:44:30 -0800 + +conky (1.3.1-1) unstable; urgency=low + + * New upstream release + * Added libxt-dev to build-depends in debian/control (closes: #327306) + * Fixed the double BSD-license in debian/copyright (closes: #327135) + + -- Jason Tan Sat, 10 Sep 2005 22:45:51 -0700 + +conky (1.3.0-1) unstable; urgency=low + + * Initial Release. (closes: #320978) + + -- Jason Tan Wed, 24 Aug 2005 00:10:49 -0700 + --- conky-1.7.1.1.orig/debian/patches/series +++ conky-1.7.1.1/debian/patches/series @@ -0,0 +1 @@ +fix_fs_free.patch --- conky-1.7.1.1.orig/debian/patches/fix_fs_free.patch +++ conky-1.7.1.1/debian/patches/fix_fs_free.patch @@ -0,0 +1,54 @@ +See: +http://git.omp.am/?p=conky.git;a=commit;h=357901e6f2226fd4173c1152310ecf2808a1caa1 +http://git.omp.am/?p=conky.git;a=commit;h=8e5508953744ebcfc1ccad0a3158b91b0d071889 + +- revert commit b6e691e8ac1d09df7a01c25583b785025a6212a6 +- correct fs_used/fs_used_perc to use fs_free not fs_avail + +Index: conky-1.7.1.1/src/conky.c +=================================================================== +--- conky-1.7.1.1.orig/src/conky.c 2009-06-11 09:52:02.000000000 +0200 ++++ conky-1.7.1.1/src/conky.c 2009-06-11 09:54:02.000000000 +0200 +@@ -4176,8 +4176,7 @@ + #endif + OBJ(fs_free) { + if (obj->data.fs != NULL) { +- human_readable( (obj->data.fs->free ? obj->data.fs->free : +- obj->data.fs->avail), p, 255); ++ human_readable(obj->data.fs->avail, p, 255); + } + } + OBJ(fs_free_perc) { +@@ -4185,9 +4184,7 @@ + int val = 0; + + if (obj->data.fs->size) { +- val = (obj->data.fs->free ? obj->data.fs->free : +- obj->data.fs->avail) * 100 / +- obj->data.fs->size; ++ val = obj->data.fs->avail * 100 / obj->data.fs->size; + } + + percent_print(p, p_max_size, val); +@@ -4204,8 +4201,8 @@ + } + OBJ(fs_used) { + if (obj->data.fs != NULL) { +- human_readable(obj->data.fs->size - (obj->data.fs->free +- ? obj->data.fs->free : obj->data.fs->avail), p, 255); ++ human_readable(obj->data.fs->size - obj->data.fs->free, p, ++ 255); + } + } + #ifdef X11 +@@ -4226,8 +4223,8 @@ + int val = 0; + + if (obj->data.fs->size) { +- val = (obj->data.fs->free ? obj->data.fs->free : +- obj->data.fs->avail) * 100 / ++ val = obj->data.fs->free ++ * 100 / + obj->data.fs->size; + } +