Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock base-files. Debdiff is below.

Note: It would be good to unblock debian-security-support first (#928972),
or at the same time, because base-files Breaks the version currently
in testing.

Thanks.

diff -Nru base-files-10.1/debian/changelog base-files-10.3/debian/changelog
--- base-files-10.1/debian/changelog    2018-01-14 00:36:34.000000000 +0100
+++ base-files-10.3/debian/changelog    2019-05-13 22:25:32.000000000 +0200
@@ -1,3 +1,28 @@
+base-files (10.3) unstable; urgency=medium
+
+  * Add Breaks: debian-security-support (<< 2019.04.25). Closes: #928172.
+    This is the first version of debian-security-support which does not break
+    when /etc/debian_version contains a string in the form "10.x".
+
+ -- Santiago Vila <sanv...@debian.org>  Mon, 13 May 2019 22:25:32 +0200
+
+base-files (10.2) unstable; urgency=medium
+
+  * Release candidate for buster as stable:
+  - Use "10" as version in /etc/issue and /etc/issue.net.
+    (never expected to change after buster is released)
+  - Use 10.0 as version in /etc/debian_version.
+    (expected to change at every point release)
+  - Change PRETTY_NAME in /usr/lib/os-release, adding 10 as version number
+    and "(buster)" as codename. Add also VERSION_ID and VERSION.
+    (never expected to change)
+  - Add VERSION_CODENAME to os-release. Closes: #829245. This is optional
+    according to the specs but some people find it useful. Please note that
+    for now this is only expected to be present on stable releases.
+  - Update README (buster -> bullseye).
+
+ -- Santiago Vila <sanv...@debian.org>  Fri, 19 Apr 2019 13:05:00 +0200
+
 base-files (10.1) unstable; urgency=medium
 
   * Add CC0-1.0 to common-licenses. Closes: #859649, #882628.
diff -Nru base-files-10.1/debian/control base-files-10.3/debian/control
--- base-files-10.1/debian/control      2018-01-13 23:00:00.000000000 +0100
+++ base-files-10.3/debian/control      2019-05-13 21:00:00.000000000 +0200
@@ -13,7 +13,7 @@
 Essential: yes
 Priority: required
 Replaces: base, miscutils, dpkg (<= 1.15.0)
-Breaks: initscripts (<< 2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~)
+Breaks: debian-security-support (<< 2019.04.25), initscripts (<< 
2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~)
 Multi-Arch: foreign
 Description: Debian base system miscellaneous files
  This package contains the basic filesystem hierarchy of a Debian system, and
diff -Nru base-files-10.1/debian/README base-files-10.3/debian/README
--- base-files-10.1/debian/README       2018-01-13 23:00:00.000000000 +0100
+++ base-files-10.3/debian/README       2019-05-13 21:00:00.000000000 +0200
@@ -4,10 +4,10 @@
 * Questions about /etc/issue and /etc/debian_version:
 
 Q. I upgraded my system to the testing distribution and now my /etc/issue
-says "buster/sid". Should it not read "buster" or "testing"?
+says "bullseye/sid". Should it not read "bullseye" or "testing"?
 
 Q. I upgraded my system to the unstable distribution and now my /etc/issue
-says "buster/sid". Should it not read "sid" or "unstable"?
+says "bullseye/sid". Should it not read "sid" or "unstable"?
 
 A. That would be nice, but it is not possible because of the way the
 testing distribution works. Packages uploaded for unstable reach
@@ -17,9 +17,9 @@
 two sides of the same coin. Since the base-files package in testing
 was initially uploaded for unstable, the only sensible /etc/issue to
 have is one that is both valid for testing and unstable, hence
-"buster/sid" (or whatever is appropriate).
+"bullseye/sid" (or whatever is appropriate).
 
-Q. Why "buster/sid" and not "testing/unstable" as it used to be?
+Q. Why "bullseye/sid" and not "testing/unstable" as it used to be?
 
 A. The codename is a little bit more informative, as the meaning of
 "testing" changes over time.
@@ -31,7 +31,7 @@
 your /etc/apt/sources.list file is probably a much better way.
 
 Q. There is a new point release and I've just upgraded my system.
-The /etc/debian_version file now says 8.x but /etc/issue still says 8.
+The /etc/debian_version file now says 10.x but /etc/issue still says 10.
 Is this ok?
 
 A. Yes. The release managers asked me not to touch /etc/issue, as that's
diff -Nru base-files-10.1/etc/debian_version base-files-10.3/etc/debian_version
--- base-files-10.1/etc/debian_version  2017-06-26 00:18:00.000000000 +0200
+++ base-files-10.3/etc/debian_version  2019-04-19 13:00:00.000000000 +0200
@@ -1 +1 @@
-buster/sid
+10.0
diff -Nru base-files-10.1/etc/issue base-files-10.3/etc/issue
--- base-files-10.1/etc/issue   2017-06-26 00:18:00.000000000 +0200
+++ base-files-10.3/etc/issue   2019-04-19 13:00:00.000000000 +0200
@@ -1,2 +1,2 @@
-Debian #OSNAME# buster/sid \n \l
+Debian #OSNAME# 10 \n \l
 
diff -Nru base-files-10.1/etc/issue.net base-files-10.3/etc/issue.net
--- base-files-10.1/etc/issue.net       2017-06-26 00:18:00.000000000 +0200
+++ base-files-10.3/etc/issue.net       2019-04-19 13:00:00.000000000 +0200
@@ -1 +1 @@
-Debian #OSNAME# buster/sid
+Debian #OSNAME# 10
diff -Nru base-files-10.1/etc/os-release base-files-10.3/etc/os-release
--- base-files-10.1/etc/os-release      2017-06-26 00:18:00.000000000 +0200
+++ base-files-10.3/etc/os-release      2019-04-19 13:00:00.000000000 +0200
@@ -1,5 +1,8 @@
-PRETTY_NAME="Debian #OSNAME# buster/sid"
+PRETTY_NAME="Debian #OSNAME# 10 (buster)"
 NAME="Debian #OSNAME#"
+VERSION_ID="10"
+VERSION="10 (buster)"
+VERSION_CODENAME=buster
 ID=debian
 HOME_URL="https://www.debian.org/";
 SUPPORT_URL="https://www.debian.org/support";

Reply via email to