Changeset 3645

Timestamp:

10/10/12 16:15:26 (7 months ago)

Author:

chrfranke

Message:

Rename old CHANGELOG to ChangeLog?-5.0-6.0.
Start new ChangeLog?.

Location:

trunk/smartmontools

Files:

• ChangeLog (added)
• ChangeLog-5.0-6.0 (moved) (moved from trunk/smartmontools/CHANGELOG) (1 diff)
• INSTALL (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• do_release (modified) (2 diffs)
• os_win32/installer.nsi (modified) (3 diffs)
• os_win32/smartctl_vc10.vcxproj (modified) (1 diff)
• os_win32/smartctl_vc10.vcxproj.filters (modified) (1 diff)
• os_win32/smartd_vc10.vcxproj (modified) (1 diff)
• os_win32/smartd_vc10.vcxproj.filters (modified) (1 diff)

trunk/smartmontools/ChangeLog-5.0-6.0

@@ -1 @@
-CHANGELOG for smartmontools
+CHANGELOG for smartmontools 5.0 to 6.0
 
 $Id$
-
-The most recent version of this file is:
-http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/CHANGELOG?view=markup
 
 Maintainers / Developers Key (alphabetic order):

trunk/smartmontools/INSTALL

@@ -594 +594 @@
 /usr/local/share/man/man8/smartd.8                      [Manual page]
 /usr/local/share/doc/smartmontools/AUTHORS              [Information about the authors and developers]
-/usr/local/share/doc/smartmontools/CHANGELOG            [A log of changes. Also see SVN]
+/usr/local/share/doc/smartmontools/ChangeLog            [A log of changes. Also see SVN]
 /usr/local/share/doc/smartmontools/COPYING              [GNU General Public License Version 2]
 /usr/local/share/doc/smartmontools/INSTALL              [Installation instructions: what you're reading!]

trunk/smartmontools/Makefile.am

@@ -283 +283 @@
 
 docsdir=$(docdir)
-docs_DATA = AUTHORS     \
-            CHANGELOG   \
-            COPYING     \
-            INSTALL     \
-            NEWS        \
-            README      \
-            TODO        \
-            WARNINGS    \
-            smartd.conf
+docs_DATA = \
+        AUTHORS \
+        ChangeLog \
+        ChangeLog-5.0-6.0 \
+        COPYING \
+        INSTALL \
+        NEWS \
+        README \
+        TODO \
+        WARNINGS \
+        smartd.conf
 
 examplesdir=$(exampledir)
@@ -399 +401 @@
 if IS_SVN_BUILD
 # Get version info from SVN
-svnversion.h: CHANGELOG Makefile $(svn_deps)
+svnversion.h: ChangeLog Makefile $(svn_deps)
         echo '/* svnversion.h.  Generated by Makefile from svn info.  */' > $@
         (cd $(srcdir) \
@@ -409 +411 @@
 
 # SVN not available, guess version info from Id strings
-svnversion.h: CHANGELOG Makefile
+svnversion.h: ChangeLog Makefile
         echo '/* svnversion.h.  Generated by Makefile from Id strings.  */' > $@
-        (cd $(srcdir) && cat CHANGELOG Makefile.am configure.in smart*.in *.cpp *.h *.s) \
+        (cd $(srcdir) && cat ChangeLog Makefile.am configure.in smart*.in *.cpp *.h *.s) \
         | sed -n 's,^.*\$$[I][d]: [^ ]* \([0-9][0-9]* [0-9][-0-9]* [0-9][:0-9]*\)[^:0-9][^$$]*\$$.*$$,\1,p' \
         | sort -n -r \
@@ -662 +664 @@
         $(EXEFILES_WIN32) \
         $(docdir_win32)/AUTHORS.txt \
-        $(docdir_win32)/CHANGELOG.txt \
+        $(docdir_win32)/ChangeLog.txt \
+        $(docdir_win32)/ChangeLog-5.0-6.0.txt \
         $(docdir_win32)/COPYING.txt \
         $(docdir_win32)/INSTALL.txt \

trunk/smartmontools/do_release

@@ -9 +9 @@
 # Notes on generating releases:
 # (1) update NEWS
-# (2) update CHANGELOG -- put in release number
+# (2) update ChangeLog -- put in release number
 # (3) update release number in configure.in 
 # (4) to test, run without '--commit'
@@ -64 +64 @@
 (cd $WDROOT && svn status) | while read s; do
   case "`echo $s | tr -s ' '`" in
-    "M "$DIRPAT/smartmontools/CHANGELOG)    echo "$s: OK";;
+    "M "$DIRPAT/smartmontools/ChangeLog)    echo "$s: OK";;
     "M "$DIRPAT/smartmontools/NEWS)         echo "$s: OK";;
     "M "$DIRPAT/smartmontools/configure.in) echo "$s: OK";;

