On 07/05/2017 07:42 AM, Cyril Brulebois wrote:
>> As usual, please provide a debdiff of the proposed source package,
>> built and tested on stable, so that it can be confirmed.
>
> Yeah, following the usual procedure, that has existed for years, *will*
> save everyone time. Please do that.
Sorry for this, my bad. Debdiff attached for version 1.20~deb9u1 built
on a stretch sbuild chroot. The built package is available here:
http://sid.gplhost.com/stretch-proposed-updates/openstack-debian-images/
Cheers,
Thomas Goirand (zigo)
diff --git a/build-openstack-debian-image b/build-openstack-debian-image
index 3a8d7d6..f2f300d 100755
--- a/build-openstack-debian-image
+++ b/build-openstack-debian-image
@@ -484,7 +484,7 @@ echo "debian.example.com" >${MOUNT_DIR}/etc/hostname
echo "deb ${SOURCE_LIST_MIRROR} ${RELEASE} main
deb-src ${SOURCE_LIST_MIRROR} ${RELEASE} main"
>${MOUNT_DIR}/etc/apt/sources.list
-if [ "${RELEASE}" = "wheezy" ] || [ "${RELEASE}" = "jessie" ] ; then
+if [ "${RELEASE}" != "sid" ] && [ "${RELEASE}" != "unstable" ] ; then
echo "deb ${SOURCE_LIST_MIRROR} ${RELEASE}-updates main
deb-src ${SOURCE_LIST_MIRROR} ${RELEASE}-updates main
deb http://security.debian.org/ ${RELEASE}/updates main
diff --git a/debian/changelog b/debian/changelog
index 5008751..4d6cd28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openstack-debian-images (1.20~deb9u1) stretch-proposed-updates; urgency=medium
+
+ * Also add security updates for non wheezy/jessie.
+ * Update debian/gbp.conf to use debian/stretch as packaging branch.
+
+ -- Thomas Goirand <z...@debian.org> Fri, 23 Jun 2017 17:02:30 +0200
+
openstack-debian-images (1.19) unstable; urgency=medium
* Add --no-nvram when calling grub-install to avoid breaking UEFI boot on the
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 80d00a7..080ecdd 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/unstable
+debian-branch = debian/stretch
[buildpackage]
export-dir = ../build-area/
