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.4
diff --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 "bookworm".
+ - Update README (bookworm -> trixie).
+ * Refresh GFDL-1.2, GFDL-1.3, GPL-3, LGPL-2 and LGPL-3 from their
+ canonical place at https://ftp.gnu.org/gnu/Licenses/ as they have
+ minor editorial changes like trimming spaces, https, etc.
+ * Drop debian/current-md5sums-obsolete. Closes: #1009358.
+ * Ship a real debian/copyright file in source package instead of
+ generating it at build time.
+ * Call dh_installchangelogs using --no-trim option.
+ Add versioned build-dependency on debhelper for the above.
+ * Update lintian-overrides to new format.
+ * Rules-Requires-Root: binary-targets.
+ * Update standards version to 4.6.2.
+
+ -- Santiago Vila <sanv...@debian.org> Thu, 02 Mar 2023 14:55:00 +0100
+
base-files (12.3) unstable; urgency=high
* Add VERSION_CODENAME to /etc/os-release. Closes: #1008735.
diff --git a/debian/clean b/debian/clean
index 977e85d..ccba3ce 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1 @@
debian/postinst
-debian/copyright
diff --git a/debian/control b/debian/control
index 960c5d4..d4bad8a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: base-files
Section: admin
Priority: required
Maintainer: Santiago Vila <sanv...@debian.org>
-Standards-Version: 4.1.3
-Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.6.2
+Build-Depends: debhelper-compat (= 13), debhelper (>= 13.10~)
+Rules-Requires-Root: binary-targets
Package: base-files
Provides: base
diff --git a/debian/copyright.in b/debian/copyright
similarity index 88%
rename from debian/copyright.in
rename to debian/copyright
index 1d905d5..3f5ed9b 100644
--- a/debian/copyright.in
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-This is the Debian #OSNAME# prepackaged version of the Debian Base System
+This is the Debian prepackaged version of the Debian Base System
Miscellaneous files. These files were written by Ian Murdock
<imurd...@debian.org> and Bruce Perens <br...@pixar.com>.
@@ -24,5 +24,5 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-On Debian #OSNAME# systems, the complete text of the GNU General
+On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/current-md5sums-obsolete b/debian/current-md5sums-obsolete
deleted file mode 100755
index 5236dc4..0000000
--- a/debian/current-md5sums-obsolete
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-sed -e "s&#OSNAME#&GNU/Linux&" etc/motd | awk 'NR > 2' | md5sum
-sed -e "s&#OSNAME#&GNU/Hurd&" etc/motd | awk 'NR > 2' | md5sum
diff --git a/debian/rules b/debian/rules
index 88db04b..4c0497b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,6 @@ DESTDIR = debian/base-files
override_dh_auto_build:
sh debian/check-md5sum-etc profile
- sed -e "s&#OSNAME#&$(OSNAME)&g" debian/copyright.in > debian/copyright
sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in >
debian/postinst
override_dh_auto_install:
@@ -36,6 +35,9 @@ endif
mv $(DESTDIR)/etc/os-release $(DESTDIR)/usr/lib/os-release
ln -s ../usr/lib/os-release $(DESTDIR)/etc/os-release
+override_dh_installchangelogs:
+ dh_installchangelogs --no-trim
+
override_dh_link:
dh_link -X os-release
diff --git a/etc/debian_version b/etc/debian_version
index a82f56a..d7213f3 100644
--- a/etc/debian_version
+++ b/etc/debian_version
@@ -1 +1 @@
-bookworm/sid
+12.0
diff --git a/etc/issue b/etc/issue
index 9b1bb4a..b7788db 100644
--- a/etc/issue
+++ b/etc/issue
@@ -1,2 +1,2 @@
-Debian #OSNAME# bookworm/sid \n \l
+Debian #OSNAME# 12 \n \l
diff --git a/etc/issue.net b/etc/issue.net
index c2b4111..b0e76bc 100644
--- a/etc/issue.net
+++ b/etc/issue.net
@@ -1 +1 @@
-Debian #OSNAME# bookworm/sid
+Debian #OSNAME# 12
diff --git a/etc/os-release b/etc/os-release
index d42b0a1..281e4fd 100644
--- a/etc/os-release
+++ b/etc/os-release
@@ -1,5 +1,7 @@
-PRETTY_NAME="Debian #OSNAME# bookworm/sid"
+PRETTY_NAME="Debian #OSNAME# 12 (bookworm)"
NAME="Debian #OSNAME#"
+VERSION_ID="12"
+VERSION="12 (bookworm)"
VERSION_CODENAME=bookworm
ID=debian
HOME_URL="https://www.debian.org/";
diff --git a/licenses/GFDL-1.2 b/licenses/GFDL-1.2
index a988da5..68d93f4 100644
--- a/licenses/GFDL-1.2
+++ b/licenses/GFDL-1.2
@@ -355,7 +355,7 @@ The Free Software Foundation may publish new, revised
versions
of the GNU Free Documentation License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns. See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/licenses/.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
diff --git a/licenses/GFDL-1.3 b/licenses/GFDL-1.3
index 2f7e03c..857214d 100644
--- a/licenses/GFDL-1.3
+++ b/licenses/GFDL-1.3
@@ -4,7 +4,7 @@
Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
- <http://fsf.org/>
+ <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -377,7 +377,7 @@ The Free Software Foundation may publish new, revised
versions of the
GNU Free Documentation License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in
detail to address new problems or concerns. See
-http://www.gnu.org/copyleft/.
+https://www.gnu.org/licenses/.
Each version of the License is given a distinguishing version number.
If the Document specifies that a particular numbered version of this
@@ -401,19 +401,19 @@ public wiki that anybody can edit is an example of such a
server. A
"Massive Multiauthor Collaboration" (or "MMC") contained in the site
means any set of copyrightable works thus published on the MMC site.
-"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
-license published by Creative Commons Corporation, a not-for-profit
-corporation with a principal place of business in San Francisco,
-California, as well as future copyleft versions of that license
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
published by that same organization.
-"Incorporate" means to publish or republish a Document, in whole or in
+"Incorporate" means to publish or republish a Document, in whole or in
part, as part of another Document.
-An MMC is "eligible for relicensing" if it is licensed under this
-License, and if all works that were first published under this License
-somewhere other than this MMC, and subsequently incorporated in whole or
-in part into the MMC, (1) had no cover texts or invariant sections, and
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
(2) were thus incorporated prior to November 1, 2008.
The operator of an MMC Site may republish an MMC contained in the site
diff --git a/licenses/GPL-3 b/licenses/GPL-3
index 94a9ed0..f288702 100644
--- a/licenses/GPL-3
+++ b/licenses/GPL-3
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice
is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an
"about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/licenses/LGPL-2 b/licenses/LGPL-2
index 5bc8fb2..12735e6 100644
--- a/licenses/LGPL-2
+++ b/licenses/LGPL-2
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a
work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
diff --git a/licenses/LGPL-3 b/licenses/LGPL-3
index 65c5ca8..0a04128 100644
--- a/licenses/LGPL-3
+++ b/licenses/LGPL-3
@@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