trunk/smartmontools/os_win32/installer.nsi

@@ -175 +175 @@
   SetOutPath "$INSTDIR\doc"
   File "${INPDIR}\doc\AUTHORS.txt"
-  File "${INPDIR}\doc\CHANGELOG.txt"
+  File "${INPDIR}\doc\ChangeLog.txt"
+  File "${INPDIR}\doc\ChangeLog-5.0-6.0.txt"
   File "${INPDIR}\doc\COPYING.txt"
   File "${INPDIR}\doc\INSTALL.txt"
@@ -309 +310 @@
         !insertmacro CreateAdminShortCut "$SMPROGRAMS\smartmontools\Documentation\drivedb-add.h (create, edit).lnk" "$EDITOR" "$INSTDIR\bin\drivedb-add.h"
     nodb:
-    CreateShortCut "$SMPROGRAMS\smartmontools\Documentation\CHANGELOG.lnk" "$INSTDIR\doc\CHANGELOG.txt"
+    CreateShortCut "$SMPROGRAMS\smartmontools\Documentation\ChangeLog.lnk" "$INSTDIR\doc\ChangeLog.txt"
     CreateShortCut "$SMPROGRAMS\smartmontools\Documentation\COPYING.lnk"   "$INSTDIR\doc\COPYING.txt"
     CreateShortCut "$SMPROGRAMS\smartmontools\Documentation\NEWS.lnk"      "$INSTDIR\doc\NEWS.txt"
@@ -432 +433 @@
   Delete "$INSTDIR\bin\runcmdu.exe.manifest"
   Delete "$INSTDIR\doc\AUTHORS.txt"
-  Delete "$INSTDIR\doc\CHANGELOG.txt"
+  Delete "$INSTDIR\doc\ChangeLog.txt"
   Delete "$INSTDIR\doc\COPYING.txt"
   Delete "$INSTDIR\doc\INSTALL.txt"

trunk/smartmontools/os_win32/smartctl_vc10.vcxproj

@@ -284 +284 @@
     <None Include="..\AUTHORS" />
     <None Include="..\autogen.sh" />
-    <None Include="..\CHANGELOG" />
+    <None Include="..\ChangeLog" />
     <None Include="..\config.h.in" />
     <None Include="..\configure.in" />

trunk/smartmontools/os_win32/smartctl_vc10.vcxproj.filters

@@ -114 +114 @@
     <None Include="..\AUTHORS" />
     <None Include="..\autogen.sh" />
-    <None Include="..\CHANGELOG" />
+    <None Include="..\ChangeLog" />
     <None Include="..\config.h.in" />
     <None Include="..\configure.in" />

trunk/smartmontools/os_win32/smartd_vc10.vcxproj

@@ -289 +289 @@
     <None Include="..\AUTHORS" />
     <None Include="..\autogen.sh" />
-    <None Include="..\CHANGELOG" />
+    <None Include="..\ChangeLog" />
     <None Include="..\config.h.in" />
     <None Include="..\configure.in" />

trunk/smartmontools/os_win32/smartd_vc10.vcxproj.filters

@@ -117 +117 @@
     <None Include="..\AUTHORS" />
     <None Include="..\autogen.sh" />
-    <None Include="..\CHANGELOG" />
+    <None Include="..\ChangeLog" />
     <None Include="..\config.h.in" />
     <None Include="..\configure.in" />