[neon/forks/base-files/Neon/release] /: rebase noble on https://answers.launchpad.net/ubuntu/+source/base-files/13ubuntu10
Carlos De Maine
null at kde.org
Fri May 17 01:10:15 BST 2024
Git commit 93a4ba1e9db77b02ea255806ebb054450da38f33 by Carlos De Maine.
Committed on 17/05/2024 at 00:09.
Pushed by carlosdem into branch 'Neon/release'.
rebase noble on https://answers.launchpad.net/ubuntu/+source/base-files/13ubuntu10
M +4 -4 debian/README
M +1 -7 debian/base-files.dirs
M +17 -10 debian/base-files.lintian-overrides
M +208 -14 debian/changelog
M +1 -1 debian/check-md5sum-etc
M +1 -1 debian/clean
M +4 -3 debian/control
R +2 -2 debian/copyright [from: debian/copyright.in - 088% similarity]
D +0 -3 debian/current-md5sums-obsolete
D +0 -1 debian/lsb-release-udeb.install
M +51 -40 debian/postinst.in
A +13 -0 debian/postrm
A +34 -0 debian/preinst
M +29 -3 debian/rules
M +1 -1 etc/debian_version
M +1 -1 licenses/GFDL-1.2
M +11 -11 licenses/GFDL-1.3
M +4 -4 licenses/GPL-3
M +1 -1 licenses/LGPL-2
M +1 -1 licenses/LGPL-3
A +- -- logos/ubuntu-logo-text-dark.png
A +- -- logos/ubuntu-logo-text.png
A +1 -0 logos/ubuntu-logo.svg
https://invent.kde.org/neon/forks/base-files/-/commit/93a4ba1e9db77b02ea255806ebb054450da38f33
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.dirs b/debian/base-files.dirs
index 1ff9a5f..7d4741d 100644
--- a/debian/base-files.dirs
+++ b/debian/base-files.dirs
@@ -1,4 +1,3 @@
-bin
boot
dev
etc
@@ -8,20 +7,15 @@ etc/profile.d
etc/skel
etc/update-motd.d
home
-lib
-lib/systemd/system
proc
root
run
-sbin
sys
tmp
usr
-usr/bin
usr/games
usr/include
-usr/lib
-usr/sbin
+usr/lib/systemd/system
usr/share
usr/share/base-files
usr/share/common-licenses
diff --git a/debian/base-files.lintian-overrides b/debian/base-files.lintian-overrides
index d57f3a3..65d472d 100644
--- a/debian/base-files.lintian-overrides
+++ b/debian/base-files.lintian-overrides
@@ -2,21 +2,28 @@
# 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]
+
+# Yes, these links really should be relative
+base-files: relative-symlink usr/bin [bin]
+base-files: relative-symlink usr/lib [lib]
+base-files: relative-symlink usr/lib64 [lib64]
+base-files: relative-symlink usr/libx32 [libx32]
+base-files: relative-symlink usr/sbin [sbin]
diff --git a/debian/changelog b/debian/changelog
index 0fbaf94..4ec585a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,33 +1,226 @@
-base-files (12ubuntu4.6) jammy; urgency=medium
+base-files (13ubuntu10) noble; urgency=medium
- * /etc/issue{,.net}, /etc/{lsb,os}-release: bump version to 22.04.4
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 24.04 release.
- -- Graham Inggs <ginggs at ubuntu.com> Wed, 14 Feb 2024 14:47:50 +0000
+ -- Utkarsh Gupta <utkarsh at ubuntu.com> Mon, 22 Apr 2024 18:38:03 +0530
-base-files (12ubuntu4.5) jammy; urgency=medium
+base-files (13ubuntu9) noble; urgency=medium
+
+ * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sun, 31 Mar 2024 00:04:04 +0000
+
+base-files (13ubuntu8) noble; urgency=medium
+
+ * etc/os-release: add 'LTS' to the version string
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Tue, 26 Mar 2024 11:25:23 +0100
+
+base-files (13ubuntu7) noble; urgency=medium
+
+ [ Helmut Grohne ]
+ * install aliasing symlinks for merged-/usr DEP17
+
+ -- Julian Andres Klode <juliank at ubuntu.com> Thu, 22 Feb 2024 15:39:58 +0100
+
+base-files (13ubuntu6) noble; urgency=medium
* motd/10-help-text: Update support url for new Ubuntu Pro webpage
(LP: #2046356)
- -- Lucas Moura <lucas.moura at canonical.com> Tue, 02 Jan 2024 14:09:35 -0300
+ -- Lucas Moura <lucas.moura at canonical.com> Tue, 02 Jan 2024 10:25:08 -0300
+
+base-files (13ubuntu5) noble; urgency=medium
+
+ * Move systemd units to /usr/lib, as per new debhelper.
+
+ -- Dimitri John Ledkov <dimitri.ledkov at canonical.com> Fri, 24 Nov 2023 23:25:03 +0000
+
+base-files (13ubuntu4) noble; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Noble Numbat!
+
+ -- Jeremy Bícha <jbicha at ubuntu.com> Sun, 29 Oct 2023 19:58:08 -0400
+
+base-files (13ubuntu3) noble; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Noble N!
+
+ -- Utkarsh Gupta <utkarsh at ubuntu.com> Tue, 24 Oct 2023 14:03:24 +0100
+
+base-files (13ubuntu2) mantic; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 23.10 release
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Mon, 09 Oct 2023 22:54:54 +0000
+
+base-files (13ubuntu1) mantic; urgency=medium
+
+ * Merge from Debian unstable, remaining changes:
+ - Add /etc/lsb-release file.
+ - /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to ATTRIBUTE ANIMAL!
+ - Install locale-check command to /usr/bin and invoke it from
+ /etc/profile.d/01-locale-fix.sh to ensure locale related environment
+ variables are set to valid values.
+ - Include systemd service to check the motd.ubuntu.com service
+ - Various bashrc extensions.
+ - Do not install /usr/local dirs with staff group writeability.
+ - Add default /etc/networks file.
+ - Remove the upgrade-available flag on package upgrade.
+ - Include debhelper token in postinst.
+ - Restore order line in /etc/host.conf with a comment.
+ - Build a motd-news-config package.
+ - Add update-motd scripts.
+ - etc/legal: legal notice for Ubuntu
+ - Depend on libcrypt1 (>= 1:4.4.10-10ubuntu3).
+ - Drop lsb-release-udeb package.
+ - set a LOGO=ubuntu-logo key which is part of the specification,
+ install ubuntu-logo/-text/-text-dark icons
+ * Drop debian/lsb-release-udeb.install, no longer needed
+
+ -- Graham Inggs <ginggs at ubuntu.com> Wed, 14 Jun 2023 10:04:01 +0000
+
+base-files (13) unstable; urgency=medium
+
+ * Change issue, issue.net, debian_version and os-release
+ to read "trixie/sid".
+ * Change VERSION_CODENAME in os-release to read "trixie".
+ * Drop VERSION and VERSION_ID from os-release.
+
+ -- Santiago Vila <sanvila at debian.org> Sun, 11 Jun 2023 17:00:00 +0200
+
+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 <sanvila at debian.org> Thu, 02 Mar 2023 14:55:00 +0100
+
+base-files (12.3ubuntu3) mantic; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Mantic Minotaur!
+ (LP: #2017948)
+
+ -- Graham Inggs <ginggs at ubuntu.com> Fri, 28 Apr 2023 08:38:19 +0000
-base-files (12ubuntu4.4) jammy; urgency=medium
+base-files (12.3ubuntu2) lunar; urgency=medium
- * /etc/issue{,.net}, /etc/{lsb,os}-release: bump version to 22.04.3
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 23.04 release
- -- Paride Legovini <paride at ubuntu.com> Wed, 02 Aug 2023 15:14:26 +0200
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Fri, 14 Apr 2023 17:57:36 +0200
-base-files (12ubuntu4.3) jammy; urgency=medium
+base-files (12.3ubuntu1) lunar; urgency=low
- * /etc/issue{,.net}, /etc/{lsb,os}-release: bump version to 22.04.2
+ * Merge from Debian unstable. Remaining changes:
+ - Add /etc/lsb-release file.
+ - /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to ATTRIBUTE ANIMAL!
+ - Install locale-check command to /usr/bin and invoke it from
+ /etc/profile.d/01-locale-fix.sh to ensure locale related environment
+ variables are set to valid values.
+ - Include systemd service to check the motd.ubuntu.com service
+ - Various bashrc extensions.
+ - Do not install /usr/local dirs with staff group writeability.
+ - Add default /etc/networks file.
+ - Remove the upgrade-available flag on package upgrade.
+ - Include debhelper token in postinst.
+ - Restore order line in /etc/host.conf with a comment.
+ - Build a motd-news-config package.
+ - Add update-motd scripts.
+ - etc/legal: legal notice for Ubuntu
+ - Depend on libcrypt1 (>= 1:4.4.10-10ubuntu3).
+ - Drop lsb-release-udeb package.
+ - set a LOGO=ubuntu-logo key which is part of the specification,
+ install ubuntu-logo/-text/-text-dark icons
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Fri, 28 Oct 2022 15:38:44 +0200
+
+base-files (12.3) unstable; urgency=high
+
+ * Add VERSION_CODENAME to /etc/os-release. Closes: #1008735.
+ This still respects the fact that Debian distributions do not have
+ a version number until they are actually released as stable, but makes
+ /etc/os-release a little bit more useful for those who use testing as
+ a pre-release for the next stable. Those users are also the reason why
+ in this case we are simply using the string "bookworm".
+
+ -- Santiago Vila <sanvila at debian.org> Mon, 03 Oct 2022 23:30:00 +0200
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Thu, 16 Feb 2023 17:02:32 +0100
+base-files (12.2ubuntu3) kinetic; urgency=medium
-base-files (12ubuntu4.2) jammy; urgency=medium
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Prepare for 22.10 release
- * /etc/issue{,.net}, /etc/{lsb,os}-release: bump version to 22.04.1
+ -- Graham Inggs <ginggs at ubuntu.com> Mon, 17 Oct 2022 09:00:41 +0000
- -- Paride Legovini <paride at ubuntu.com> Thu, 28 Jul 2022 17:29:51 +0200
+base-files (12.2ubuntu2) kinetic; urgency=medium
+
+ * debian/rules, etc/os-release, logos/:
+ - set a LOGO=ubuntu-logo key which is part of the specification,
+ install ubuntu-logo/-text/-text-dark icons (lp: #1931582)
+
+ -- Sebastien Bacher <seb128 at ubuntu.com> Mon, 11 Jul 2022 17:58:15 +0200
+
+base-files (12.2ubuntu1) kinetic; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Add /etc/lsb-release file.
+ - /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to ATTRIBUTE ANIMAL!
+ - Install locale-check command to /usr/bin and invoke it from
+ /etc/profile.d/01-locale-fix.sh to ensure locale related environment
+ variables are set to valid values.
+ - Include systemd service to check the motd.ubuntu.com service
+ - Various bashrc extensions.
+ - Do not install /usr/local dirs with staff group writeability.
+ - Add default /etc/networks file.
+ - Remove the upgrade-available flag on package upgrade.
+ - Include debhelper token in postinst.
+ - Restore order line in /etc/host.conf with a comment.
+ - Build a motd-news-config package.
+ - Add update-motd scripts.
+ - etc/legal: legal notice for Ubuntu
+ - Depend on libcrypt1 (>= 1:4.4.10-10ubuntu3).
+ - Drop lsb-release-udeb package.
+ * Adjust ubuntu postinst.in changes for DPKG_ROOT.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Wed, 01 Jun 2022 12:31:09 +0200
+
+base-files (12.2) unstable; urgency=medium
+
+ * A simplified version of the patch for DPKG_ROOT was applied, but the
+ simplification went too far and was incorrect. Closes: #824594.
+ * Use $() instead of `` when calling md5sum.
+
+ -- Santiago Vila <sanvila at debian.org> Wed, 19 Jan 2022 23:35:00 +0100
+
+base-files (12.1) unstable; urgency=medium
+
+ * Add support for DPKG_ROOT to postinst. Closes: #824594
+
+ -- Santiago Vila <sanvila at debian.org> Wed, 19 Jan 2022 22:40:00 +0100
+
+base-files (12ubuntu5) kinetic; urgency=medium
+
+ * /etc/issue{,.net}, /etc/{lsb,os}-release: Welcome to Kinetic Kudu!
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com> Tue, 26 Apr 2022 17:47:05 +0200
base-files (12ubuntu4.1) jammy; urgency=medium
@@ -3219,3 +3412,4 @@ base-files (1.2.0-1) unstable; urgency=low
/etc/passwd and /etc/group are installed by the "base-passwd" package.
-- Bruce Perens <bruce at pixar.com> Thu, 14 Nov 1996 21:02:09 -0800
+
diff --git a/debian/check-md5sum-etc b/debian/check-md5sum-etc
index 6c582cb..bd9380b 100644
--- a/debian/check-md5sum-etc
+++ b/debian/check-md5sum-etc
@@ -1,6 +1,6 @@
#!/bin/sh
file=$1
-md5=`md5sum share/${file} | cut -f 1 -d " "`
+md5=$(md5sum share/${file} | cut -f 1 -d " ")
if ! grep -q "$md5" share/${file}.md5sums; then
echo Error: share/${file}.md5sums is incomplete.
echo Need to add "$md5" with current version.
diff --git a/debian/clean b/debian/clean
index f39c089..962e2ec 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,3 @@
debian/postinst
-debian/copyright
+debian/triggers
locale-check
diff --git a/debian/control b/debian/control
index f149093..e7e945a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ Section: admin
Priority: required
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Santiago Vila <sanvila at 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
+Provides: base, usr-is-merged
Architecture: any
Pre-Depends: awk
Depends: ${misc:Depends}, ${shlibs:Depends}, libcrypt1 (>= 1:4.4.10-10ubuntu3)
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
<imurdock at debian.org> and Bruce Perens <bruce at 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/lsb-release-udeb.install b/debian/lsb-release-udeb.install
deleted file mode 100644
index e37a25f..0000000
--- a/debian/lsb-release-udeb.install
+++ /dev/null
@@ -1 +0,0 @@
-etc/lsb-release
diff --git a/debian/postinst.in b/debian/postinst.in
index 6bdf16a..9020fd6 100644
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -1,48 +1,56 @@
#!/bin/sh
set -e
+ensure_file_owner_mode() {
+ if [ ! -f "$DPKG_ROOT$1" ]; then
+ : > "$DPKG_ROOT$1"
+ fi
+ chown "$2" "$DPKG_ROOT$1"
+ chmod "$3" "$DPKG_ROOT$1"
+}
+
install_local_dir() {
- if [ ! -d $1 ]; then
- mkdir -p $1
+ if [ ! -d "$DPKG_ROOT$1" ]; then
+ mkdir -p "$DPKG_ROOT$1"
fi
}
install_from_default() {
- if [ ! -f $2 ]; then
- cp -p /usr/share/base-files/$1 $2
+ if [ ! -f "$DPKG_ROOT$2" ]; then
+ cp -p "$DPKG_ROOT/usr/share/base-files/$1" "$DPKG_ROOT$2"
fi
}
install_directory() {
- if [ ! -d /$1 ]; then
- mkdir /$1
- chown root:$3 /$1
- chmod $2 /$1
+ if [ ! -d "$DPKG_ROOT/$1" ]; then
+ mkdir "$DPKG_ROOT/$1"
+ chown "root:$3" "$DPKG_ROOT/$1"
+ chmod "$2" "$DPKG_ROOT/$1"
fi
}
migrate_directory() {
- if [ ! -L $1 ]; then
- rmdir $1
- ln -s $2 $1
+ if [ ! -L "$DPKG_ROOT$1" ]; then
+ rmdir "$DPKG_ROOT$1"
+ ln -s "$2" "$DPKG_ROOT$1"
fi
}
update_to_current_default() {
- if [ -f $2 ]; then
- md5=`md5sum $2 | cut -f 1 -d " "`
- if grep -q "$md5" /usr/share/base-files/$1.md5sums; then
- if ! cmp -s /usr/share/base-files/$1 $2; then
- cp -p /usr/share/base-files/$1 $2
+ if [ -f "$2" ]; then
+ md5=$(md5sum "$2" | cut -f 1 -d " ")
+ if grep -q "$md5" "/usr/share/base-files/$1.md5sums"; then
+ if ! cmp -s "/usr/share/base-files/$1" "$2"; then
+ cp -p "/usr/share/base-files/$1" "$2"
echo Updating $2 to current default.
fi
fi
fi
}
-if [ ! -e /etc/dpkg/origins/default ]; then
- if [ -e /etc/dpkg/origins/#VENDORFILE# ]; then
- ln -sf #VENDORFILE# /etc/dpkg/origins/default
+if [ ! -e "$DPKG_ROOT/etc/dpkg/origins/default" ]; then
+ if [ -e "$DPKG_ROOT/etc/dpkg/origins/#VENDORFILE#" ]; then
+ ln -sf #VENDORFILE# "$DPKG_ROOT/etc/dpkg/origins/default"
fi
fi
@@ -58,8 +66,8 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then
install_directory var/opt 755 root
install_directory media 755 root
install_directory var/mail 2775 mail
- if [ ! -L /var/spool/mail ]; then
- ln -s ../mail /var/spool/mail
+ if [ ! -L "$DPKG_ROOT/var/spool/mail" ]; then
+ ln -s ../mail "$DPKG_ROOT/var/spool/mail"
fi
install_directory run/lock 1777 root
migrate_directory /var/run /run
@@ -75,34 +83,25 @@ if [ "$1" = "configure" ] && [ "$2" = "" ]; then
install_local_dir /usr/local/sbin
install_local_dir /usr/local/src
install_local_dir /usr/local/etc
- ln -sf share/man /usr/local/man
+ ln -sf share/man "$DPKG_ROOT/usr/local/man"
- if [ ! -f /var/log/wtmp ]; then
- echo -n>/var/log/wtmp
- fi
- if [ ! -f /var/log/btmp ]; then
- echo -n>/var/log/btmp
- fi
- if [ ! -f /var/log/lastlog ]; then
- echo -n>/var/log/lastlog
- fi
- chown root:utmp /var/log/wtmp /var/log/btmp /var/log/lastlog
- chmod 664 /var/log/wtmp /var/log/lastlog
- chmod 660 /var/log/btmp
+ ensure_file_owner_mode /var/log/wtmp root:utmp 664
+ ensure_file_owner_mode /var/log/btmp root:utmp 660
+ ensure_file_owner_mode /var/log/lastlog root:utmp 664
fi
-if [ -d /usr/share/info ] && [ ! -f /usr/info/dir ] && [ ! -f /usr/share/info/dir ]; then
+if [ -d "$DPKG_ROOT/usr/share/info" ] && [ ! -f "$DPKG_ROOT/usr/info/dir" ] && [ ! -f "$DPKG_ROOT/usr/share/info/dir" ]; then
install_from_default info.dir /usr/share/info/dir
- chmod 644 /usr/share/info/dir
+ chmod 644 $DPKG_ROOT/usr/share/info/dir
fi
if [ "$1" = "configure" ] && [ "$2" != "" ]; then
# If we're upgrading base-files, remove the upgrade-available flag
# maintained by update-manager, and rerun the release-upgrade check
# immediately (in the background) to update the flag.
- rm -f /var/lib/update-notifier/release-upgrade-available
- if [ -x /usr/lib/update-manager/check-new-release ]; then
- /usr/lib/update-manager/check-new-release -q > /var/lib/update-notifier/release-upgrade-available &
+ rm -f $DPKG_ROOT/var/lib/update-notifier/release-upgrade-available
+ if [ -x $DPKG_ROOT/usr/lib/update-manager/check-new-release ]; then
+ $DPKG_ROOT/usr/lib/update-manager/check-new-release -q > $DPKG_ROOT/var/lib/update-notifier/release-upgrade-available &
fi
update_to_current_default profile /etc/profile
@@ -112,11 +111,23 @@ if [ "$1" = "configure" ] && [ "$2" != "" ]; then
fi
fi
+if [ "$1" = triggered ]; then
+ for d in lib32 lib64 libo32 libx32; do
+ if test -d "$DPKG_ROOT/usr/$d"; then
+ test -h "$DPKG_ROOT/$d" && continue
+ ln -s "usr/$d" "$DPKG_ROOT/$d"
+ else
+ test -h "$DPKG_ROOT/$d" || continue
+ rm "$DPKG_ROOT/$d"
+ fi
+ done
+fi
+
# special case of having /etc/default/motd-news removed by hand
# signal the motd-news-config package that this happened, so that
# it does not put back the file with default contents which would
# re-enable motd-news
-motd_news_config="/etc/default/motd-news"
+motd_news_config="$DPKG_ROOT/etc/default/motd-news"
# only in upgrades, never fresh installs like in debootstrap
if [ "$2" != "" ] && \
[ ! -e ${motd_news_config} ] && \
diff --git a/debian/postrm b/debian/postrm
new file mode 100644
index 0000000..3a1449b
--- /dev/null
+++ b/debian/postrm
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+USR_MERGE="bin lib lib32 lib64 libo32 lib64 sbin"
+
+if [ "$1" = remove ]; then
+ for d in $USR_MERGE; do
+ # Remove DEP17 M4 protective diversions
+ dpkg-divert --quiet --package base-files --remove --no-rename --divert /$d.usr-is-merged /$d
+ done
+fi
+
+#DEBHELPER#
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..35a0cc5
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+set -e
+
+USR_MERGE="bin lib lib32 lib64 libo32 lib64 sbin"
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+ for d in $USR_MERGE; do
+ if [ -d "$DPKG_ROOT/$d" ] && ! [ -h "$DPKG_ROOT/$d" ]; then
+ cat <<EOF
+
+
+******************************************************************************
+*
+* The base-files package cannot be installed because this system has a
+* split /usr.
+*
+* Please install the usrmerge package to convert this system to merged-/usr.
+*
+* For more information please read https://wiki.debian.org/UsrMerge.
+*
+******************************************************************************
+
+
+EOF
+ exit 1
+ fi
+ done
+ for d in $USR_MERGE; do
+ # Install DEP17 M4 protective diversions
+ dpkg-divert --quiet --package base-files --add --no-rename --divert /$d.usr-is-merged /$d
+ done
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 621f25c..df702fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
OSNAME = "GNU/`uname | sed -e 's/GNU\///'`"
ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
OSNAME=GNU/Linux
@@ -11,6 +13,13 @@ endif
VENDORFILE = neon
DESTDIR = debian/base-files
+USR_MERGE = bin lib sbin
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 loong64 mips64el ppc64 ppc64el sparc64))
+USR_MERGE += lib64
+else ifneq (,$(filter $(DEB_HOST_ARCH),x32))
+USR_MERGE += libx32
+endif
+
%:
dh $@
@@ -19,17 +28,29 @@ locale-check:
override_dh_auto_build: locale-check
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
+ set -e; { \
+ echo "# Triggers for creating multilib aliasing symlinks on demand"; \
+ for d in $(foreach d,lib32 lib64 libo32 libx32,$(if $(filter $(d),$(USR_MERGE)),,$(d))); do \
+ echo "interest-noawait $$d"; \
+ done; \
+ } > debian/triggers
+
+execute_after_dh_installdirs:
+ dh_installdirs $(foreach d,$(USR_MERGE),usr/$(d))
+
override_dh_auto_install:
install -p -m 644 etc/* $(DESTDIR)/etc
install -p -m 755 motd/* $(DESTDIR)/etc/update-motd.d
- install -p -m 644 debian/motd-news.service $(DESTDIR)/lib/systemd/system/
- install -p -m 644 debian/motd-news.timer $(DESTDIR)/lib/systemd/system/
+ install -p -m 644 debian/motd-news.service $(DESTDIR)/usr/lib/systemd/system/
+ install -p -m 644 debian/motd-news.timer $(DESTDIR)/usr/lib/systemd/system/
install -p -m 644 licenses/* $(DESTDIR)/usr/share/common-licenses
install -p -m 644 origins/* $(DESTDIR)/etc/dpkg/origins
install -p -m 644 share/* $(DESTDIR)/usr/share/base-files
+ mkdir $(DESTDIR)/usr/share/pixmaps
+ install -p -m 644 logos/* $(DESTDIR)/usr/share/pixmaps
+ install -p -m 644 share/* $(DESTDIR)/usr/share/
install -p -m 644 profile.d/* $(DESTDIR)/etc/profile.d
install -p -m 755 locale-check $(DESTDIR)/usr/bin
ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
@@ -43,12 +64,17 @@ 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_installsystemd:
dh_installsystemd -pbase-files motd-news.timer
dh_installsystemd -pbase-files motd-news.service
override_dh_link:
dh_link -X os-release
+ # We want these links to be relative, so we cannot use dh_link.
+ $(foreach d,$(USR_MERGE),ln -s usr/$(d) debian/base-files/$(d) &&) :
override_dh_compress:
dh_compress -X README
diff --git a/etc/debian_version b/etc/debian_version
index a82f56a..201ac20 100644
--- a/etc/debian_version
+++ b/etc/debian_version
@@ -1 +1 @@
-bookworm/sid
+trixie/sid
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.
diff --git a/logos/ubuntu-logo-text-dark.png b/logos/ubuntu-logo-text-dark.png
new file mode 100644
index 0000000..ead2d33
Binary files /dev/null and b/logos/ubuntu-logo-text-dark.png differ
diff --git a/logos/ubuntu-logo-text.png b/logos/ubuntu-logo-text.png
new file mode 100644
index 0000000..7748413
Binary files /dev/null and b/logos/ubuntu-logo-text.png differ
diff --git a/logos/ubuntu-logo.svg b/logos/ubuntu-logo.svg
new file mode 100644
index 0000000..1c84052
--- /dev/null
+++ b/logos/ubuntu-logo.svg
@@ -0,0 +1 @@
+<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><defs><style>.cls-1{fill:#e95420;}.cls-2{fill:#fff;}</style></defs><rect class="cls-1" width="32" height="32"/><circle class="cls-2" cx="7.18" cy="15.82" r="3.35"/><circle class="cls-2" cx="21.1" cy="8.48" r="3.35"/><path class="cls-2" d="M14.73,24.42a8.08,8.08,0,0,1-5.55-4.25,4.83,4.83,0,0,1-2.85.35,10.87,10.87,0,0,0,7.85,6.58,11,11,0,0,0,2.37.25,4.71,4.71,0,0,1-1-2.8A2.89,2.89,0,0,1,14.73,24.42Z"/><circle class="cls-2" cx="20.35" cy="24.45" r="3.35"/><path class="cls-2" d="M25,23.23a11,11,0,0,0,.55-12.83,4.85,4.85,0,0,1-1.88,2.2,8.22,8.22,0,0,1,.78,5.55,8.08,8.08,0,0,1-1.05,2.6A4.58,4.58,0,0,1,25,23.23Z"/><path class="cls-2" d="M6.9,11h.25a4.65,4.65,0,0,1,1,.1,4.84,4.84,0,0,1,1.52.63,8.12,8.12,0,0,1,6.58-3.52,6.42,6.42,0,0,1,.1-.75,4.63,4.63,0,0,1,.92-1.95A11,11,0,0,0,6.9,11Z"/></svg>
\ No newline at end of file
More information about the Neon-commits
mailing list