From 390bb07cca46431ae8eca870cc08a36aa12ffb93 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Thu, 17 Aug 2017 14:09:16 -0400
Subject: [PATCH] 2.15.0

---
 ChangeLog                              | 14 ++++++++++++++
 Win32/installer.iss                    |  2 +-
 android/AndroidManifest.xml            |  2 +-
 appveyor.yml                           |  2 +-
 contrib/rpm/i2pd.spec                  | 13 ++++++++++++-
 debian/changelog                       |  9 +++++++++
 libi2pd/version.h                      |  2 +-
 qt/i2pd_qt/android/AndroidManifest.xml |  2 +-
 8 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47039dd4..29d3ced3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.15.0] - 2017-08-17
+### Added
+- QT GUI 
+- Ability to add and remove I2P tunnels without restart
+- Ability to disable SOCKS outproxy option
+### Changed
+- Strip-out Accept-* hedaers in HTTP proxy
+- Don't run peer test if nat=false
+- Separate output of NTCP and SSU sessions in Transports tab
+### Fixed
+- Handle lines with comments in hosts.txt file for address book
+- Run router with empty netdb for testnet
+- Skip expired introducers by iexp
+
 ## [2.14.0] - 2017-06-01
 ### Added
 - Transit traffic bandwidth limitation
diff --git a/Win32/installer.iss b/Win32/installer.iss
index 95c2bf42..55f89a32 100644
--- a/Win32/installer.iss
+++ b/Win32/installer.iss
@@ -1,5 +1,5 @@
 #define I2Pd_AppName "i2pd"
-#define I2Pd_ver "2.14.0"
+#define I2Pd_ver "2.15.0"
 #define I2Pd_Publisher "PurpleI2P"
 
 [Setup]
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index d85d42b7..e4023db5 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.purplei2p.i2pd"
       android:versionCode="1"
-      android:versionName="2.14.0"
+      android:versionName="2.15.0"
 	  android:installLocation="auto">
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="25"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/appveyor.yml b/appveyor.yml
index b5542562..59011e77 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.14.{build}
+version: 2.15.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index ce47b866..d898249b 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -1,7 +1,7 @@
 %define build_timestamp %(date +"%Y%m%d")
 
 Name:           i2pd
-Version:        2.14.0
+Version:        2.15.0
 Release:        %{build_timestamp}git%{?dist}
 Summary:        I2P router written in C++
 
@@ -103,6 +103,17 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Thu Aug 17 2017 orignal <i2porignal@yandex.ru> - 2.15.0
+- Added QT GUI 
+- Added ability add and remove I2P tunnels without restart
+- Added ability to disable SOCKS outproxy option
+- Changed strip-out Accept-* hedaers in HTTP proxy
+- Changed peer test if nat=false
+- Changed separate output of NTCP and SSU sessions in Transports tab
+- Fixed handle lines with comments in hosts.txt file for address book
+- Fixed run router with empty netdb for testnet
+- Fixed skip expired introducers by iexp
+
 * Thu Jun 01 2017 orignal <i2porignal@yandex.ru> - 2.14.0
 - Added transit traffic bandwidth limitation
 - Added NTCP connections through HTTP and SOCKS proxies
diff --git a/debian/changelog b/debian/changelog
index 67773089..d772bf6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+i2pd (2.15.0-1) unstable; urgency=low
+
+  * updated to version 2.15.0/0.9.31
+  * updated debian/control
+  * renamed logrotate to i2pd.logrotate
+  * fixed init.d script
+
+ -- orignal <orignal@i2pmail.org>  Thu, 17 Aug 2017 18:00:00 +0000
+
 i2pd (2.14.0-1) unstable; urgency=low
 
   * updated to version 2.14.0/0.9.30
diff --git a/libi2pd/version.h b/libi2pd/version.h
index 2710812b..0b5f9874 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -7,7 +7,7 @@
 #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
 
 #define I2PD_VERSION_MAJOR 2
-#define I2PD_VERSION_MINOR 14
+#define I2PD_VERSION_MINOR 15
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
diff --git a/qt/i2pd_qt/android/AndroidManifest.xml b/qt/i2pd_qt/android/AndroidManifest.xml
index e6eb171f..1a38f109 100644
--- a/qt/i2pd_qt/android/AndroidManifest.xml
+++ b/qt/i2pd_qt/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.14.0" android:versionCode="2" android:installLocation="auto">
+<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.15.0" android:versionCode="2" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="23"/>
         <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <!-- <application android:hardwareAccelerated="true" -->