diff --git a/debian/patches/0002-jbigi-soname.patch b/debian/patches/0002-jbigi-soname.patch index ff1c533bb..b9ab384c0 100644 --- a/debian/patches/0002-jbigi-soname.patch +++ b/debian/patches/0002-jbigi-soname.patch @@ -13,7 +13,7 @@ diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh index 1521392..6a89c92 100755 --- a/core/c/jbigi/build_jbigi.sh +++ b/core/c/jbigi/build_jbigi.sh -@@ -43,7 +43,7 @@ +@@ -68,7 +68,7 @@ BUILD_OS="linux" fi COMPILEFLAGS="-fPIC -Wall $CFLAGS" @@ -22,7 +22,7 @@ index 1521392..6a89c92 100755 LINKFLAGS="-shared -Wl,-soname,libjbigi.so" LIBFILE="libjbigi.so";; *) -@@ -64,8 +64,8 @@ +@@ -89,8 +89,8 @@ [ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS" echo "Compiling C code..." diff --git a/debian/patches/0003-rename-jcpuid.patch b/debian/patches/0003-rename-jcpuid.patch index 3a7e52fa3..336a70d1e 100644 --- a/debian/patches/0003-rename-jcpuid.patch +++ b/debian/patches/0003-rename-jcpuid.patch @@ -10,7 +10,7 @@ diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh index 5b63c6c..f39148d 100755 --- a/core/c/jcpuid/build.sh +++ b/core/c/jcpuid/build.sh -@@ -104,12 +104,8 @@ +@@ -125,12 +125,8 @@ exit 1 fi diff --git a/history.txt b/history.txt index 76bd88307..31b91e116 100644 --- a/history.txt +++ b/history.txt @@ -1,8 +1,42 @@ +2016-05-07 zzz + * Build: + - Add DTG to updater + - Fix and bundle DTG license info + - Remove jstl.jar and standard.jar from updater, + last changed in 0.9 + - Fix bundling of Tomcat license info + - Add back the old way to build bundles for gettext < 0.19 + * Console: + - Change to new DTG constructor + - Don't attempt to start systray or DTG when running as a service + - Show systray controls for all OSes on /configservice + - Implement backend for systray control + * DesktopGui: + - Implement second TrayManager menu implementation in Swing. + - Use Swing except on Windows + - Hide restart menu items if no wrapper + - Add graceful restart and shutdown menu items + - Add basic adjustment of menu based on shutdown state + - Disable wrapper notification for now + - Remove Swing DesktopguiConfigurationFrame, + move to a submenu. + - Remove LookAndFeel setting + - Make Main class a RouterApp + - Remove all static log, context, and instance fields + - Remove unused ConfigurationManager class + - Translate tooltip, disable tooltip on linux + - Use safer exec call to start i2p + - Remove all images, use itoopie + - Don't start spinner thread in router context + - Handle various startup errors better + - Synchs, finals, javadocs, cleanups + 2016-05-04 zzz + * i2prouter: Set JAVA_HOME correctly on Mac OS X 10.5 and later (ticket #1783) * Utils: Fix bug in periodic timers triggered by a backwards clock shift, caused graphs to be blank and various router, streaming, and i2ptunnel - degradations over time (ticket #1776) + degradations over time (tickets #1702, #1776) * Wrapper: Update to wrapper 3.5.29, except for Windows. Fixes wrapper failure on FreeBSD 10 (ticket #1118) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 7ca1a3ec2..5a58b19bc 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 10; + public final static long BUILD = 11; /** for example "-test" */ public final static String EXTRA = "";