[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#988276: unblock: base-files/11.1



On Fri, May 14, 2021 at 10:21:31PM +0200, Paul Gevers wrote:

>  Priority: required
>  Maintainer: Santiago Vila <sanvila@debian.org>
>  Standards-Version: 4.1.3
> -Build-Depends: debhelper (>= 9)
> +Build-Depends: debhelper-compat (= 13)
> 
> Please revert that [1] or show with diffoscope that it doesn't change
> anything in the resulting binaries (by building twice, once with the
> current set and once with the debhelper bump reverted).

It is indeed harmless.

To be sure, I added debian/compat again and set "debhelper (>= 9)"
in debian/control, plus a new changelog entry (with same date to not
trigger lots of spurious date-related changes).

Attached source debdiff and diffoscope output, where the only changes
are the expected ones: Version and changelog.gz size.

Thanks.
diff -Nru base-files-11.1/debian/changelog base-files-11.2/debian/changelog
--- base-files-11.1/debian/changelog	2021-04-10 22:15:00.000000000 +0200
+++ base-files-11.2/debian/changelog	2021-04-10 22:15:00.000000000 +0200
@@ -1,3 +1,9 @@
+base-files (11.2) unstable; urgency=medium
+
+  * Undo debhelper bump to check that it's harmless.
+
+ -- Santiago Vila <sanvila@debian.org>  Sat, 10 Apr 2021 22:15:00 +0200
+
 base-files (11.1) unstable; urgency=medium
 
   * Use https where appropriate, namely, origins/debian (currently used)
diff -Nru base-files-11.1/debian/compat base-files-11.2/debian/compat
--- base-files-11.1/debian/compat	1970-01-01 01:00:00.000000000 +0100
+++ base-files-11.2/debian/compat	2021-04-10 22:15:00.000000000 +0200
@@ -0,0 +1 @@
+9
diff -Nru base-files-11.1/debian/control base-files-11.2/debian/control
--- base-files-11.1/debian/control	2021-04-10 22:15:00.000000000 +0200
+++ base-files-11.2/debian/control	2021-04-10 22:15:00.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: Santiago Vila <sanvila@debian.org>
 Standards-Version: 4.1.3
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper (>= 9)
 
 Package: base-files
 Provides: base
--- base-files_11.1_amd64.deb
+++ base-files_11.2_amd64.deb
├── file list
│ @@ -1,3 +1,3 @@
│  -rw-r--r--   0        0        0        4 2021-04-10 20:15:00.000000 debian-binary
│ --rw-r--r--   0        0        0     2352 2021-04-10 20:15:00.000000 control.tar.xz
│ --rw-r--r--   0        0        0    67448 2021-04-10 20:15:00.000000 data.tar.xz
│ +-rw-r--r--   0        0        0     2348 2021-04-10 20:15:00.000000 control.tar.xz
│ +-rw-r--r--   0        0        0    67484 2021-04-10 20:15:00.000000 data.tar.xz
├── control.tar.xz
│ ├── control.tar
│ │ ├── ./control
│ │ │ @@ -1,9 +1,9 @@
│ │ │  Package: base-files
│ │ │ -Version: 11.1
│ │ │ +Version: 11.2
│ │ │  Architecture: amd64
│ │ │  Essential: yes
│ │ │  Maintainer: Santiago Vila <sanvila@debian.org>
│ │ │  Installed-Size: 340
│ │ │  Pre-Depends: awk
│ │ │  Breaks: debian-security-support (<< 2019.04.25), initscripts (<< 2.88dsf-13.3), sendfile (<< 2.1b.20080616-5.2~)
│ │ │  Replaces: base, dpkg (<= 1.15.0), miscutils
│ │ ├── ./md5sums
│ │ │ ├── ./md5sums
│ │ │ │┄ Files differ
├── data.tar.xz
│ ├── data.tar
│ │ ├── file list
│ │ │ @@ -56,15 +56,15 @@
│ │ │  -rw-r--r--   0 root         (0) root         (0)    25755 2017-04-03 11:00:00.000000 ./usr/share/common-licenses/MPL-1.1
│ │ │  -rw-r--r--   0 root         (0) root         (0)    16726 2017-04-03 20:00:00.000000 ./usr/share/common-licenses/MPL-2.0
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/dict/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/doc/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/doc/base-files/
│ │ │  -rw-r--r--   0 root         (0) root         (0)     4690 2021-04-10 20:15:00.000000 ./usr/share/doc/base-files/README
│ │ │  -rw-r--r--   0 root         (0) root         (0)     1153 2019-07-09 09:00:00.000000 ./usr/share/doc/base-files/README.FHS
│ │ │ --rw-r--r--   0 root         (0) root         (0)    17266 2021-04-10 20:15:00.000000 ./usr/share/doc/base-files/changelog.gz
│ │ │ +-rw-r--r--   0 root         (0) root         (0)    17296 2021-04-10 20:15:00.000000 ./usr/share/doc/base-files/changelog.gz
│ │ │  -rw-r--r--   0 root         (0) root         (0)     1228 2021-04-10 20:15:00.000000 ./usr/share/doc/base-files/copyright
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/info/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/lintian/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/lintian/overrides/
│ │ │  -rw-r--r--   0 root         (0) root         (0)      985 2019-07-09 09:00:00.000000 ./usr/share/lintian/overrides/base-files
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/man/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2021-04-10 20:15:00.000000 ./usr/share/misc/
│ │ ├── ./usr/share/doc/base-files/changelog.gz
│ │ │ ├── filetype from file(1)
│ │ │ │ @@ -1 +1 @@
│ │ │ │ -gzip compressed data, max compression, from Unix, original size 61039
│ │ │ │ +gzip compressed data, max compression, from Unix, original size 61210
│ │ │ ├── changelog
│ │ │ │ @@ -1,7 +1,13 @@
│ │ │ │ +base-files (11.2) unstable; urgency=medium
│ │ │ │ +
│ │ │ │ +  * Undo debhelper bump to check that it's harmless.
│ │ │ │ +
│ │ │ │ + -- Santiago Vila <sanvila@debian.org>  Sat, 10 Apr 2021 22:15:00 +0200
│ │ │ │ +
│ │ │ │  base-files (11.1) unstable; urgency=medium
│ │ │ │  
│ │ │ │    * Use https where appropriate, namely, origins/debian (currently used)
│ │ │ │      and share/staff-group-for-usr-local (not anymore). Closes: #959470.
│ │ │ │    * Gracefully handle /usr/share/info not existing. Closes: #977113.
│ │ │ │    * Use $() instead of `` where appropriate, namely, the default files
│ │ │ │      for /etc/profile and /root/.bashrc. Closes: #982687.

Reply to: