diff options
author | Laura Arjona Reina <larjona@debian.org> | 2019-03-22 00:04:40 +0100 |
---|---|---|
committer | Laura Arjona Reina <larjona@debian.org> | 2019-03-22 00:04:40 +0100 |
commit | f5215e16bb6a5dbb2a90983113e03235a4c5cf70 (patch) | |
tree | 79fa17ca6c6d0405e154923dbf7be016be8f6ac0 | |
parent | 97071051e652d23e7bf6c5c89fcd019f62d74e2b (diff) |
Add tags needed to offer both 8.11.1 images (for arches in LTS) and 8.11.0 (for arches not in LTS)jessie-8.11.0-and-8.11.1
-rw-r--r-- | english/releases/jessie/release.data | 34 | ||||
-rw-r--r-- | english/template/debian/installer.wml | 3 |
2 files changed, 24 insertions, 13 deletions
diff --git a/english/releases/jessie/release.data b/english/releases/jessie/release.data index b96880bffec..46694af2b7f 100644 --- a/english/releases/jessie/release.data +++ b/english/releases/jessie/release.data @@ -98,43 +98,53 @@ ### Next line should be changed to 'wml::debian::installer' when ### preparing for next stable release; don't forget the Makefile! #use wml::debian::installer -<define-tag jessie-images-url>https://cdimage.debian.org/cdimage/archive/8.11.1</define-tag> -<define-tag jessie-cd-release-filename>8.11.1</define-tag> +<define-tag jessie-lts-images-url>https://cdimage.debian.org/cdimage/archive/8.11.1</define-tag> +<define-tag jessie-lts-cd-release-filename>8.11.1</define-tag> +<define-tag jessie-images-url>https://cdimage.debian.org/cdimage/archive/8.11.0</define-tag> +<define-tag jessie-cd-release-filename>8.11.0</define-tag> <define-tag netinst-images> -<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@ARCH@-netinst.iso" arch="<strip-arches "<jessie-images-arches />" "source" />" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-cd/debian-<jessie-lts-cd-release-filename/>-@ARCH@-netinst.iso" arch="<strip-arches "<jessie-lts-images-arches />" "source" />" /> +<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@ARCH@-netinst.iso" arch="<strip-arches "<jessie-images-arches />" />" /> </define-tag> <define-tag businesscard-images> -<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@ARCH@-businesscard.iso" arch="<strip-arches "<jessie-images-arches />" "source" />" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-cd/debian-<jessie-lts-cd-release-filename/>-@ARCH@-businesscard.iso" arch="<strip-arches "<jessie-lts-images-arches />" "source" />" /> +<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/debian-<jessie-cd-release-filename/>-@ARCH@-businesscard.iso" arch="<strip-arches "<jessie-images-arches />" />" /> </define-tag> <define-tag full-cd-images> -<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/" arch="<jessie-images-arches /> multi-arch" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-cd/" arch="<jessie-lts-images-arches /> multi-arch" /> +<images-list url="<jessie-images-url/>/@ARCH@/iso-cd/" arch="<jessie-images-arches />" /> </define-tag> <define-tag full-cd-torrent> -<images-list url="<jessie-images-url/>/@ARCH@/bt-cd/" arch="<jessie-images-arches /> multi-arch" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/bt-cd/" arch="<jessie-lts-images-arches /> multi-arch" /> +<images-list url="<jessie-images-url/>/@ARCH@/bt-cd/" arch="<jessie-images-arches />" /> </define-tag> <define-tag full-cd-jigdo> -<images-list url="<jessie-images-url/>/@ARCH@/jigdo-cd/" arch="<jessie-images-arches /> multi-arch" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/jigdo-cd/" arch="<jessie-lts-images-arches /> multi-arch" /> +<images-list url="<jessie-images-url/>/@ARCH@/jigdo-cd/" arch="<jessie-images-arches />" /> </define-tag> <define-tag full-dvd-images> -<images-list url="<jessie-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-images-arches /> multi-arch" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-lts-images-arches /> multi-arch" /> +<images-list url="<jessie-images-url/>/@ARCH@/iso-dvd/" arch="<jessie-images-arches />" /> </define-tag> <define-tag full-dvd-torrent> -<images-list url="<jessie-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-images-arches /> multi-arch" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-lts-images-arches /> multi-arch" /> +<images-list url="<jessie-images-url/>/@ARCH@/bt-dvd/" arch="<jessie-images-arches />" /> </define-tag> <define-tag full-dvd-jigdo> -<images-list url="<jessie-images-url/>/@ARCH@/jigdo-dvd/" arch="<jessie-images-arches /> multi-arch" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/jigdo-dvd/" arch="<jessie-lts-images-arches /> multi-arch" /> +<images-list url="<jessie-images-url/>/@ARCH@/jigdo-dvd/" arch="<jessie-images-arches />" /> </define-tag> <define-tag full-bluray-jigdo> -<images-list url="<jessie-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" /> +<images-list url="<jessie-lts-images-url/>/@ARCH@/jigdo-bd/" arch="i386 amd64 source" /> </define-tag> <define-tag otherimages-url>http://ftp.debian.org/debian/dists/jessie/main/installer-@ARCH@/current/images/</define-tag> @@ -144,5 +154,5 @@ </define-tag> <define-tag small-non-free-cd-images> -<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<jessie-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<jessie-cd-release-filename/>-@ARCH@-netinst.iso" arch="amd64 i386" /> +<images-list url="https://cdimage.debian.org/cdimage/unofficial/non-free/cd-including-firmware/archive/<jessie-lts-cd-release-filename/>+nonfree/@ARCH@/iso-cd/firmware-<jessie-lts-cd-release-filename/>-@ARCH@-netinst.iso" arch="amd64 i386" /> </define-tag> diff --git a/english/template/debian/installer.wml b/english/template/debian/installer.wml index 1c1c9ebdfbb..491ef26a504 100644 --- a/english/template/debian/installer.wml +++ b/english/template/debian/installer.wml @@ -7,7 +7,8 @@ <define-tag lenny-images-arches>alpha\namd64\narm\narmel\nhppa\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag> <define-tag squeeze-images-arches>amd64\narmel\nkfreebsd-i386\nkfreebsd-amd64\ni386\nia64\nmips\nmipsel\npowerpc\nsparc\ns390\nsource</define-tag> <define-tag wheezy-images-arches>amd64\narmel\narmhf\ni386\nia64\nkfreebsd-i386\nkfreebsd-amd64\nmips\nmipsel\npowerpc\nsparc\ns390\ns390x\nsource</define-tag> -<define-tag jessie-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmipsel\npowerpc\nppc64el\ns390x\nsource</define-tag> +<define-tag jessie-lts-images-arches>amd64\narm64\narmel\narmhf\ni386\nsource</define-tag> +<define-tag jessie-images-arches>mips\nmipsel\npowerpc\nppc64el\ns390x</define-tag> <define-tag stretch-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> <define-tag buster-images-arches>amd64\narm64\narmel\narmhf\ni386\nmips\nmips64el\nmipsel\nppc64el\ns390x\nsource</define-tag> |