From d8c30ffddbbc7aebb1bb2d3a0914784f07b8ecdd Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Tue, 30 Sep 2008 17:37:03 +0000 Subject: [PATCH] - Bump copyright year, version information and minimum gtk+ version in various files --- INSTALL | 2 +- README | 4 ++-- gkrellm.spec | 2 +- server/win32-resource.h | 1 + server/win32-resource.rc | 25 +++++++++++++++++-------- src/Makefile | 2 +- src/win32-resource.h | 2 +- src/win32-resource.rc | 26 +++++++++++++++----------- 8 files changed, 39 insertions(+), 25 deletions(-) diff --git a/INSTALL b/INSTALL index 43dcf39..a1c4f85 100644 --- a/INSTALL +++ b/INSTALL @@ -89,7 +89,7 @@ Windows 2000/XP (Vista is untested) Needed software for building gkrellm on win32 systems: - MinGW - MSYS (gkrellm Makefiles are NOT compatible with cmd.exe) - - GTK >= 2.4 Development files (see http://www.gimp.org/~tml/gimp/win32/) + - GTK >= 2.6 Development files (see http://www.gimp.org/~tml/gimp/win32/) - OpenSSL (optional), GnuTLS is not recommended on win32 Note: Installing gkrellm on windows needs INSTALLROOT set, the default path diff --git a/README b/README index 8356105..a815d4b 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ Author: Bill Wilson Email: billw--at--gkrellm.net Homepage: http://gkrellm.net -Copyright (c) 1999-2006 by Bill Wilson. This program is free software +Copyright (c) 1999-2008 by Bill Wilson. This program is free software which I release under the GNU General Public License. Read the COPYRIGHT file for more info. @@ -96,7 +96,7 @@ User Interface Requirements ============ To use or compile GKrellM, you need: - * Gtk+-2.0 + * Gtk+-2.6 To compile, you additionally need the development libs. diff --git a/gkrellm.spec b/gkrellm.spec index e997270..1699a77 100644 --- a/gkrellm.spec +++ b/gkrellm.spec @@ -13,7 +13,7 @@ URL: http://gkrellm.net Source: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{version}.tar.bz2 Vendor: Bill Wilson Packager: Bill Wilson -Requires: gtk2 >= 2.0, glib2 >= 2.0 +Requires: gtk2 >= 2.6, glib2 >= 2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-root %description diff --git a/server/win32-resource.h b/server/win32-resource.h index 6c36c59..88919df 100644 --- a/server/win32-resource.h +++ b/server/win32-resource.h @@ -1,3 +1,4 @@ #ifndef IDC_STATIC #define IDC_STATIC (-1) #endif + diff --git a/server/win32-resource.rc b/server/win32-resource.rc index 06e9e05..c38a539 100644 --- a/server/win32-resource.rc +++ b/server/win32-resource.rc @@ -1,35 +1,44 @@ -//#include "win32-resource.h" +// Generated by ResEdit 1.4.3 +// Copyright (C) 2006-2008 +// http://www.resedit.net + +#include "win32-resource.h" #include "windows.h" + // // Version Information resources // +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 VERSIONINFO - FILEVERSION 2,3,1,0 + FILEVERSION 2,3,2,0 PRODUCTVERSION 0,0,0,0 - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904B0" + BLOCK "040904b0" BEGIN + VALUE "CompanyName", "The GKrellM Developers" VALUE "FileDescription", "GKrellM Daemon" - VALUE "FileVersion", "2.3.1" + VALUE "FileVersion", "2.3.2" VALUE "InternalName", "gkrellmd" VALUE "LegalCopyright", "Copyright (C) 1999-2008 Bill Wilson" VALUE "OriginalFilename", "gkrellmd.exe" VALUE "ProductName", "GKrellM" - VALUE "ProductVersion", "2.3.1" + VALUE "ProductVersion", "2.3.2" END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 1033, 1200 END END + // // Manifest resources // -1 RT_MANIFEST "win32-manifest.xml" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +1 RT_MANIFEST "win32-manifest.xml" diff --git a/src/Makefile b/src/Makefile index 2932ee5..e341b7b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -350,7 +350,7 @@ winops-win32.o: winops-win32.c $(GKRELLM_H) win32-plugin.o: win32-plugin.c win32-plugin.h win32-libgkrellm.o: win32-libgkrellm.c win32-plugin.h win32-resource.o: win32-resource.rc win32-resource.h - windres -I.. -o win32-resource.o win32-resource.rc + windres -o win32-resource.o win32-resource.rc libgkrellm.a: win32-libgkrellm.o ar -cr libgkrellm.a win32-libgkrellm.o diff --git a/src/win32-resource.h b/src/win32-resource.h index d6c7354..ba767ce 100644 --- a/src/win32-resource.h +++ b/src/win32-resource.h @@ -2,4 +2,4 @@ #define IDC_STATIC (-1) #endif -#define IDI_ICON3 105 +#define IDI_ICON3 105 diff --git a/src/win32-resource.rc b/src/win32-resource.rc index 249858b..da977e3 100644 --- a/src/win32-resource.rc +++ b/src/win32-resource.rc @@ -1,5 +1,5 @@ -// Generated by ResEdit 1.3.6 -// Copyright (C) 2006-2007 +// Generated by ResEdit 1.4.3 +// Copyright (C) 2006-2008 // http://www.resedit.net #include "win32-resource.h" @@ -9,34 +9,37 @@ // // Icon resources // -IDI_ICON3 ICON "gkrellm.ico" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +IDI_ICON3 ICON "gkrellm.ico" // // Version Information resources // +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 VERSIONINFO - FILEVERSION 2,3,1,0 + FILEVERSION 2,3,2,0 PRODUCTVERSION 0,0,0,0 - FILEOS VOS__WINDOWS32 + FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904B0" + BLOCK "040904b0" BEGIN + VALUE "CompanyName", "The GKrellM Developers" VALUE "FileDescription", "GKrellM" - VALUE "FileVersion", "2.3.1" + VALUE "FileVersion", "2.3.2" VALUE "InternalName", "gkrellm" - VALUE "LegalCopyright", "Copyright (C) 1999-2007 Bill Wilson" + VALUE "LegalCopyright", "Copyright (C) 1999-2008 Bill Wilson" VALUE "OriginalFilename", "gkrellm.exe" VALUE "ProductName", "GKrellM" - VALUE "ProductVersion", "2.3.1" + VALUE "ProductVersion", "2.3.2" END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 1033, 1200 END END @@ -44,4 +47,5 @@ END // // Manifest resources // -1 RT_MANIFEST "win32-manifest.xml" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +1 RT_MANIFEST "win32-manifest.xml"