New package versioning (#794)

21 files changed, 55 insertions, 19 deletions

diff --git a/packages/gce-disk-expand/packaging/debian/changelog b/packages/gce-disk-expand/packaging/debian/changelog
index b93feb2..6df9156 100644
--- a/packages/gce-disk-expand/packaging/debian/changelog
+++ b/packages/gce-disk-expand/packaging/debian/changelog
@@ -1,3 +1,9 @@
+gce-disk-expand (1:20190708.00-g1) stable; urgency=medium
+
+  * Update disk expand to fix bugs with GPT.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 08 Jul 2019 10:20:47 -0700
+
 gce-disk-expand (2.0.0-1) stable; urgency=low
 
   * Initial debian package import.
diff --git a/packages/gce-disk-expand/packaging/gce-disk-expand.spec b/packages/gce-disk-expand/packaging/gce-disk-expand.spec
index 7ed9682..409d898 100644
--- a/packages/gce-disk-expand/packaging/gce-disk-expand.spec
+++ b/packages/gce-disk-expand/packaging/gce-disk-expand.spec
@@ -13,8 +13,9 @@
 # limitations under the License.
 Name: gce-disk-expand
 Summary: Google Compute Engine root disk expansion module
+Epoch: 1
 Version: %{_version}
-Release: 1
+Release: g1
 License: Apache Software License
 Group: System Environment/Base
 URL: https://github.com/GoogleCloudPlatform/compute-image-packages
diff --git a/packages/gce-disk-expand/packaging/setup_deb.sh b/packages/gce-disk-expand/packaging/setup_deb.sh
index ca5be92..cc81711 100755
--- a/packages/gce-disk-expand/packaging/setup_deb.sh
+++ b/packages/gce-disk-expand/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="gce-disk-expand"
-VERSION="2.0.0"
+VERSION="20190708.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then
diff --git a/packages/gce-disk-expand/packaging/setup_rpm.sh b/packages/gce-disk-expand/packaging/setup_rpm.sh
index ad264e0..1bc6c38 100755
--- a/packages/gce-disk-expand/packaging/setup_rpm.sh
+++ b/packages/gce-disk-expand/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="gce-disk-expand"
-VERSION="2.0.1"
+VERSION="20190708.00"
 
 rpm_working_dir=/tmp/rpmpackage/
 working_dir=${PWD}
diff --git a/packages/google-compute-engine-oslogin/packaging/debian/changelog b/packages/google-compute-engine-oslogin/packaging/debian/changelog
index a09513c..d00ead0 100644
--- a/packages/google-compute-engine-oslogin/packaging/debian/changelog
+++ b/packages/google-compute-engine-oslogin/packaging/debian/changelog
@@ -1,3 +1,10 @@
+google-compute-engine-oslogin (1:20190708.00-g1) stable; urgency=medium
+
+  * Restructure Makefile and Debian control files.
+  * Add man pages.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 08 Jul 2019 10:20:01 -0700
+
 google-compute-engine-oslogin (1.5.3-1) unstable; urgency=low
 
   * Update OS Login control file for FreeBSD support.
diff --git a/packages/google-compute-engine-oslogin/packaging/google-compute-engine-oslogin.spec b/packages/google-compute-engine-oslogin/packaging/google-compute-engine-oslogin.spec
index f93dfff..d9b67bd 100644
--- a/packages/google-compute-engine-oslogin/packaging/google-compute-engine-oslogin.spec
+++ b/packages/google-compute-engine-oslogin/packaging/google-compute-engine-oslogin.spec
@@ -18,8 +18,9 @@
 %endif
 
 Name:           google-compute-engine-oslogin
+Epoch:          1
 Version:        %{_version}
-Release:        1%{?dist}
+Release:        g1%{?dist}
 Summary:        OS Login Functionality for Google Compute Engine
 
 License:        ASL 2.0
diff --git a/packages/google-compute-engine-oslogin/packaging/setup_deb.sh b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh
index 4d64ca7..58e3649 100755
--- a/packages/google-compute-engine-oslogin/packaging/setup_deb.sh
+++ b/packages/google-compute-engine-oslogin/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine-oslogin"
-VERSION="1.5.3"
+VERSION="20190708.00"
 
 DEB=$(cut -d. -f1 </etc/debian_version)
 if [[ -z $DEB ]]; then
diff --git a/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh
index 957257f..56e5c52 100755
--- a/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh
+++ b/packages/google-compute-engine-oslogin/packaging/setup_rpm.sh
@@ -15,7 +15,7 @@
 
 
 NAME="google-compute-engine-oslogin"
-VERSION="1.5.3"
+VERSION="20190708.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}
diff --git a/packages/google-compute-engine-oslogin/src/Makefile b/packages/google-compute-engine-oslogin/src/Makefile
index 46f93e9..96ee104 100644
--- a/packages/google-compute-engine-oslogin/src/Makefile
+++ b/packages/google-compute-engine-oslogin/src/Makefile
@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 TOPDIR = $(realpath ..)
 
-VERSION = 1.5.3
+VERSION = 20190708.00
 
 CPPFLAGS = -Iinclude -I/usr/include/json-c
 CXXFLAGS = -fPIC -Wall -g
diff --git a/packages/google-compute-engine/packaging/debian/changelog b/packages/google-compute-engine/packaging/debian/changelog
index 27d94df..759d2b2 100644
--- a/packages/google-compute-engine/packaging/debian/changelog
+++ b/packages/google-compute-engine/packaging/debian/changelog
@@ -1,3 +1,11 @@
+google-compute-engine (1:20190708.00-g1) stable; urgency=medium
+
+  * Drop unnecessary build and package dependencies.
+  * Log to journal and console directly from systemd service files.
+  * Update Debian build dependencies.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 08 Jul 2019 10:20:15 -0700
+
 google-compute-engine (2.8.16-1) stable; urgency=low
 
   * Fix instance setup in Python 3 environments.
diff --git a/packages/google-compute-engine/packaging/debian/control b/packages/google-compute-engine/packaging/debian/control
index 1c39b9f..4b670f0 100644
--- a/packages/google-compute-engine/packaging/debian/control
+++ b/packages/google-compute-engine/packaging/debian/control
@@ -9,6 +9,7 @@ Homepage: https://github.com/GoogleCloudPlatform/compute-image-packages
 Package: google-compute-engine
 Architecture: all
 Depends: google-compute-engine-oslogin,
+         python-google-compute-engine,
          python3-google-compute-engine,
          ${misc:Depends},
          systemd
diff --git a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec
index f41808d..5555b20 100644
--- a/packages/google-compute-engine/packaging/google-compute-engine-el6.spec
+++ b/packages/google-compute-engine/packaging/google-compute-engine-el6.spec
@@ -13,15 +13,16 @@
 # limitations under the License.
 
 Name: google-compute-engine
+Epoch: 1
 Version: %{_version}
-Release: 1.el6
+Release: g1.el6
 Summary: Google Compute Engine guest environment.
 License: ASL 2.0
 Url: https://github.com/GoogleCloudPlatform/compute-image-packages
 Source0: %{name}_%{version}.orig.tar.gz
 Requires: curl
 Requires: google-compute-engine-oslogin
-Requires: python-google-compute-engine = %{version}
+Requires: python-google-compute-engine = 1:%{version}
 Requires: rsyslog
 # Old packages.
 Obsoletes: google-compute-engine-init
diff --git a/packages/google-compute-engine/packaging/google-compute-engine.spec b/packages/google-compute-engine/packaging/google-compute-engine.spec
index aba148d..1ec37dc 100644
--- a/packages/google-compute-engine/packaging/google-compute-engine.spec
+++ b/packages/google-compute-engine/packaging/google-compute-engine.spec
@@ -18,8 +18,9 @@
 %endif
 
 Name: google-compute-engine
+Epoch: 1
 Version: %{_version}
-Release: 1%{?dist}
+Release: g1%{?dist}
 Summary: Google Compute Engine guest environment.
 License: ASL 2.0
 Url: https://github.com/GoogleCloudPlatform/compute-image-packages
@@ -27,9 +28,9 @@ Source0: %{name}_%{version}.orig.tar.gz
 Requires: curl
 Requires: google-compute-engine-oslogin
 %if 0%{?rhel} == 8
-Requires: python3-google-compute-engine = %{version}
+Requires: python3-google-compute-engine = 1:%{version}
 %else
-Requires: python-google-compute-engine = %{version}
+Requires: python-google-compute-engine = 1:%{version}
 %endif
 Requires: rsyslog
 
diff --git a/packages/google-compute-engine/packaging/setup_deb.sh b/packages/google-compute-engine/packaging/setup_deb.sh
index b03d297..ee4f802 100755
--- a/packages/google-compute-engine/packaging/setup_deb.sh
+++ b/packages/google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="2.8.16"
+VERSION="20190708.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then
diff --git a/packages/google-compute-engine/packaging/setup_rpm.sh b/packages/google-compute-engine/packaging/setup_rpm.sh
index 8d26b4e..525c378 100755
--- a/packages/google-compute-engine/packaging/setup_rpm.sh
+++ b/packages/google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="google-compute-engine"
-VERSION="2.8.16"
+VERSION="20190708.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}
diff --git a/packages/python-google-compute-engine/packaging/debian/changelog b/packages/python-google-compute-engine/packaging/debian/changelog
index 931e3d7..d3b09c7 100644
--- a/packages/python-google-compute-engine/packaging/debian/changelog
+++ b/packages/python-google-compute-engine/packaging/debian/changelog
@@ -1,3 +1,11 @@
+python-google-compute-engine (1:20190708.00-g1) stable; urgency=medium
+
+  * Move Debian entry point scripts to python3.
+  * Update Debian build dependencies.
+  * Drop unnecessary build and package dependencies.
+
+ -- Google Cloud Team <gc-team@google.com>  Mon, 08 Jul 2019 10:20:44 -0700
+
 python-google-compute-engine (2.8.16-1) stable; urgency=low
 
   * Fix guest attributes flow in Python 3.
diff --git a/packages/python-google-compute-engine/packaging/python-google-compute-engine.spec b/packages/python-google-compute-engine/packaging/python-google-compute-engine.spec
index f36bed3..1984cec 100644
--- a/packages/python-google-compute-engine/packaging/python-google-compute-engine.spec
+++ b/packages/python-google-compute-engine/packaging/python-google-compute-engine.spec
@@ -18,8 +18,9 @@
 %endif
 
 Name: python-google-compute-engine
+Epoch: 1
 Version: %{_version}
-Release: 1%{?dist}
+Release: g1%{?dist}
 Summary: Google Compute Engine python library
 License: ASL 2.0
 Url: https://github.com/GoogleCloudPlatform/compute-image-packages
diff --git a/packages/python-google-compute-engine/packaging/python3-google-compute-engine.spec b/packages/python-google-compute-engine/packaging/python3-google-compute-engine.spec
index 6bf3291..69257d9 100644
--- a/packages/python-google-compute-engine/packaging/python3-google-compute-engine.spec
+++ b/packages/python-google-compute-engine/packaging/python3-google-compute-engine.spec
@@ -13,8 +13,9 @@
 # limitations under the License.
 
 Name: python3-google-compute-engine
+Epoch: 1
 Version: %{_version}
-Release: 1%{?dist}
+Release: g1%{?dist}
 Summary: Google Compute Engine python3 library
 License: ASL 2.0
 Url: https://github.com/GoogleCloudPlatform/compute-image-packages
diff --git a/packages/python-google-compute-engine/packaging/setup_deb.sh b/packages/python-google-compute-engine/packaging/setup_deb.sh
index 7fc1b7a..6bd52bb 100755
--- a/packages/python-google-compute-engine/packaging/setup_deb.sh
+++ b/packages/python-google-compute-engine/packaging/setup_deb.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="2.8.16"
+VERSION="20190708.00"
 
 working_dir=${PWD}
 if [[ $(basename "$working_dir") != $NAME ]]; then
diff --git a/packages/python-google-compute-engine/packaging/setup_rpm.sh b/packages/python-google-compute-engine/packaging/setup_rpm.sh
index c6c6d75..1a3d020 100755
--- a/packages/python-google-compute-engine/packaging/setup_rpm.sh
+++ b/packages/python-google-compute-engine/packaging/setup_rpm.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 NAME="python-google-compute-engine"
-VERSION="2.8.16"
+VERSION="20190708.00"
 
 rpm_working_dir=/tmp/rpmpackage/${NAME}-${VERSION}
 working_dir=${PWD}
diff --git a/packages/python-google-compute-engine/setup.py b/packages/python-google-compute-engine/setup.py
index 87bf2db..1df3601 100755
--- a/packages/python-google-compute-engine/setup.py
+++ b/packages/python-google-compute-engine/setup.py
@@ -37,7 +37,7 @@ setuptools.setup(
     name='google-compute-engine',
     packages=setuptools.find_packages(),
     url='https://github.com/GoogleCloudPlatform/compute-image-packages',
-    version='2.8.16',
+    version='20190708.00',
     # Entry points create scripts in /usr/bin that call a function.
     entry_points={
         'console_scripts': [