Bug#1033080: unblock: base-files/12.4

2023-03-16 Thread Santiago Vila

Closing as duplicate the one which has a greater bug number.

Sorry for the noise.



Bug#1033080: unblock: base-files/12.4

2023-03-16 Thread Santiago Vila

Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock
Control: affects -1 + src:base-files

Please unblock package base-files

[ Reason ]
It contains the changes everybody expects for bookworm as stable.

[ Tests ]
I've done my best double-checking that everything is correct.

[ Risks ]
The upload contains also other minor changes, but all of them are small,
all of them are low risk, and none of them should affect the end user.

[ Checklist ]
  [X] all changes are documented in the d/changelog
  [X] I reviewed all changes and I approve them
  [X] attach debdiff against the package in testing

[ Other info ]

Note 1: I'm actually using a diff in "git show" format,
because the old "copyright.in" is now simply "copyright"
and a debdiff would show this as a spurious big difference.

Note 2: All the changes in the licenses/* directory are really the
result of refreshing the licenses. I do not decide about those changes
nor I have a way to control them.

Thanks.

unblock base-files/12.4diff --git a/debian/README b/debian/README
index 01570a9..9ced2ea 100644
--- a/debian/README
+++ b/debian/README
@@ -4,10 +4,10 @@ Frequently Asked Questions about base-files
 * Questions about /etc/issue and /etc/debian_version:
 
 Q. I upgraded my system to the testing distribution and now my /etc/issue
-says "bookworm/sid". Should it not read "bookworm" or "testing"?
+says "trixie/sid". Should it not read "trixie" or "testing"?
 
 Q. I upgraded my system to the unstable distribution and now my /etc/issue
-says "bookworm/sid". Should it not read "sid" or "unstable"?
+says "trixie/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 @@ testing. You should consider the testing and unstable 
distributions as
 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
-"bookworm/sid" (or whatever is appropriate).
+"trixie/sid" (or whatever is appropriate).
 
-Q. Why "bookworm/sid" and not "testing/unstable" as it used to be?
+Q. Why "trixie/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.
diff --git a/debian/base-files.lintian-overrides 
b/debian/base-files.lintian-overrides
index d57f3a3..691e9e6 100644
--- a/debian/base-files.lintian-overrides
+++ b/debian/base-files.lintian-overrides
@@ -2,21 +2,21 @@
 # Permissions 0700 on /root are intentional as people expect
 # the /root directory to be more private than /home/* directories.
 #
-base-files: non-standard-dir-perm root/ 0700 != 0755
+base-files: non-standard-dir-perm 0700 != 0755 [root/]
 #
 # The /etc/os-release symlink is relative on purpose to avoid breaking dracut.
 # See Bug #755394 for details.
 #
-base-files: symlink-should-be-absolute etc/os-release ../usr/lib/os-release
+base-files: relative-symlink ../usr/lib/os-release [etc/os-release]
 #
 # The purpose of having licenses here is precisely to allow
 # other packages to reference them.
 #
-base-files: extra-license-file usr/share/common-licenses/Artistic
-base-files: extra-license-file usr/share/common-licenses/BSD
-base-files: extra-license-file usr/share/common-licenses/GPL-1
-base-files: extra-license-file usr/share/common-licenses/GPL-2
-base-files: extra-license-file usr/share/common-licenses/GPL-3
-base-files: extra-license-file usr/share/common-licenses/LGPL-2
-base-files: extra-license-file usr/share/common-licenses/LGPL-2.1
-base-files: extra-license-file usr/share/common-licenses/LGPL-3
+base-files: extra-license-file [usr/share/common-licenses/Artistic]
+base-files: extra-license-file [usr/share/common-licenses/BSD]
+base-files: extra-license-file [usr/share/common-licenses/GPL-1]
+base-files: extra-license-file [usr/share/common-licenses/GPL-2]
+base-files: extra-license-file [usr/share/common-licenses/GPL-3]
+base-files: extra-license-file [usr/share/common-licenses/LGPL-2]
+base-files: extra-license-file [usr/share/common-licenses/LGPL-2.1]
+base-files: extra-license-file [usr/share/common-licenses/LGPL-3]
diff --git a/debian/changelog b/debian/changelog
index 3259901..c9b9f12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+base-files (12.4) unstable; urgency=medium
+
+  * Release candidate for bookworm as stable:
+  - Use "12" as version in /etc/issue and /etc/issue.net.
+(never expected to change after release)
+  - Use 12.0 as version in /etc/debian_version.
+(expected to change at every point release)
+  - Change PRETTY_NAME in /usr/lib/os-release, adding 12 as version number
+and "(bookworm)" as codename. Add also VERSION_ID and VERSION.
+(never expected to change)
+  - Variable VERSION_CODENAME was already defined as