diff options
Diffstat (limited to 'packages/google-compute-engine/packaging')
6 files changed, 18 insertions, 7 deletions
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} |