Package: release.debian.org Severity: normal Tags: jessie User: release.debian....@packages.debian.org Usertags: pu
Hi, the attached debdiff updates the release information for jessie, wheezy and stretch. Fortunately this is split out to osinfo-db in stretch. O.k. to upload to jessie-p-u? Cheers, -- Guido -- System Information: Debian Release: 9.0 APT prefers testing APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'oldoldstable'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog index 45f9af0..c2e0a73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libosinfo (0.2.11-1.1+deb8u1) jessie; urgency=medium + + * [6e5ed77] Add Debian Jessie and Stretch + and update the Wheezy links to the final point release. + + -- Guido Günther <a...@sigxcpu.org> Wed, 21 Jun 2017 08:47:43 +0200 + libosinfo (0.2.11-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/patches/Add-Debian-Jessie-and-Stretch.patch b/debian/patches/Add-Debian-Jessie-and-Stretch.patch new file mode 100644 index 0000000..89f25d3 --- /dev/null +++ b/debian/patches/Add-Debian-Jessie-and-Stretch.patch @@ -0,0 +1,242 @@ +From: =?utf-8?q?Guido_G=C3=BCnther?= <a...@sigxcpu.org> +Date: Wed, 21 Jun 2017 08:36:07 +0200 +Subject: Add Debian Jessie and Stretch + +--- + data/oses/debian.xml.in | 100 ++++++++++++++++++++- + .../debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt | 29 ++++++ + .../debian9/debian-9.0-amd64-netinst.iso.txt | 29 ++++++ + .../debian/debian9/debian-9.0-amd64.iso.txt | 29 ++++++ + 4 files changed, 185 insertions(+), 2 deletions(-) + create mode 100644 test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt + create mode 100644 test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt + create mode 100644 test/isodata/debian/debian9/debian-9.0-amd64.iso.txt + +diff --git a/data/oses/debian.xml.in b/data/oses/debian.xml.in +index 61d4d52..5924850 100644 +--- a/data/oses/debian.xml.in ++++ b/data/oses/debian.xml.in +@@ -238,7 +238,7 @@ + </resources> + + <media arch="i686"> +- <url>http://cdimage.debian.org/debian-cd/7.3.0/i386/iso-dvd/debian-7.3.0-i386-DVD-1.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/i386/iso-dvd/debian-7.11.0-i386-DVD-1.iso</url> + <iso> + <volume-id>Debian 7.\d.\d i386 1</volume-id> + </iso> +@@ -246,7 +246,7 @@ + <initrd>install.386/initrd.gz</initrd> + </media> + <media arch="x86_64"> +- <url>http://cdimage.debian.org/debian-cd/7.3.0/amd64/iso-dvd/debian-7.3.0-amd64-DVD-1.iso</url> ++ <url>http://cdimage.debian.org/mirror/cdimage/archive/7.11.0/amd64/iso-dvd/debian-7.11.0-amd64-DVD-1.iso</url> + <iso> + <volume-id>Debian 7.\d.\d amd64 1</volume-id> + </iso> +@@ -260,4 +260,100 @@ + </installer> + </os> + ++ <os id="http://debian.org/debian/8";> ++ <short-id>debian8</short-id> ++ <short-id>debianjessie</short-id> ++ <_name>Debian Jessie</_name> ++ <version>8</version> ++ <_vendor>Debian Project</_vendor> ++ <family>linux</family> ++ <distro>debian</distro> ++ <upgrades id="http://debian.org/debian/7"/> ++ <derives-from id="http://debian.org/debian/7"/> ++ ++ <resources arch="all"> ++ <minimum> ++ <cpu>1000000000</cpu> ++ <n-cpus>1</n-cpus> ++ <ram>134217728</ram> ++ <storage>5368709120</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <media arch="i686"> ++ <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> ++ <kernel>install.386/vmlinuz</kernel> ++ <initrd>install.386/initrd.gz</initrd> ++ </media> ++ <media arch="x86_64"> ++ <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> ++ <kernel>install.amd/vmlinuz</kernel> ++ <initrd>install.amd/initrd.gz</initrd> ++ </media> ++ ++ <installer> ++ <script id='http://debian.org/scripts/debian/jeos'/> ++ <script id='http://debian.org/scripts/debian/desktop'/> ++ </installer> ++ </os> ++ ++ <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"/> ++ ++ <resources arch="all"> ++ <minimum> ++ <cpu>1000000000</cpu> ++ <n-cpus>1</n-cpus> ++ <ram>134217728</ram> ++ <storage>5368709120</storage> ++ </minimum> ++ <recommended> ++ <cpu>1000000000</cpu> ++ <ram>1073741824</ram> ++ <storage>21474836480</storage> ++ </recommended> ++ </resources> ++ ++ <media arch="i686"> ++ <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 (1|n)</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/release/current/amd64/iso-cd/debian-9.0.0-amd64-netinst.iso</url> ++ <iso> ++ <volume-id>Debian 9.\d.\d amd64 (1|n)</volume-id> ++ </iso> ++ <kernel>install.amd/vmlinuz</kernel> ++ <initrd>install.amd/initrd.gz</initrd> ++ </media> ++ ++ <installer> ++ <script id='http://debian.org/scripts/debian/jeos'/> ++ <script id='http://debian.org/scripts/debian/desktop'/> ++ </installer> ++ </os> ++ + </libosinfo> +diff --git a/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt b/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt +new file mode 100644 +index 0000000..9f8f232 +--- /dev/null ++++ b/test/isodata/debian/debian8/debian-8.7.1-amd64-CD-1.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: ++Volume id: Debian 8.7.1 amd64 1 ++Volume set id: ++Publisher id: ++Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6 ++Application id: ++Copyright File id: ++Abstract File id: ++Bibliographic File id: ++Volume set size is: 1 ++Volume set sequence number is: 1 ++Logical block size is: 2048 ++Volume size is: 322560 ++El Torito VD version 1 found, boot catalog is in sector 2142 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 85F 2143 +diff --git a/test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt b/test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt +new file mode 100644 +index 0000000..ca0b62d +--- /dev/null ++++ b/test/isodata/debian/debian9/debian-9.0-amd64-netinst.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: ++Volume id: Debian 9.0.0 amd64 n ++Volume set id: ++Publisher id: ++Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6 ++Application id: ++Copyright File id: ++Abstract File id: ++Bibliographic File id: ++Volume set size is: 1 ++Volume set sequence number is: 1 ++Logical block size is: 2048 ++Volume size is: 148480 ++El Torito VD version 1 found, boot catalog is in sector 939 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 47C 1148 +diff --git a/test/isodata/debian/debian9/debian-9.0-amd64.iso.txt b/test/isodata/debian/debian9/debian-9.0-amd64.iso.txt +new file mode 100644 +index 0000000..779c3df +--- /dev/null ++++ b/test/isodata/debian/debian9/debian-9.0-amd64.iso.txt +@@ -0,0 +1,29 @@ ++CD-ROM is in ISO 9660 format ++System id: ++Volume id: Debian 9.0.0 amd64 1 ++Volume set id: ++Publisher id: ++Data preparer id: XORRISO-1.3.6 2014.04.08.180000, LIBISOBURN-1.3.6, LIBISOFS-1.3.6, LIBBURN-1.3.6 ++Application id: ++Copyright File id: ++Abstract File id: ++Bibliographic File id: ++Volume set size is: 1 ++Volume set sequence number is: 1 ++Logical block size is: 2048 ++Volume size is: 1857768 ++El Torito VD version 1 found, boot catalog is in sector 5307 ++Joliet with UCS level 3 found ++Rock Ridge signatures version 1 found ++Eltorito validation header: ++ Hid 1 ++ Arch 0 (x86) ++ ID '' ++ Key 55 AA ++ Eltorito defaultboot header: ++ Bootid 88 (bootable) ++ Boot media 0 (No Emulation Boot) ++ Load segment 0 ++ Sys type 0 ++ Nsect 4 ++ Bootoff 158C 5516 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..41fb9f7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +Add-Debian-Jessie-and-Stretch.patch
