Merge branch '7.0.1'

Author: Szilárd Pfeiffer

.circleci/config.yml

@@ -4,9 +4,9 @@ jobs:
     docker:
       - image: balasys/zorpgpl-circleci:7.0
     environment:
-      - PACKAGE: zorp
-      - OBS_PROJECT_URL: security:/Zorp:/7:/0:/1:/alpha2
-      - OBS_PROJECT_DIR: security:Zorp:7:0:1:alpha2/zorp
+      - PACKAGE: "zorp"
+      - OBS_PROJECT_URL: "security:/Zorp:/7:/0:/1"
+      - OBS_PROJECT_DIR: "security:Zorp:7:0:1/zorp"
     working_directory: ~/zorp
     steps:
       - checkout
@@ -16,7 +16,6 @@ jobs:
       - run: source ci/build.sh
       - run: source ci/obs_prepare.sh
       - run: source ci/obs_commit.sh
-
 workflows:
   version: 2
   build_and_test:

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "ci"]
 	path = ci
 	url = [email protected]:Balasys/ci-scripts.git
-	branch = 7.0.1-alpha1
+	branch = 7.0

VERSION

@@ -1 +1 @@
-7.0.1~alpha2
+7.0.1

configure.ac

@@ -21,9 +21,9 @@ dnl ***************************************************************************
 dnl Dependencies
 
 GLIB_MIN_VERSION="2.32.0"
-ZORPLL_MIN_VERSION="7.0.1.0~alpha0"
-ZORPLIC_MIN_VERSION="7.0.1.0~alpha0"
-ZORPMISC_MIN_VERSION="7.0.1.0~alpha0"
+ZORPLL_MIN_VERSION="7.0.1.0"
+ZORPLIC_MIN_VERSION="7.0.1.0"
+ZORPMISC_MIN_VERSION="7.0.1.0"
 OPENSSL_MIN_VERSION=1.1.0
 OPENSSL_MAX_VERSION=1.1.2
 PYTHON_MIN_VERSION="2.7"

debian/changelog

@@ -1,5 +1,5 @@
-zorp (7.0.1~alpha2) zorp70gpl; urgency=low
+zorp (7.0.1) zorp70gpl; urgency=low
 
   * New upstream version.
 
- -- BalaSys Development Team <[email protected]>  Mon, 04 Feb 2019 20:19:30 +0100
+ -- BalaSys Development Team <[email protected]>  Wed, 06 Feb 2019 10:19:47 +0100

debian/control

@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: BalaSys Development Team <[email protected]>
 Standards-Version: 3.9.0
-Build-Depends: libpython2.7-dev, libzorpll7.0-dev (>=7.0.1.0~alpha0), gperf, debhelper (>= 9), dh-autoreconf, python-dnspython, python-radix, autoconf, autoconf-archive, automake, libtool, libboost-test-dev, python-openssl, python-netaddr, xsltproc, docbook-xsl, dh-systemd
+Build-Depends: libpython2.7-dev, libzorpll7.0-dev (>=7.0.1.0), gperf, debhelper (>= 9), dh-autoreconf, python-dnspython, python-radix, autoconf, autoconf-archive, automake, libtool, libboost-test-dev, python-openssl, python-netaddr, xsltproc, docbook-xsl, dh-systemd
 
 Package: zorp
 Section: net

dist.conf

@@ -1,5 +1,5 @@
 # default environment parameters
 RELEASE_TAG=${RELEASE_TAG:-zorp70gpl}
 SNAPSHOT_VERSION=${SNAPSHOT_VERSION:-}
-SOURCE_REVISION=${SOURCE_REVISION:-ssh+git://[email protected]/var/scm/git/zorp/zorp-core#HEAD_detached_at_v7.0.1-alpha2#3d4c18e465209ab57a9f82be63573b60d1bb3864}
+SOURCE_REVISION=${SOURCE_REVISION:-ssh+git://[email protected]/var/scm/git/zorp/zorp-core#HEAD_detached_at_v7.0.1#e15ef80896863b6c72428cca7cb5ef36707355c3}
 ZORP_PACKAGE_LICENSE=${ZORP_PACKAGE_LICENSE:-gpl}

rpm/zorp-7_0-1.spec

@@ -1,6 +1,6 @@
 Name:			zorp
-Version:		7.0.1~alpha2
-Release:		0.1%{?dist}
+Version:		7.0.1
+Release:		1%{?dist}
 URL:			https://balasys.github.io/zorp/
 %if 0%{?fedora}
 %else
@@ -353,6 +353,8 @@ Standalone daemon that handles zones and updates dynamic zones.
 
 
 %changelog
+* Wed Dec 5 2018 Balasys Development Team <[email protected]> - 7.0.1-1
+  - New upstream release 7.0.1
 * Wed Nov 21 2018 Balasys Development Team <[email protected]> - 7.0.1-0.2
   - New upstream release 7.0.1~alpha2
 * Thu May 17 2018 Balasys Development Team <[email protected]> - 7.0.1-0.1