diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2017-02-23 09:46:38 +0100 |
---|---|---|
committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-02-23 14:34:41 +0000 |
commit | be2a7cd17b01ce42d5b14c138399953330e1dd08 (patch) | |
tree | 2554a3ee1432b77646fad083d454206254c0b72c | |
parent | 210b21cf903da53b91cf8143be9a5be295139f17 (diff) |
Packaging: post 17.01 cleanup
Change-Id: I065693e37a8aa991c33805d36d681bf5fbecf9db
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rwxr-xr-x | packaging/deb/common/prepare.sh | 4 | ||||
-rw-r--r-- | packaging/deb/trusty/debian/control | 6 | ||||
-rw-r--r-- | packaging/deb/xenial/debian/control | 6 | ||||
-rwxr-xr-x | packaging/rpm/release | 5 |
4 files changed, 13 insertions, 8 deletions
diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh index 1009fc942..571f30ada 100755 --- a/packaging/deb/common/prepare.sh +++ b/packaging/deb/common/prepare.sh @@ -11,7 +11,7 @@ BUILD_DIR=${SOURCE_DIR}/honeycomb-${VERSION} # Copy and unpack the archive with vpp-integration distribution ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/ -ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-1.17.04-SNAPSHOT-hc.tar.gz +ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz cp ${ARCHIVE} ${SOURCE_DIR} ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/ @@ -33,7 +33,7 @@ honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low * 17.04 release - -- mmarsale <mmarsale@cisco.com> Mon, 22 Aug 2016 09:41:37 +0200 + -- mgradzki <mgradzki@cisco.com> Mon, 23 Feb 2016 09:41:37 +0200 EOT # Install instructions diff --git a/packaging/deb/trusty/debian/control b/packaging/deb/trusty/debian/control index 5e893cdde..860683138 100644 --- a/packaging/deb/trusty/debian/control +++ b/packaging/deb/trusty/debian/control @@ -1,11 +1,11 @@ Source: honeycomb Section: misc Priority: optional -Maintainer: fd.io/honeycomb <honeycomb-dev@lists.fd.io> +Maintainer: fd.io/hc2vpp <hc2vpp@lists.fd.io> Build-Depends: debhelper (>= 9) Standards-Version: 3.9.6 -Homepage: https://wiki.fd.io/view/Honeycomb -Vcs-Browser: https://git.fd.io/cgit/honeycomb/tree/ +Homepage: https://wiki.fd.io/view/Hc2vpp +Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/ Package: honeycomb Architecture: all diff --git a/packaging/deb/xenial/debian/control b/packaging/deb/xenial/debian/control index f239f2fcb..5a66f9cfe 100644 --- a/packaging/deb/xenial/debian/control +++ b/packaging/deb/xenial/debian/control @@ -1,11 +1,11 @@ Source: honeycomb Section: misc Priority: optional -Maintainer: fd.io/honeycomb <honeycomb-dev@lists.fd.io> +Maintainer: fd.io/hc2vpp <hc2vpp@lists.fd.io> Build-Depends: debhelper (>= 9), dh-systemd Standards-Version: 3.9.6 -Homepage: https://wiki.fd.io/view/Honeycomb -Vcs-Browser: https://git.fd.io/cgit/honeycomb/tree/ +Homepage: https://wiki.fd.io/view/Hc2vpp +Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/ Package: honeycomb Architecture: all diff --git a/packaging/rpm/release b/packaging/rpm/release index 751ee04f2..4de82e41c 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,4 +1,9 @@ #!/bin/bash +# release version +# echo RELEASE +# +# snapshot version +# # Increasing the build number by a certain margin. # Necessary due to honeycomb - hc2vpp split. Build_number counter was reset # rewriting older packages |