From c42fe7b6abb53b24b1ea2c9b81d3b332577ed976 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Wed, 13 Dec 2006 16:54:59 +0000 Subject: [PATCH] add license info to timed thread modules; update NEWS git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@817 7f574dfc-610e-0410-a909-a81674777703 --- ChangeLog | 4 ++++ NEWS | 31 +++++++++++++++++++++++++++++++ configure.ac.in | 4 ++-- src/audacious.c | 14 ++++++++------ src/audacious.h | 14 ++++++++------ src/libtcp-portmon.c | 14 ++++++++------ src/libtcp-portmon.h | 14 ++++++++------ src/timed_thread.c | 24 ++++++++++++++++++++---- src/timed_thread.h | 24 ++++++++++++++++++++---- 9 files changed, 109 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c2e56ad..9042e5db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # $Id$ +2006-12-13 + * Clarify LGPL license on timed_thread modules. + * Update NEWS files. + 2006-12-12 * Split battery variable into two: battery, e.g. "charging 75%" and diff --git a/NEWS b/NEWS index 3689a4da..9b5dc4b4 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,34 @@ +Summary of changes for Conky release 1.4.5: +------------------------------------------- +Added config items: +- max_specials +- max_port_monitor_connections + +Removed config items: +- min_port_monitors +- min_port_monitor_connections + +Added variables: +- entropy_avail +- entropy_poolsize +- entropy_bar + +Added length specifier to audacious_title. + +Split battery var into: +- battery and battery_time + +Fixed broken texeci variable. +Fixed build error with --disable-x11. +Fixed build error with --disable-xdamage. +Fixed acpi battery issues. +Fixed mem var overflows when >= 4GB. +Close pop3/imap sockets properly. +Improved internal thread handling. +Converted tcp_portmon internal hash to GLib +for GPL compatibility. + + Summary of changes for Conky release 1.4.4: ------------------------------------------- * fix build error for freebsd. diff --git a/configure.ac.in b/configure.ac.in index cd3e6c74..fead9511 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -3,8 +3,8 @@ dnl $Id$ dnl major, minor and micro version macros. m4_define([conky_version_major], [1]) m4_define([conky_version_minor], [4]) -m4_define([conky_version_micro], [5]) -m4_define([conky_version_tag], []) dnl [] for releases +m4_define([conky_version_micro], [6]) +m4_define([conky_version_tag], [svn]) dnl [] for releases m4_define([conky_version_revision],[r@REVISION@]) m4_define([conky_version], [conky_version_major().conky_version_minor().conky_version_micro()ifelse( diff --git a/src/audacious.c b/src/audacious.c index b4b61472..9dd66635 100644 --- a/src/audacious.c +++ b/src/audacious.c @@ -1,10 +1,10 @@ -/* ------------------------------------------------------------------------- +/* $Id$ */ + +/* * audacious.c: conky support for audacious music player * - * Copyright (C) 2005 Philip Kovacs kovacsp3@comcast.net + * Copyright (C) 2005 Philip Kovacs pkovacs@users.sourceforge.net * - * $Id$ - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +17,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * --------------------------------------------------------------------------- */ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA. + * + */ #include #include diff --git a/src/audacious.h b/src/audacious.h index fac1c853..cd38058e 100644 --- a/src/audacious.h +++ b/src/audacious.h @@ -1,9 +1,9 @@ -/* ------------------------------------------------------------------------- +/* $Id$ */ + +/* * audacious.h: conky support for audacious music player * - * Copyright (C) 2005 Philip Kovacs kovacsp3@comcast.net - * - * $Id$ + * Copyright (C) 2005 Philip Kovacs pkovacs@users.sourceforge.net * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,8 +17,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * --------------------------------------------------------------------------- */ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA. + * + */ #ifndef AUDACIOUS_H #define AUDACIOUS_H diff --git a/src/libtcp-portmon.c b/src/libtcp-portmon.c index fef5ebd3..5d0a5e10 100644 --- a/src/libtcp-portmon.c +++ b/src/libtcp-portmon.c @@ -1,10 +1,10 @@ -/* ------------------------------------------------------------------------- +/* $Id$ */ + +/* * libtcp-portmon.c: tcp port monitoring library. * - * Copyright (C) 2005 Philip Kovacs kovacsp3@comcast.net + * Copyright (C) 2005 Philip Kovacs pkovacs@users.sourceforge.net * - * $Id$ - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +17,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * --------------------------------------------------------------------------- */ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA. + * + */ #include #include "libtcp-portmon.h" diff --git a/src/libtcp-portmon.h b/src/libtcp-portmon.h index c06d80c9..8a1fc7b4 100644 --- a/src/libtcp-portmon.h +++ b/src/libtcp-portmon.h @@ -1,10 +1,10 @@ -/* ------------------------------------------------------------------------- +/* $Id$ */ + +/* * libtcp-portmon.h: tcp port monitoring library. * - * Copyright (C) 2005 Philip Kovacs kovacsp3@comcast.net + * Copyright (C) 2005 Philip Kovacs pkovacs@users.sourceforge.net * - * $Id$ - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either @@ -17,8 +17,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * --------------------------------------------------------------------------- */ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA. + * + */ #ifndef LIBTCP_PORTMON_H #define LIBTCP_PORTMON_H diff --git a/src/timed_thread.c b/src/timed_thread.c index 7a910d66..b0d71aa5 100644 --- a/src/timed_thread.c +++ b/src/timed_thread.c @@ -1,10 +1,26 @@ /* $Id$ */ -/* timed_thread.c - * Author: Philip Kovacs +/* + * timed_thread.c: Abstraction layer for timed threads * - * Abstraction layer for timed threads - * */ + * Copyright (C) 2006 Philip Kovacs pkovacs@users.sourceforge.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA. + * + */ #include #include diff --git a/src/timed_thread.h b/src/timed_thread.h index 0ec4e33b..e875c45f 100644 --- a/src/timed_thread.h +++ b/src/timed_thread.h @@ -1,10 +1,26 @@ /* $Id$ */ -/* timed_thread.h - * Author: Philip Kovacs +/* + * timed_thread.h: Abstraction layer for timed threads * - * Abstraction layer for timed threads - * */ + * Copyright (C) 2006 Philip Kovacs pkovacs@users.sourceforge.net + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 + * USA. + * + */ #ifndef _TIMED_THREAD_H_ #define _TIMED_THREAD_H_