diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README | 8 | ||||
| -rw-r--r-- | debian/base-files.lintian-overrides | 20 | ||||
| -rw-r--r-- | debian/changelog | 100 | ||||
| -rw-r--r-- | debian/check-md5sum-etc | 2 | ||||
| -rw-r--r-- | debian/clean | 1 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/copyright (renamed from debian/copyright.in) | 4 | ||||
| -rwxr-xr-x | debian/current-md5sums-obsolete | 3 | ||||
| -rw-r--r-- | debian/postinst.in | 90 | ||||
| -rwxr-xr-x | debian/rules | 4 |
10 files changed, 116 insertions, 123 deletions
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 cb17d4a..254d1c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,69 +1,77 @@ -base-files (11.1+deb11u7+shopno1) shopno; urgency=medium +base-files (12.4+deb12u2) bookworm; urgency=medium - * Change /etc/debian_version to 11.7, for Debian 11.7 point release + * Change /etc/debian_version to 12.2, for Debian 12.2 point release. - -- Mubashshir <ahm@jadupc.com> Wed, 03 May 2023 18:32:23 +0600 + -- Santiago Vila <sanvila@debian.org> Fri, 29 Sep 2023 22:04:00 +0200 -base-files (11.1+deb11u7) shopno; urgency=medium +base-files (12.4+deb12u1) bookworm; urgency=medium - [ Santiago Vila ] - * Change /etc/debian_version to 11.7, for Debian 11.7 point release. + * Change /etc/debian_version to 12.1, for Debian 12.1 point release. - -- Mubashshir <ahm@jadupc.com> Wed, 03 May 2023 18:30:00 +0600 + -- Santiago Vila <sanvila@debian.org> Fri, 14 Jul 2023 18:00:00 +0200 -base-files (11.1+deb11u6s3) shopno; urgency=medium +base-files (12.4) unstable; urgency=medium - * Update maintainer info - - -- Mubashshir <ahm@jadupc.com> Tue, 07 Mar 2023 15:11:05 +0600 - -base-files (11.1+deb11u6s2) shopno; urgency=medium - - * Fix Distributor ID; s/Shopno-OS/Shopno/ - - -- Mubashshir <ahmubashshir@gmail.com> Wed, 01 Feb 2023 13:00:00 +0600 - -base-files (11.1+deb11u6s1) shopno; urgency=medium - - * Change /etc/os-release, for ShopnoOS 4.9 point release. - - -- Mubashshir <ahmubashshir@gmail.com> Wed, 01 Feb 2023 13:00:00 +0600 - -base-files (11.1+deb11u6) bullseye; urgency=medium - - * Change /etc/debian_version to 11.6, for Debian 11.6 point release. - - -- Santiago Vila <sanvila@debian.org> Fri, 09 Dec 2022 20:15:00 +0100 - -base-files (11.1+deb11u5) bullseye; urgency=medium - - * Change /etc/debian_version to 11.5, for Debian 11.5 point release. + * 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@debian.org> Sat, 03 Sep 2022 14:10:00 +0200 + -- Santiago Vila <sanvila@debian.org> Thu, 02 Mar 2023 14:55:00 +0100 -base-files (11.1+deb11u4) bullseye; urgency=medium +base-files (12.3) unstable; urgency=high - * Change /etc/debian_version to 11.4, for Debian 11.4 point release. + * 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@debian.org> Thu, 30 Jun 2022 23:35:00 +0200 + -- Santiago Vila <sanvila@debian.org> Mon, 03 Oct 2022 23:30:00 +0200 -base-files (11.1+deb11u3) bullseye; urgency=medium +base-files (12.2) unstable; urgency=medium - * Change /etc/debian_version to 11.3, for Debian 11.3 point release. + * 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@debian.org> Sat, 19 Mar 2022 14:46:00 +0100 + -- Santiago Vila <sanvila@debian.org> Wed, 19 Jan 2022 23:35:00 +0100 -base-files (11.1+deb11u2) bullseye; urgency=medium +base-files (12.1) unstable; urgency=medium - * Change /etc/debian_version to 11.2, for Debian 11.2 point release. + * Add support for DPKG_ROOT to postinst. Closes: #824594 - -- Santiago Vila <sanvila@debian.org> Sat, 11 Dec 2021 18:25:00 +0100 + -- Santiago Vila <sanvila@debian.org> Wed, 19 Jan 2022 22:40:00 +0100 -base-files (11.1+deb11u1) bullseye; urgency=medium +base-files (12) unstable; urgency=medium - * Change /etc/debian_version to 11.1, for Debian 11.1 point release. + * Do not create /var/run/utmp in postinst, as /var/run is + ephemeral and it does not make sense. Closes: #989725. + * Do not create /var/lib/dpkg/status if missing anymore, + as dpkg already does that. Closes: #989726. + * Change issue, issue.net, debian_version and os-release to read + "bookworm/sid". Closes: #992369. + * Drop VERSION, VERSION_ID and CODENAME from os-release. - -- Santiago Vila <sanvila@debian.org> Sun, 03 Oct 2021 11:15:00 +0200 + -- Santiago Vila <sanvila@debian.org> Sun, 22 Aug 2021 19:00:00 +0200 base-files (11.1) unstable; urgency=medium 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 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 1bf62fb..d4bad8a 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,10 @@ Source: base-files Section: admin Priority: required -Maintainer: Mubashshir <ahm@jadupc.com> -Standards-Version: 4.1.3 -Build-Depends: debhelper-compat (= 13) +Maintainer: Santiago Vila <sanvila@debian.org> +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 index d257816..3f5ed9b 100644 --- a/debian/copyright.in +++ b/debian/copyright @@ -1,4 +1,4 @@ -This is the Shopno OS prepackaged version of the Shopno OS Base System +This is the Debian prepackaged version of the Debian Base System Miscellaneous files. These files were written by Ian Murdock <imurdock@debian.org> and Bruce Perens <bruce@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 Shopno OS 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/postinst.in b/debian/postinst.in index 499f41a..0ad4ce3 100644 --- a/debian/postinst.in +++ b/debian/postinst.in @@ -1,52 +1,60 @@ #!/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 - if [ -f /etc/staff-group-for-usr-local ]; then - chown root:staff $1 2> /dev/null || true - chmod 2775 $1 2> /dev/null || true + if [ -f "$DPKG_ROOT/etc/staff-group-for-usr-local" ]; then + chown root:staff "$DPKG_ROOT$1" 2>/dev/null || true + chmod 2775 "$DPKG_ROOT$1" 2> /dev/null || true 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 @@ -62,8 +70,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 @@ -79,38 +87,16 @@ 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 - - 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 - if [ ! -f /var/run/utmp ]; then - echo -n>/var/run/utmp - fi - chown root:utmp /var/run/utmp - chmod 664 /var/run/utmp -fi + ln -sf share/man "$DPKG_ROOT/usr/local/man" -if [ ! -d /var/lib/dpkg ]; then - mkdir -m 755 -p /var/lib/dpkg -fi -if [ ! -f /var/lib/dpkg/status ]; then - echo > /var/lib/dpkg/status - chmod 644 /var/lib/dpkg/status + 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 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 |