Packaging: post 17.01 cleanup

Change-Id: I065693e37a8aa991c33805d36d681bf5fbecf9db
Signed-off-by: Marek Gradzki <[email protected]>

diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index 1009fc9..571f30a 100755 (executable)
--- 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 <[email protected]>  Mon, 22 Aug 2016 09:41:37 +0200
+ -- mgradzki <[email protected]>  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 5e893cd..8606831 100644 (file)
--- 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 f239f2f..5a66f9c 100644 (file)
--- 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 751ee04..4de82e4 100755 (executable)
--- 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