Merge branch 'release-4.6.0' of github.com:sleuthkit/sleuthkit into release-4.6.0

packages/sleuthkit.spec

 Name:		sleuthkit	
-Version:	4.5.0
+Version:	4.6.0
 Release:	1%{?dist}
 Summary:	The Sleuth Kit (TSK) is a library and collection of command line tools that allow you to investigate volume and file system data.	
 

tsk/Makefile.am

@@ -8,6 +8,6 @@ libtsk_la_LIBADD = base/libtskbase.la img/libtskimg.la \
     vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la \
     auto/libtskauto.la
 # current:revision:age
-libtsk_la_LDFLAGS = -version-info 17:0:4 $(LIBTSK_LDFLAGS)
+libtsk_la_LDFLAGS = -version-info 17:1:4 $(LIBTSK_LDFLAGS)
 
 EXTRA_DIST = tsk_tools_i.h docs/Doxyfile docs/*.dox docs/*.html

tsk/base/tsk_base.h

@@ -39,11 +39,11 @@
  * 3.1.2b1 would be 0x03010201.  Snapshot from Jan 2, 2003 would be
  * 0xFF030102.
  * See TSK_VERSION_STR for string form. */
-#define TSK_VERSION_NUM 0x040500ff
+#define TSK_VERSION_NUM 0x040600ff
 
 /** Version of code in string form. See TSK_VERSION_NUM for
  * integer form. */
-#define TSK_VERSION_STR "4.5.0"
+#define TSK_VERSION_STR "4.6.0"
 
 
 /* include the TSK-specific header file that we created in autoconf