Bug#865270: stretch-pu: package osinfo-db/0.20170225-3+deb9u1
Hi Cyril,
On Sun, Jun 25, 2017 at 11:30:40PM +0200, Cyril Brulebois wrote:
> Hi Guido,
>
> Guido Günther <agx@sigxcpu.org> (2017-06-20):
> > this update makes stretch DVDs detectable by libosinfo (used by
> > virt-manager, gnome-boxes, ...) and adjusts the installer links to the
> > current locations.
>
> You can't upload to stretch with a version higher than the one in
> unstable (0.20170225-3+deb9u1). You seem to have wanted to backport
> latest unstable to stretch, in which case, you want 0.20170225-3~deb9u1.
Argh, my bad, sorry.
> (Putting aside my release assistant hat for a minute.)
>
> I'm a bit surprised by the asymmetry of the diff: I would have expected
> RCs to be replaced by final images in a comparable number. But I suspect
> this might be due to not spending time on feeding links to all images at
> first? AFAICT we use a very similar setup between RCs and final
> builds,
This is mostly caused by a rename in the series file:
-Add-Debian-Stretch-RCs.patch
+Add-Debian-Stretch.patch
> so maybe having had all links from the beginning would have helped
> spotting the issue filed as #864923?
That was caused by #858031 and me not getting around to verify
everything before the release.
>
> > It also updates the Jessie ones now that things moved for stretch.
>
> Speaking of which, will those still work when 8.9 is out?
Yes, since they're on archive these will stay stable although users will
get a slightly outdated version. Due to #813797 there's little we can do
at the moment within libosinfo itself. Either fix the former on the cd
generating end or use the reflection service:
http://cdr.debian.net/debian-cd/8/i386/iso-dvd
http://cdr.debian.net/debian-cd/9/i386/iso-dvd
I'm tracking the changes to the Debian URLs upstream and hope that we
can get a newer osinfo-db version in from time to time so people not get
recent URLs for Debian itself but also for other linux distros and
non-free OSes.
>
>
> Anyway, back to business: I'd like to see an updated debdiff with a
> proper version number.
Attached.
-- Guido
diff --git a/debian/changelog b/debian/changelog
index 9bd6632..d5134fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+osinfo-db (0.20170225-3~deb9u1) stretch; urgency=medium
+
+ * [17d85a0] Adjust gbp.conf for stretch
+
+ -- Guido Günther <agx@sigxcpu.org> Tue, 20 Jun 2017 08:26:19 +0200
+
+osinfo-db (0.20170225-3) unstable; urgency=medium
+
+ * [c058963] Update Jessie DVD links.
+ * [745d2f5] Add Debian Stretch (Closes: #864923)
+
+ -- Guido Günther <agx@sigxcpu.org> Mon, 19 Jun 2017 19:34:55 +0200
+
osinfo-db (0.20170225-2) unstable; urgency=medium
* [7016785] Fix Stretch URL for i386.
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 760033d..a57e359 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
[DEFAULT]
upstream-branch=upstream/latest
-debian-branch=debian/sid
+debian-branch=debian/stretch
[pq]
patch-numbers = False
diff --git a/debian/patches/Add-Debian-Stretch-RCs.patch b/debian/patches/Add-Debian-Stretch-RCs.patch
deleted file mode 100644
index 620e5b2..0000000
--- a/debian/patches/Add-Debian-Stretch-RCs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Mon, 13 Mar 2017 19:20:33 +0100
-Subject: Add Debian Stretch RCs
-
-Closes: #856667
----
- data/os/debian.org/debian-9.xml.in | 64 +++++++++++++++++++++++++++++
- debian/patches/Add-Debian-Stretch-RCs.patch | 4 +-
- 2 files changed, 66 insertions(+), 2 deletions(-)
- create mode 100644 data/os/debian.org/debian-9.xml.in
-
-diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
-new file mode 100644
-index 0000000..4200f45
---- /dev/null
-+++ b/data/os/debian.org/debian-9.xml.in
-@@ -0,0 +1,64 @@
-+<libosinfo version="0.0.1">
-+<!-- Licensed under the GNU General Public License version 2 or later.
-+ See http://www.gnu.org/licenses/ for a copy of the license text -->
-+ <os id="http://debian.org/debian/9";>
-+ <short-id>debian9</short-id>
-+ <short-id>debianstretch</short-id>
-+ <_name>Debian Stretch</_name>
-+ <version>9</version>
-+ <_vendor>Debian Project</_vendor>
-+ <family>linux</family>
-+ <distro>debian</distro>
-+ <upgrades id="http://debian.org/debian/8"/>
-+ <derives-from id="http://debian.org/debian/8"/>
-+
-+ <release-date>2017-02-02</release-date>
-+
-+ <devices>
-+ <device id="http://pcisig.com/pci/1af4/1041"/>
-+ <device id="http://pcisig.com/pci/1af4/1042"/>
-+ <device id="http://pcisig.com/pci/1af4/1043"/>
-+ <device id="http://pcisig.com/pci/1af4/1044"/>
-+ <device id="http://pcisig.com/pci/1af4/1045"/>
-+ <device id="http://pcisig.com/pci/1af4/1048"/>
-+ <device id="http://pcisig.com/pci/1af4/1049"/>
-+ <device id="http://pcisig.com/pci/1af4/1052"/>
-+ </devices>
-+
-+ <resources arch="all">
-+ <minimum>
-+ <cpu>1000000000</cpu>
-+ <n-cpus>1</n-cpus>
-+ <ram>1073741824</ram>
-+ <storage>10737418240</storage>
-+ </minimum>
-+ <recommended>
-+ <cpu>1000000000</cpu>
-+ <ram>1073741824</ram>
-+ <storage>21474836480</storage>
-+ </recommended>
-+ </resources>
-+
-+ <media arch="i686">
-+ <url>http://cdimage.debian.org/cdimage/stretch_di_rc3/i386/iso-dvd/debian-stretch-DI-rc3-i386-DVD-1.iso</url>
-+ <iso>
-+ <volume-id>Debian stretch-DI-rc\d i386 1</volume-id>
-+ </iso>
-+ <kernel>install.386/vmlinuz</kernel>
-+ <initrd>install.386/initrd.gz</initrd>
-+ </media>
-+ <media arch="x86_64">
-+ <url>http://cdimage.debian.org/cdimage/stretch_di_rc3/amd64/iso-dvd/debian-stretch-DI-rc3-amd64-DVD-1.iso</url>
-+ <iso>
-+ <volume-id>Debian stretch-DI-rc\d amd64 1</volume-id>
-+ </iso>
-+ <kernel>install.amd/vmlinuz</kernel>
-+ <initrd>install.amd/initrd.gz</initrd>
-+ </media>
-+
-+ <installer>
-+ <script id='http://debian.org/debian/preseed/jeos'/>
-+ <script id='http://debian.org/debian/preseed/desktop'/>
-+ </installer>
-+ </os>
-+</libosinfo>
diff --git a/debian/patches/Add-Debian-Stretch.patch b/debian/patches/Add-Debian-Stretch.patch
new file mode 100644
index 0000000..f03bd32
--- /dev/null
+++ b/debian/patches/Add-Debian-Stretch.patch
@@ -0,0 +1,145 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Mon, 13 Mar 2017 19:20:33 +0100
+Subject: Add Debian Stretch
+
+---
+ data/os/debian.org/debian-9.xml.in | 130 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 130 insertions(+)
+ create mode 100644 data/os/debian.org/debian-9.xml.in
+
+diff --git a/data/os/debian.org/debian-9.xml.in b/data/os/debian.org/debian-9.xml.in
+new file mode 100644
+index 0000000..e0b9085
+--- /dev/null
++++ b/data/os/debian.org/debian-9.xml.in
+@@ -0,0 +1,130 @@
++<libosinfo version="0.0.1">
++<!-- Licensed under the GNU General Public License version 2 or later.
++ See http://www.gnu.org/licenses/ for a copy of the license text -->
++ <os id="http://debian.org/debian/9";>
++ <short-id>debian9</short-id>
++ <short-id>debianstretch</short-id>
++ <_name>Debian Stretch</_name>
++ <version>9</version>
++ <_vendor>Debian Project</_vendor>
++ <family>linux</family>
++ <distro>debian</distro>
++ <upgrades id="http://debian.org/debian/8"/>
++ <derives-from id="http://debian.org/debian/8"/>
++
++ <release-date>2017-06-17</release-date>
++
++ <devices>
++ <device id="http://pcisig.com/pci/1af4/1041"/>
++ <device id="http://pcisig.com/pci/1af4/1042"/>
++ <device id="http://pcisig.com/pci/1af4/1043"/>
++ <device id="http://pcisig.com/pci/1af4/1044"/>
++ <device id="http://pcisig.com/pci/1af4/1045"/>
++ <device id="http://pcisig.com/pci/1af4/1048"/>
++ <device id="http://pcisig.com/pci/1af4/1049"/>
++ <device id="http://pcisig.com/pci/1af4/1052"/>
++ </devices>
++
++ <resources arch="all">
++ <minimum>
++ <cpu>1000000000</cpu>
++ <n-cpus>1</n-cpus>
++ <ram>1073741824</ram>
++ <storage>10737418240</storage>
++ </minimum>
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>1073741824</ram>
++ <storage>21474836480</storage>
++ </recommended>
++ </resources>
++
++ <variant id="universal">
++ <_name>Debian 9</_name>
++ </variant>
++ <variant id="universal-netinst">
++ <_name>Debian 9</_name>
++ </variant>
++
++ <!-- Network installer -->
++ <media arch="i686">
++ <variant id="universal-netinst"/>
++ <url>http://cdimage.debian.org/cdimage/release/current/i386/iso-cd/debian-9.0.0-i386-netinst.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ i386 n</volume-id>
++ </iso>
++ <kernel>install.386/vmlinuz</kernel>
++ <initrd>install.386/initrd.gz</initrd>
++ </media>
++ <media arch="x86_64">
++ <variant id="universal-netinst"/>
++ <url>http://cdimage.debian.org/cdimage/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ amd64 n</volume-id>
++ </iso>
++ <kernel>install.amd/vmlinuz</kernel>
++ <initrd>install.amd/initrd.gz</initrd>
++ </media>
++ <media arch="arm64">
++ <variant id="universal-netinst"/>
++ <url>http://cdimage.debian.org/cdimage/release/current/arm64/iso-cd/debian-9.0.0-arm64-netinst.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ arm64 n</volume-id>
++ </iso>
++ <kernel>install.arm64/vmlinuz</kernel>
++ <initrd>install.arm64/initrd.gz</initrd>
++ </media>
++ <media arch="armhf">
++ <variant id="universal-netinst"/>
++ <url>http://cdimage.debian.org/cdimage/release/current/armhf/iso-cd/debian-9.0.0-armhf-netinst.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ armhf n</volume-id>
++ </iso>
++ <kernel>install.armhf/vmlinuz</kernel>
++ <initrd>install.armhf/initrd.gz</initrd>
++ </media>
++
++ <!-- DVD -->
++ <media arch="i686">
++ <variant id="universal"/>
++ <url>http://cdimage.debian.org/cdimage/release/9.0.0/i386/iso-dvd/debian-9.0.0-i386-DVD-1.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ i386 1</volume-id>
++ </iso>
++ <kernel>install.386/vmlinuz</kernel>
++ <initrd>install.386/initrd.gz</initrd>
++ </media>
++ <media arch="x86_64">
++ <variant id="universal"/>
++ <url>http://cdimage.debian.org/cdimage/release/9.0.0/amd64/iso-dvd/debian-9.0.0-amd64-DVD-1.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ amd64 1</volume-id>
++ </iso>
++ <kernel>install.amd/vmlinuz</kernel>
++ <initrd>install.amd/initrd.gz</initrd>
++ </media>
++ <media arch="arm64">
++ <variant id="universal"/>
++ <url>http://cdimage.debian.org/cdimage/release/9.0.0/arm64/iso-dvd/debian-9.0.0-arm64-DVD-1.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ arm64 1</volume-id>
++ </iso>
++ <kernel>install.arm64/vmlinuz</kernel>
++ <initrd>install.arm64/initrd.gz</initrd>
++ </media>
++ <media arch="armhf">
++ <variant id="universal"/>
++ <url>http://cdimage.debian.org/cdimage/release/9.0.0/armhf/iso-dvd/debian-9.0.0-armhf-DVD-1.iso</url>
++ <iso>
++ <volume-id>Debian 9.(\d)+.(\d)+ armhf 1</volume-id>
++ </iso>
++ <kernel>install.armhf/vmlinuz</kernel>
++ <initrd>install.armhf/initrd.gz</initrd>
++ </media>
++
++ <installer>
++ <script id='http://debian.org/debian/preseed/jeos'/>
++ <script id='http://debian.org/debian/preseed/desktop'/>
++ </installer>
++ </os>
++</libosinfo>
diff --git a/debian/patches/Debian-Jessie-Update-DVD-links.patch b/debian/patches/Debian-Jessie-Update-DVD-links.patch
index 3386499..070e48a 100644
--- a/debian/patches/Debian-Jessie-Update-DVD-links.patch
+++ b/debian/patches/Debian-Jessie-Update-DVD-links.patch
@@ -7,7 +7,7 @@ Subject: Debian Jessie: Update DVD links
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/os/debian.org/debian-8.xml.in b/data/os/debian.org/debian-8.xml.in
-index 19bb8a5..a72cc89 100644
+index 19bb8a5..8ad189b 100644
--- a/data/os/debian.org/debian-8.xml.in
+++ b/data/os/debian.org/debian-8.xml.in
@@ -33,7 +33,7 @@
@@ -15,7 +15,7 @@ index 19bb8a5..a72cc89 100644
<media arch="i686">
- <url>http://cdimage.debian.org/debian-cd/8.4.0/i386/iso-dvd/debian-8.4.0-i386-DVD-1.iso</url>
-+ <url>http://cdimage.debian.org/debian-cd/8.7.1/i386/iso-dvd/debian-8.7.1-i386-DVD-1.iso</url>
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/i386/iso-dvd/debian-8.8.0-i386-DVD-1.iso</url>
<iso>
<volume-id>Debian 8.\d.\d i386 1</volume-id>
</iso>
@@ -24,7 +24,7 @@ index 19bb8a5..a72cc89 100644
</media>
<media arch="x86_64">
- <url>http://cdimage.debian.org/debian-cd/8.4.0/amd64/iso-dvd/debian-8.4.0-amd64-DVD-1.iso</url>
-+ <url>http://cdimage.debian.org/debian-cd/8.7.1/amd64/iso-dvd/debian-8.7.1-amd64-DVD-1.iso</url>
++ <url>http://cdimage.debian.org/mirror/cdimage/archive/8.8.0/amd64/iso-dvd/debian-8.8.0-amd64-DVD-1.iso</url>
<iso>
<volume-id>Debian 8.\d.\d amd64 1</volume-id>
</iso>
diff --git a/debian/patches/series b/debian/patches/series
index 941e0bb..98907f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
Debian-Jessie-Update-DVD-links.patch
-Add-Debian-Stretch-RCs.patch
+Add-Debian-Stretch.patch
Reproducible-Build.patch
Reply to: