--- conky-1.4.5/ChangeLog	2006-12-13 02:47:40.000000000 +0100
+++ conky-1.4.7/ChangeLog	2007-08-31 05:44:18.000000000 +0200
@@ -1,4 +1,135 @@
-# $Id: ChangeLog 814 2006-12-12 23:21:14Z pkovacs $
+# $Id: ChangeLog 937 2007-08-31 03:44:17Z brenden1 $
+
+2007-08-30
+	* Conky 1.4.7 released
+	* Check for pkg-config >=0.19
+	* Use timed_thread for mpd
+
+2007-08-27
+	* Fixed issue with SIGPIPE and mpd
+	* Updated COPYING (with more clarifications)
+
+2007-08-14
+	* Updated vim/nano syntax files.
+
+2007-08-12
+	* Added $hwmon var, similar to $i2c and $platform.
+
+2007-08-12
+	* Added var $platform which is similar to $i2c and accommodates the conversion
+	  of many devices from /sys/bus/i2c/devices to /sys/bus/platform/devices.
+	* Removed config item post_21_kernel since it forced all i2c device lookups
+	  to go to /sys/bus/platform/devices and some people may need a mix of both
+		i2c and platform devices.
+
+2007-08-10
+	* Clarifying licensing
+
+2007-08-08
+	* RSS support
+	* Wireless support for Linux
+
+2007-08-05
+	* Conky 1.4.6 released
+	* Updated to libmpdclient 0.13.0
+	* Added 'post_21_kernel' config param to specify kernels 2.6.22 and newer
+	so i2c works properly
+
+2007-08-04
+	* Fixed potential issue on FreeBSD when nprocs < 10 (thanks zotrix)
+	* Added support for multiple batteries when using acpi (thanks Phil)
+	* a bunch of code cleanups (thanks Psychon)
+	* added max length paramater to mpd_title (thinks fow)
+	* a number of small bug fixes
+
+2007-07-15
+	* Fix PID display, patch #1753934.  thanks sohalt.
+	* Fix displaying 4 GB traffic after reloading network driver,
+			patch #1754260.  thanks sohalt.
+
+2007-06-21
+	* Right-justify top/top_mem vars (pid/cpu/mem} so they align on the decimal.
+
+2007-04-25
+	* Added color[0-9] variable patch (thanks jieryn)
+
+2007-04-05
+	* Added if_empty patch (thanks Erik)
+	* Added if_existing patch for string matching (thanks cromka)
+	* Added hwmon support (thanks flitsch)
+	* Some xmms2 updates (thanks sleipner)
+	* Added $battery_percent and $battery_bar (thanks akash)
+
+2007-02-25
+	* OpenBSD support added to Conky (thanks hifi)
+	* Updated mboxscan stuff (thanks calmar)
+
+2007-02-25
+	* Created branch/1.5 copy of trunk/conky1.  Removing all experimental
+	  network code from trunk/conky1.
+
+2007-02-14
+	* Include missing mboxscan.h in conky.h.
+	* Fixed signedness warnings in conky.c.
+
+2007-02-11
+	* Added buffer_text_size option to change the size of the buffer for
+	things like $exec, $tail, et cetera
+	* Added $mboxscan which lets you display the Subject and From fields
+	from recent email in an mbox file
+	* Disambiguated (is that a word?) $cpu docs
+
+2007-01-14
+	* Fallback to gettimeofday() when clock_gettime () not available (mac os).
+
+2007-01-09
+	* API change (timing in milliseconds) for dexter_timedsampler_new ().
+
+2007-01-07
+	* Add config.rpath (created by gettextize -copy) to distribution
+	  to satisfy AM_ICONV.
+	* Clean up some warnings; remove ftp.[ch] from src/Makefile.am.
+
+2006-12-29
+	* Update svn ebuild to new sourceforge url scheme.
+		- requires deletion of existing wc: rm -rf /usr/portage/distfile/svn-src/conky/
+	* Added head/tail rewrite patch (thanks Ryan Twitchell)
+	* Added diskio read/write sf.net patch 1542880 (thanks Blondak)
+
+2006-12-26
+	* Clear conky vars on disconnect/failure to open files.
+
+2006-12-23
+	* Updated to libmpdclient 0.12.0
+
+2006-12-22
+	* client/server infrastructure and prototype for linux only (so far):
+		- requires libdexter (http://sourceforge.net/projects/libdexter)
+	  	and the dxt-sysinfo plugin (svn only at the moment).
+	* new config items:
+		- dexter_client yes/no
+		- dexter_server yes/no
+		- dexter_config /path/to/libdexter/config (default: $HOME/.dexterrc)
+		- own_window_class <WM Class Name> (default: Conky)
+			- replaces wm_class_name
+		- own_window_title <Window Title> (default: <hostname> - conky)
+	* removed config items:
+		- wm_class_name (use own_window_class, same function)
+	* configure changes:
+	  --disable-network (default=yes) with auto-detection for libdexter.
+		- remove useless --enable-proc-uptime (PROC_UPTIME never referenced).  
+			HAVE_SYSINFO and others determine if /proc/uptime is used.
+		- silently disable xft, double-buffer and xdamage if no x11.
+		- change enable/disable labels to reflect defaults accurately.
+		- simplified compile-based checks for sysinfo/getloadavg and by moving
+		  them into AC_CHECK_FUNCS.
+	* allow decorated, own_window=yes windows to be given input focus by WM:
+		- do not pass button clicks through to desktop in this scenario as conky
+		  immediately loses focus.  
+
+2006-12-13
+	* Clarify LGPL license on timed_thread modules.
+	* Update NEWS files.
 
 2006-12-12
 	* Split battery variable into two: