Merge branch 'feature/upstream' into develop

7 files changed, 27 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 32341e9..be68f7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
 install:
   - curl -L https://github.com/nukedzn/psocksxx/releases/download/v1.0.0/psocksxx-1.0.0.tar.gz | tar -zx -C /tmp
   - cd /tmp/psocksxx-* && ./configure --prefix=/tmp/root && make && make install
-  - if [ $TRAVIS_OS_NAME == linux ]; then curl -L http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz | tar -zx -C /tmp; fi
+  - if [ $TRAVIS_OS_NAME == linux ]; then curl -L http://www.hyperrealm.com/packages/libconfig-1.4.10.tar.gz | tar -zx -C /tmp; fi
   - if [ $TRAVIS_OS_NAME == linux ]; then cd /tmp/libconfig-* && ./configure --prefix=/tmp/root && make && make install; fi
   - cd ${TRAVIS_BUILD_DIR}
 
diff --git a/changelog b/changelog
index 518c4fb..20d6aad 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+1.0.2 - 19th November 2017
+	*    Fix broken v1.0.1 release
+
+1.0.1 - 19th November 2017
+	*    Make builds reproducible (https://bugs.debian.org/882112)
+
 1.0.0 - 25th November 2015
 	*   [New] Configurable communication (socket) timeouts
 	*   [New] Support for persistent connections
diff --git a/configure.ac b/configure.ac
index b88fc75..d972716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([bitz-server], [1.0.0], [https://github.com/uditha-atukorala/bitz-server/issues])
+AC_INIT([bitz-server], [1.0.2], [https://github.com/uditha-atukorala/bitz-server/issues])
 AC_CONFIG_AUX_DIR([aux-build])
 AC_CONFIG_MACRO_DIR([aux-build/m4])
 AC_CONFIG_HEADERS([include/config.h])
diff --git a/debian/changelog b/debian/changelog
index 6b9c37a..143891d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+bitz-server (1.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+    - Make builds reproducible (Closes: #882112).
+  * Change to my new mail address:
+    - debian/control,
+    - debian/copyright
+  * debian/copyright: Bump years to 2017.
+  * Declare compliance with Debian Policy 4.1.2.0. (No changes needed).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 01 Dec 2017 13:25:21 +0100
+
 bitz-server (1.0.0-5) unstable; urgency=medium
 
   * Renew symbols files.
diff --git a/debian/control b/debian/control
index fa5188a..843180f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: bitz-server
 Section: net
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Uploaders: Uditha Atukorala <ua@nuked.zone>
 Build-Depends:
  debhelper (>= 10),
@@ -13,7 +13,7 @@ Build-Depends:
  libpython-dev
 Build-Depends-Indep:
  doxygen
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2.0
 Homepage: https://github.com/uditha-atukorala/bitz-server
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/bitz-server.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/bitz-server.git
diff --git a/debian/copyright b/debian/copyright
index d26971a..443ff37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,13 +3,13 @@ Upstream-Name: bitz-server
 Source: https://github.com/uditha-atukorala/bitz-server
 
 Files: *
-Copyright: 2012-2014 Uditha Atukorala <ua@nuked.zone>
+Copyright: 2012-2017 Uditha Atukorala <ua@nuked.zone>
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
- 
+
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in
index 73bd0d1..6104f0c 100644
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg.in
@@ -17,7 +17,7 @@ REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 STRIP_FROM_PATH        =
 STRIP_FROM_INC_PATH    =
 SHORT_NAMES            = NO
@@ -102,7 +102,7 @@ INPUT                  = @top_srcdir@
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = YES
-EXCLUDE                = @top_srcdir@/doc
+EXCLUDE                = @top_srcdir@/doc @top_srcdir@/README.md
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXCLUDE_SYMBOLS        =