From ce9fac523308938c953f35d8e43a316ae03a5f66 Mon Sep 17 00:00:00 2001
From: kaetemi <kaetemi@gmail.com>
Date: Wed, 13 Nov 2019 16:13:31 +0800
Subject: [PATCH] Cleanup streamed package merge

---
 code/CMakeLists.txt                   |  6 +++---
 code/nel/tools/misc/CMakeLists.txt    | 10 +++++++++-
 code/ryzom/client/src/login_patch.cpp |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index e263da274..46900daa6 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -48,15 +48,15 @@ CHECK_OUT_OF_SOURCE()
 IF(CMAKE_VERSION VERSION_GREATER "2.8.10")
   STRING(TIMESTAMP CURRENT_YEAR "%Y")
 ELSE()
-  SET(CURRENT_YEAR "2016")
+  SET(CURRENT_YEAR "2019")
 ENDIF()
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(RyzomCore CXX C)
 SET(NL_VERSION_MAJOR 1)
 SET(NL_VERSION_MINOR 0)
-SET(NL_VERSION_PATCH 1)
-SET(YEAR "2004-${CURRENT_YEAR}")
+SET(NL_VERSION_PATCH 2)
+SET(YEAR "2001-${CURRENT_YEAR}")
 SET(AUTHOR "Winch Gate and The Ryzom Core Community")
 
 SET(RYZOM_VERSION_MAJOR 3)
diff --git a/code/nel/tools/misc/CMakeLists.txt b/code/nel/tools/misc/CMakeLists.txt
index 8f962d1f2..f9112a823 100644
--- a/code/nel/tools/misc/CMakeLists.txt
+++ b/code/nel/tools/misc/CMakeLists.txt
@@ -4,7 +4,15 @@ IF(WITH_QT OR WITH_QT5)
 ENDIF()
 
 IF(WITH_NEL_TOOLS)
-  SUBDIRS(bnp_make disp_sheet_id extract_filename lock make_sheet_id xml_packer)
+  SUBDIRS(
+    bnp_make
+    snp_make
+    disp_sheet_id
+    extract_filename
+    lock
+    make_sheet_id
+    xml_packer
+  )
 
   IF(WITH_QT OR WITH_QT5)
     ADD_SUBDIRECTORY(words_dic_qt)
diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp
index 84d5247fc..908f12977 100644
--- a/code/ryzom/client/src/login_patch.cpp
+++ b/code/ryzom/client/src/login_patch.cpp
@@ -1882,6 +1882,7 @@ bool CPatchManager::bnpUnpack(const string &srcBigfile, const string &dstPath, v
 		return false;
 	}
 
+	// Unpack
 	if (!bnpFile.unpack(DestPath))
 		return false;