diff --git a/gsmartcontrol/Makefile.am b/gsmartcontrol/Makefile.am index bc7c01e..86a54f6 100644 --- a/gsmartcontrol/Makefile.am +++ b/gsmartcontrol/Makefile.am @@ -68,7 +68,7 @@ src-rpm: dist # NSIS installer support. -# Requires wine, installed NSIS, smartctl-nc.exe, smartctl.exe. +# Requires wine, installed NSIS, smartctl-nc.exe, smartctl.exe, update-smart-drivedb.exe. # Gtkmm dlls and pcre dlls are required if linking against them. # dos2unix on build machine. # Execute only with win32 build present. @@ -91,6 +91,8 @@ win-dist-clean: win-dist-cleanup win-dist-prepare-all: nsis-dist-prepare win-zip-dist-prepare +# Don't strip smartctl (it will only change the header), and +# don't strip update-smart-drivedb (it will break its CRC check). win-dist-prepare: all $(MKDIR_P) win-dist cp $(top_srcdir)/data/icon_*.png win-dist/ @@ -100,14 +102,15 @@ win-dist-prepare: all cp $(top_srcdir)/AUTHORS.txt $(top_srcdir)/LICENSE_* $(top_srcdir)/README.txt win-dist/doc/ cp $(top_srcdir)/NEWS win-dist/doc/NEWS.txt - cp "@WINDOWS_BINDIR@"/smartctl-nc.exe win-dist/ - cp "@WINDOWS_BINDIR@"/smartctl.exe win-dist/ - cp src/gsmartcontrol.exe src/gsmartcontrol.exe.manifest win-dist/ unix2dos win-dist/doc/*.txt $(STRIP) win-dist/*.exe + cp -p "@WINDOWS_BINDIR@"/smartctl-nc.exe win-dist/ + cp -p "@WINDOWS_BINDIR@"/smartctl.exe win-dist/ + cp -p "@WINDOWS_BINDIR@"/update-smart-drivedb.exe win-dist/ + nsis-dist-prepare: win-dist-prepare cp -a win-dist nsis-dist diff --git a/gsmartcontrol/NEWS b/gsmartcontrol/NEWS index eceb59a..aa2a0d1 100644 --- a/gsmartcontrol/NEWS +++ b/gsmartcontrol/NEWS @@ -1,5 +1,5 @@ -Version 0.8.6, released on 2011-05-29 +Version 0.8.6, released on 2011-06-12 Support detecting drives behind 3ware controllers (Linux, Windows), including tw_cli/cx/px mode in Windows. Having tw_cli is recommended but not required. diff --git a/gsmartcontrol/README.txt b/gsmartcontrol/README.txt index ae57c55..f5aaca9 100644 --- a/gsmartcontrol/README.txt +++ b/gsmartcontrol/README.txt @@ -101,7 +101,7 @@ You need to have the following software installed: * Gtkmm, version 2.6 or higher - see http://www.gtkmm.org . * libglademm, version 2.4 or higher - see http://www.gtkmm.org . -Note: libglademm is not needed when using GTK / Gtkmm 2.12 or newer. +Note: libglademm is not needed when using GTK+ / Gtkmm 2.12 or newer. Note that having GTK+ 2.12 and Gtkmm 2.12 is HIGHLY recommended. While earlier versions may work, they may produce suboptimal results and buggy behavior. diff --git a/gsmartcontrol/TODO b/gsmartcontrol/TODO index cd5792e..9fbdd0e 100644 --- a/gsmartcontrol/TODO +++ b/gsmartcontrol/TODO @@ -37,9 +37,9 @@ Bugs / patches: TODO: -test, release RC version for testing. - Update to drivedb.h from 5.41, include 5.41 into release. - +Delete drivedb.h (and all related drivedb* files) on uninstall - windows. + add menu item - "update drive database" (not sure about linux, should + check if it's supported first; also need to run it in terminal). Testing: diff --git a/gsmartcontrol/data/nsis/distribution-nogtk.txt.in b/gsmartcontrol/data/nsis/distribution-nogtk.txt.in index 75d23d2..9062a99 100644 --- a/gsmartcontrol/data/nsis/distribution-nogtk.txt.in +++ b/gsmartcontrol/data/nsis/distribution-nogtk.txt.in @@ -22,7 +22,7 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and * Smartctl binaries (from smartmontools 5.41, http://smartmontools.sf.net/) - smartctl-nc.exe (compiled without console output), smartctl.exe (compiled -with console output). +with console output), update-smart-drivedb.exe (drive database updater). The combined distribution is multi-licensed under GNU GPL versions 2 and 3. diff --git a/gsmartcontrol/data/nsis/distribution.txt.in b/gsmartcontrol/data/nsis/distribution.txt.in index f0e6e0a..b591f79 100644 --- a/gsmartcontrol/data/nsis/distribution.txt.in +++ b/gsmartcontrol/data/nsis/distribution.txt.in @@ -18,7 +18,7 @@ binary was compiled for 32-bit Windows, and should work on both 32-bit and * Smartctl binaries (from smartmontools 5.41, http://smartmontools.sf.net/) - smartctl-nc.exe (compiled without console output), smartctl.exe (compiled -with console output). +with console output), update-smart-drivedb.exe (drive database updater). * GTK+ for Windows Runtime package (@GTK_INSTALLER_NAME@) from http://gtk-win.sf.net, either in original or unpacked form. diff --git a/gsmartcontrol/data/nsis/gsmartcontrol.nsi.in b/gsmartcontrol/data/nsis/gsmartcontrol.nsi.in index 629c3bd..dced470 100644 --- a/gsmartcontrol/data/nsis/gsmartcontrol.nsi.in +++ b/gsmartcontrol/data/nsis/gsmartcontrol.nsi.in @@ -158,6 +158,7 @@ SectionIn 1 RO ; File *.dll File smartctl-nc.exe File smartctl.exe + File update-smart-drivedb.exe ; Include the "doc" directory completely, excluding the file we're not using (e.g. the -nogtk file in gtk installer). !ifdef NO_GTK @@ -400,6 +401,14 @@ Section Uninstall ; Delete "$INSTDIR\*.dll" Delete "$INSTDIR\smartctl-nc.exe" Delete "$INSTDIR\smartctl.exe" + Delete "$INSTDIR\update-smart-drivedb.exe" + + ; update-smart-drivedb may leave these + Delete "$INSTDIR\drivedb.h" + Delete "$INSTDIR\drivedb.h.new" + Delete "$INSTDIR\drivedb.h.old" + Delete "$INSTDIR\drivedb.h.error" + Delete "$INSTDIR\drivedb.h.lastcheck" RMDir /r "$INSTDIR\doc" @@ -409,6 +418,9 @@ Section Uninstall RMDir "$INSTDIR" ; only if empty + ; For some reason, sometimes it's not deleted in the sections, so do it here. + Delete "$INSTDIR\${GTK_INSTALLER_EXE}" + !ifndef NO_GTK StrCmp $gtk_mode "private" skip_exe_PATH_remove !endif diff --git a/gsmartcontrol/debian.dist/copyright b/gsmartcontrol/debian.dist/copyright index 5383028..1a277ef 100644 --- a/gsmartcontrol/debian.dist/copyright +++ b/gsmartcontrol/debian.dist/copyright @@ -5,7 +5,7 @@ It was downloaded from Copyright: - Copyright (C) 2008 - 2010 Alexander Shaduri + Copyright (C) 2008 - 2011 Alexander Shaduri License: @@ -27,6 +27,6 @@ On Debian systems, the complete text of the GNU General Public Licenses can be found in `/usr/share/common-licenses/GPL-2' and `/usr/share/common-licenses/GPL-3'. -The Debian packaging is (C) 2008 - 2010 Alexander Shaduri and +The Debian packaging is (C) 2008 - 2011 Alexander Shaduri and is licensed under the GPLv2 and GPLv3, see above.