[PATCH 0/6] debian: xfsprogs package clean-up

[PATCH 0/6] debian: xfsprogs package clean-up

[Bastian Germann]

Apply some minor changes to the xfsprogs debian packages, including
missing copyright notices that are required by Debian Policy.

Bastian Germann (6):
  debian: cryptographically verify upstream tarball
  debian: remove dependency on essential util-linux
  debian: remove "Priority: extra"
  debian: use Package-Type over its predecessor
  debian: add missing copyright info
  debian: new changelog entry

 debian/changelog                |  11 ++++
 debian/control                  |   5 +-
 debian/copyright                | 111 ++++++++++++++++++++++++++++----
 debian/upstream/signing-key.asc |  63 ++++++++++++++++++
 debian/watch                    |   2 +-
 5 files changed, 175 insertions(+), 17 deletions(-)
 create mode 100644 debian/upstream/signing-key.asc

-- 
2.30.0

[PATCH 1/6] debian: cryptographically verify upstream tarball

[Bastian Germann]

Debian's uscan utility can verify a downloaded tarball. As the
uncompressed tarball is signed, the decompress rule has to be applied.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/upstream/signing-key.asc | 63 +++++++++++++++++++++++++++++++++
 debian/watch                    |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 debian/upstream/signing-key.asc

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 00000000..5a9ec9b8
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBE6x99QBEADMR+yNFBc1Y5avoUhzI/sdR9ANwznsNpiCtZlaO4pIWvqQJCjB
+zp96cpCsnQZV32nqJBYnDpBDITBqTa/EF+IrHx8gKq8TaSBLHUq2ju2gJJLfBoL7
+V3807PQcI18YzkF+WL05ODFQ2cemDhx5uLghHEeOxuGj+1AI+kh/FCzMedHc6k87
+Yu2ZuaWF+Gh1W2ix6hikRJmQvj5BEeAx7xKkyBhzdbNIbbjV/iGi9b26B/dNcyd5
+w2My2gxMtxaiP7q5b6GM2rsQklHP8FtWZiYO7jsg/qIppR1C6Zr5jK1GQlMUIclY
+FeBbKggJ9mSwXJH7MIftilGQ8KDvNuV5AbkronGCsEEHj2khs7GfVv4pmUUHf1MR
+IvV0x3WJkpmhuZaYg8AdJlyGKgp+TQ7B+wCjNTdVqMI1vDk2BS6Rg851ay7AypbC
+Px2w4d8jIkQEgNjACHVDU89PNKAjScK1aTnW+HNUqg9BliCvuX5g4z2jgJBs57lo
+TWAGe2Ve3cMy3VoQ40Wt3yKK0Eno8jfgzgb48wyycINZgnseMRhxc2c8hd51tftK
+LKhPj4c7uqjnBjrgOVaVBupGUmvLiePlnW56zJZ51BR5igWnILeOJ1ZIcf7KsaHy
+E6B1mG+XdmYtjDhjf3NAcoBWJuj8euxMB6TcQN2MrSXy5wSKaw40evooGwARAQAB
+tCVFcmljIFIuIFNhbmRlZW4gPHNhbmRlZW5Ac2FuZGVlbi5uZXQ+iQI4BBMBAgAi
+BQJOsffUAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAgrhaS4T3e4K8W
+D/9RxynMYm+vXF1lc1ldA4miH1Mcw2y+3RSU4QZA5SrRBz4NX1atqz3OEUpu7qAA
+ZUW9vp3MWEXeKrVR/yg0NZTOPe+2a7ZN0J+s7AF6xVjdEsjW4bOo5cmGMcpciyfr
+9WwZbOOUEWWZ08UkEFa6B+p4EKJ9eCOFeHITCkR3AA8uxtGBBAbFzm6wMmDegsvl
+d9bXv5RdfUptyElzqlIukPJRz3/p3bUSCT6mkW7rrvBUMwvGnaI2YVabJSLpd2xi
+Vs7+gnslOk35TAMLrJ0uo3Nt2bx3sFlDIr9E2RgKYpbNE39O35l8t+A3asqD8Dlq
+Dg+VgTuOKBny/bVeKFuKAJ0Bvy2EU+/GPj/rnNgWh0gCPiaKqRRkPriGwdAXQ2zk
+2oQUq0cfpOQm6oIKKgXEt+W/r0cxuWLAdxMsLYdzrARstfiMYLMnw6z6mGpptgTS
+Snemw1tODqe9+++Z6yM8JA1RIyCVRlGx4dBh+vtQsFzCJfgIZxmF0rWKgW2aAOHb
+zNHG+UUODLK0IpOhUYTcgyjlvFM3tFwVjy0z/wF8ebmHkzeTMKJ64nPClwwfRfHz
+6KlgGlzEefNtZoHN7iR7uh282CpQ24NUChS2ORSd85Jt5TwxOfgSrEO9cC7rOeh1
+8fNShCRrTG6WBdxXmxBn/e49nI2KHhMSVxut37YoWtqIu7QkRXJpYyBSLiBTYW5k
+ZWVuIDxzYW5kZWVuQHJlZGhhdC5jb20+iQI4BBMBAgAiBQJOsq5eAhsDBgsJCAcD
+AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAgrhaS4T3e4IdpD/wOgkZiBdjErbXm8gZP
+uj6ceO3LfinJqWKJMHyPYmoUj4kPi5pgWRPjzGHrBPvPpbEogL88+mBF7H1jJRsx
+4qohO+ndsUjmFTztq1+8ZeE9iffMmZWK4zA5kOoKRXtGQaVZeOQhVGJAWnrpRDLK
+c2mCx+sxrD44H1ScmJ1veGVy1nK0k4sQTyXA7ZOI+o622NyvHlRYpivkUqugqmYF
+GfrmgwP8CeJB62LrzN0D27B0K/22EjZFQBcYJRumuAkieMO9P3U/RRW+48499J5m
+gZgxXLgvsc3nKXH5Wi77hWsrgSbJTKeHm2i/H4Jb57VrEGTPN+tQpI7fNrqaNiUW
+Ik65RPV4khBrMVtxKXRU971JiJYGNP16OTxr98ksHBbnEVJNUPY/mV+IAml+bB6U
+DNN1E2g8eIxXRqji5009YX6zEGdxIs1W50FvRzdLJ5vZQ+T+jtXccim2aXr31gX8
+HUN+UVwWyCg5pmZ8CRiYGJeQc4eQ5U9Ce6DFTs3RFWIqVsfNsAah1VuCNbT7p8oK
+2DvozZ/gS8EQjmESZuQQDcGMdDL1pZtzLdzpJFtqW1/gtz+aAHMa35WsNx3hAYvy
+mJMoMaL1pfdyC07FtN0dGjXCOm0nWEf+vKS+BC3cexv0i22h39vBc81BY0bzeeZw
+aDHjzhaNTuirZF10OBm11Xm3b7kCDQROsffUARAA0DrUifTrXQzqxO8aiQOC5p9T
+z25Np/Tfpv1rofOwL8VPBMvJX4P5l1V2yd70MZRUVgjmCydEyxLJ6G2YyHO2IZTE
+ajUY0Up+b3ErOpLpZwhvgWatjifpj6bBSKuDXeThqFdkphF5kAmgfVAIkan5SxWK
+3+S0V2F/oxstIViBhMhDwI6XsRlnVBoLLYcEilxA2FlRUS7MOZGmRJkRtdGD5koV
+ZSM6xVZQSmfEBaYQ/WJBGJQdPy94nnlAVn3lH3+N7pXvNUuCGV+t4YUt3tLcRuIp
+YBCOWlc7bpgeCps5Xa0dIZgJ8Louu6OBJ5vVXjPxTlkFdT0S0/uerCG51u8p6sGR
+LnUeAUGkQfIUqGUjW2rHaXgWNvzOV6i3tf9YaiXKl3avFaNW1kKBs0T5M1cnlWZU
+Utl6k04lz5OjoNY9J/bGyV3DSlkblXRMK87iLYQSrcV6cFz9PRl4vW1LGff3xRQH
+ngeN5fPxze8X5NE3hb+SSwyMSEqJxhVTXJVfQWWW0dQxP7HNwqmOWYF/6m+1gK/Y
+2gY3jAQnsWTru4RVTZGnKwEPmOCpSUvsTRXsVHgsWJ70qd0yOSjWuiv4b8vmD3+Q
+FgyvCBxPMdP3xsxN5etheLMOgRwWpLn6yNFq/xtgs+ECgG+gR78yXQyA7iCs5tFs
+2OrMqV5juSMGmn0kxJUAEQEAAYkCHwQYAQIACQUCTrH31AIbDAAKCRAgrhaS4T3e
+4BKwD/0ZOOmUNOZCSOLAMjZx3mtYtjYgfUNKi0kiYPveGoRWTqbis8UitPtNrG4X
+xgzLOijSdOEzQwkdOIp/QnZhGNssMejCnsluK0GQd+RkFVWNmcQT78hBeGcnEMAX
+ZKq7bkIKzvc06GFmkMbX/gAl6DiNGv0UNAX+5FYh+ucCJZSyAp3sA+9/LKjxnTed
+X0aygXA6rkpX0Y0FvN/9dfm47+LGq7WAqBOyYTU3E6/+Z72bZoG/cG7ANLxcPool
+LOrU43oqFnD8QwcN56y4VfFj3/jDF2MX3xu4v2OjglVjMEYHTCxP3mpxesGHuqOi
+t/FR+mF0MP9JGfj6x+bj/9JMBtCW1bY/aPeMdPGTJvXjGtOVYblGZrSjXRn5++Uu
+y36CvkcrjuziSDG+JEexGxczWwN4mrOQWhMT5Jyb+18CO+CWxJfHaYXiLEW7dI1A
+ynL4jjn4W0MSiXpWDUw+fsBOPk6ah10C4+R1Jc7dyUsKksMfvvhRX1hTIXhth85H
+16706bneTayZBhlZ/hK18uqTX+s0onG/m1F3vYvdlE4p2ts1mmixMF7KajN9/E5R
+QtiSArvKTbfsB6Two4MthIuLuf+M0mI4gPl9SPlffWCYVPhaU9o83y1KFbD/+lh1
+pjP7bEu/YudBvz7F2Myjh4/9GUAijrCTNeDTDAgvIJDjXuLXpA==
+=El1H
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 88f6a0f1..ecf0648c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+opts=pgpsigurlmangle=s/xz$/sign/,decompress,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
 https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-(.+)\.tar\.xz
-- 
2.30.0

[PATCH 2/6] debian: remove dependency on essential util-linux

[Bastian Germann]

Essential packages must not be part of Depends.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 49ffd340..34dce4d5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
 
 Package: xfsprogs
-Depends: ${shlibs:Depends}, ${misc:Depends}, python3:any, util-linux
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3:any
 Provides: fsck-backend
 Suggests: xfsdump, acl, attr, quota
 Breaks: xfsdump (<< 3.0.0)
-- 
2.30.0

Re: [PATCH 2/6] debian: remove dependency on essential util-linux

[Darrick J. Wong]

On Thu, Jan 14, 2021 at 07:37:43PM +0100, Bastian Germann wrote:
> Essential packages must not be part of Depends.
> 
> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>

/me wonders what section of the debian packaging manuals say that, but
Lintian certain complains about the unversioned dependency and I guess
we should get ourselves off the bad list[1].  IOWs, good enough for me.
:)

Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

[1] https://lintian.debian.org/tags/depends-on-essential-package-without-using-version.html

--D

> ---
>  debian/control | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/control b/debian/control
> index 49ffd340..34dce4d5 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -8,7 +8,7 @@ Standards-Version: 4.0.0
>  Homepage: https://xfs.wiki.kernel.org/
>  
>  Package: xfsprogs
> -Depends: ${shlibs:Depends}, ${misc:Depends}, python3:any, util-linux
> +Depends: ${shlibs:Depends}, ${misc:Depends}, python3:any
>  Provides: fsck-backend
>  Suggests: xfsdump, acl, attr, quota
>  Breaks: xfsdump (<< 3.0.0)
> -- 
> 2.30.0
> 

[PATCH 3/6] debian: remove "Priority: extra"

[Bastian Germann]

Priority "extra" was replaced by "optional" which is already used by the
package in general. There is one Priority extra left, so remove it.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 34dce4d5..64e01f93 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Description: Utilities for managing the XFS filesystem
 
 Package: xfslibs-dev
 Section: libdevel
-Priority: extra
 Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends}
 Breaks: xfsprogs (<< 3.0.0)
 Architecture: any
-- 
2.30.0

Re: [PATCH 3/6] debian: remove "Priority: extra"

[Darrick J. Wong]

On Thu, Jan 14, 2021 at 07:37:44PM +0100, Bastian Germann wrote:
> Priority "extra" was replaced by "optional" which is already used by the
> package in general. There is one Priority extra left, so remove it.
> 
> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>

Looks ok,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  debian/control | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/debian/control b/debian/control
> index 34dce4d5..64e01f93 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -29,7 +29,6 @@ Description: Utilities for managing the XFS filesystem
>  
>  Package: xfslibs-dev
>  Section: libdevel
> -Priority: extra
>  Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends}
>  Breaks: xfsprogs (<< 3.0.0)
>  Architecture: any
> -- 
> 2.30.0
> 

[PATCH 4/6] debian: use Package-Type over its predecessor

[Bastian Germann]

The debian/control file contains an XC-Package-Type field.
As of dpkg-dev 1.15.7, the dpkg development utilities recognize
Package-Type as an official field name.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 64e01f93..ceda0241 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Description: XFS filesystem-specific static libraries and headers
  for complete details.
 
 Package: xfsprogs-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-- 
2.30.0

Re: [PATCH 4/6] debian: use Package-Type over its predecessor

[Darrick J. Wong]

On Thu, Jan 14, 2021 at 07:37:45PM +0100, Bastian Germann wrote:
> The debian/control file contains an XC-Package-Type field.
> As of dpkg-dev 1.15.7, the dpkg development utilities recognize
> Package-Type as an official field name.
> 
> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>

LGTM,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  debian/control | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/control b/debian/control
> index 64e01f93..ceda0241 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -47,7 +47,7 @@ Description: XFS filesystem-specific static libraries and headers
>   for complete details.
>  
>  Package: xfsprogs-udeb
> -XC-Package-Type: udeb
> +Package-Type: udeb
>  Section: debian-installer
>  Architecture: any
>  Depends: ${shlibs:Depends}, ${misc:Depends}
> -- 
> 2.30.0
> 

[PATCH 5/6] debian: add missing copyright info

[Bastian Germann]

For binary distribution, the copyright info in (L)GPL licensed, compiled
files needs to be retained in the copyright file.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/copyright | 111 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 98 insertions(+), 13 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 74f4c897..c225bec3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,104 @@
-This package was debianized by Nathan Scott nathans@debian.org on
-Sun, 19 Nov 2000 07:37:09 -0500.
-
-It can be downloaded from https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xfsprogs
+Comment: This package was debianized by Nathan Scott <nathans@debian.org>
+Source: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
 
+Files: *
 Copyright:
+ 1995-2013 Silicon Graphics, Inc.
+ 2010-2018 Red Hat, Inc.
+ 2016-2020 Oracle.  All Rights Reserved.
+Comment: For most files, only one of the copyrights applies.
+License: GPL-2
+
+Files:
+ libhandle/*.c
+Copyright: 1995, 2001-2002, 2005 Silicon Graphics, Inc.
+Comment: This also applies to some header files.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; version 2.1 of the License.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details.
+ .
+ On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
+ for the complete text of the GNU Lesser General Public License.
+
+Files: config.*
+Copyright: 1992-2013 Free Software Foundation, Inc.
+License: GPL-3+ with autoconf exception
+ This file is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program.  This Exception is an additional permission under section 7
+ of the GNU General Public License, version 3 ("GPLv3").
+ .
+ On Debian systems, the full text of the GNU General Public License version 3
+ License can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: io/copy_file_range.c
+Copyright: 2016 Netapp, Inc. All rights reserved.
+License: GPL-2
 
-Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+Files: io/encrypt.c
+Copyright: 2016, 2019 Google LLC
+License: GPL-2
 
-You are free to distribute this software under the terms of
-the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+Files:
+ io/link.c
+ libxfs/xfs_iext_tree.c
+Copyright: 2014, 2017 Christoph Hellwig.
+License: GPL-2
+
+Files: io/log_writes.c
+Copyright: 2017 Intel Corporation.
+License: GPL-2
+
+Files: io/utimes.c
+Copyright: 2016 Deepa Dinamani
+License: GPL-2
+
+Files: libfrog/radix-tree.*
+Copyright:
+ 2001 Momchil Velikov
+ 2001 Christoph Hellwig
+ 2005 SGI, Christoph Lameter <clameter@sgi.com>
+License: GPL-2
 
-The library named "libhandle" and the headers in "xfslibs-dev" are
-licensed under Version 2.1 of the GNU Lesser General Public License.
-On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
-for the complete text of the GNU Lesser General Public License.
+Files: libxfs/xfs_log_rlimit.c
+Copyright: 2013 Jie Liu.
+License: GPL-2
 
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful, 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.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ License can be found in /usr/share/common-licenses/GPL-2 file.
-- 
2.30.0

[PATCH 6/6] debian: new changelog entry

[Bastian Germann]

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5d46f0a3..ce4a224d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xfsprogs (5.10.0-2) unstable; urgency=low
+
+  * Team upload
+  * debian: cryptographically verify upstream tarball (Closes: #979644)
+  * debian: remove dependency on essential util-linux
+  * debian: remove "Priority: extra"
+  * debian: use Package-Type over its predecessor
+  * debian: add missing copyright info (Closes: #979653)
+
+ -- Bastian Germann <bastiangermann@fishpost.de>  Thu, 14 Jan 2021 18:59:14 +0100
+
 xfsprogs (5.10.0-1) unstable; urgency=low
 
   * New upstream release
-- 
2.30.0

Re: [PATCH 6/6] debian: new changelog entry

[Darrick J. Wong]

On Thu, Jan 14, 2021 at 07:37:47PM +0100, Bastian Germann wrote:
> Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>

Reviewed-by: Darrick J. Wong <djwong@kernel.org>

FWIW I've been carrying a patch[1] to bump the compat level to 11 so
that the xfs_scrub systemd services can take advantage of
dh_installsystemd.  I /think/ doing so will break builds on Debian
oldstable and oldoldstable and Ubuntu 16.04, but those are now 5+
years old so maybe I should send it for reals?

--D

[1] https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfsprogs-dev.git/commit/?h=scrub-iscan-rebalance&id=d09bda8abc2c4ebcaedff4f21cbb79c79f572b0a
> ---
>  debian/changelog | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/debian/changelog b/debian/changelog
> index 5d46f0a3..ce4a224d 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,14 @@
> +xfsprogs (5.10.0-2) unstable; urgency=low
> +
> +  * Team upload
> +  * debian: cryptographically verify upstream tarball (Closes: #979644)
> +  * debian: remove dependency on essential util-linux
> +  * debian: remove "Priority: extra"
> +  * debian: use Package-Type over its predecessor
> +  * debian: add missing copyright info (Closes: #979653)
> +
> + -- Bastian Germann <bastiangermann@fishpost.de>  Thu, 14 Jan 2021 18:59:14 +0100
> +
>  xfsprogs (5.10.0-1) unstable; urgency=low
>  
>    * New upstream release
> -- 
> 2.30.0
> 

Re: [PATCH 0/6] debian: xfsprogs package clean-up

[Nathan Scott]

Heya,

On Fri, Jan 15, 2021 at 5:39 AM Bastian Germann
<bastiangermann@fishpost.de> wrote:
>
> Apply some minor changes to the xfsprogs debian packages, including
> missing copyright notices that are required by Debian Policy.
>
> Bastian Germann (6):
>   debian: cryptographically verify upstream tarball
>   debian: remove dependency on essential util-linux
>   debian: remove "Priority: extra"
>   debian: use Package-Type over its predecessor
>   debian: add missing copyright info
>   debian: new changelog entry

Having reviewed each of these, please add for each:

Signed-off-by: Nathan Scott <nathans@debian.org>


Also, please add Bastion to the list of deb uploaders - thanks!

diff --git a/debian/control b/debian/control
index 49ffd340..06b92400 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfsprogs
 Section: admin
 Priority: optional
 Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
-Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar
<anibal@debian.org>
+Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar
<anibal@debian.org>, Bastian Germann <bastiangermann@fishpost.de>
 Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>=
5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17),
linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python,
pkg-config
 Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/

Re: [PATCH 0/6] debian: xfsprogs package clean-up

[Darrick J. Wong]

On Fri, Jan 15, 2021 at 02:40:39PM +1100, Nathan Scott wrote:
> Heya,
> 
> On Fri, Jan 15, 2021 at 5:39 AM Bastian Germann
> <bastiangermann@fishpost.de> wrote:
> >
> > Apply some minor changes to the xfsprogs debian packages, including
> > missing copyright notices that are required by Debian Policy.
> >
> > Bastian Germann (6):
> >   debian: cryptographically verify upstream tarball
> >   debian: remove dependency on essential util-linux
> >   debian: remove "Priority: extra"
> >   debian: use Package-Type over its predecessor
> >   debian: add missing copyright info
> >   debian: new changelog entry
> 
> Having reviewed each of these, please add for each:
> 
> Signed-off-by: Nathan Scott <nathans@debian.org>

Assuming that SOB also applies to the patch below, someone please add a
commit message, and:

Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D


> 
> 
> Also, please add Bastion to the list of deb uploaders - thanks!
> 
> diff --git a/debian/control b/debian/control
> index 49ffd340..06b92400 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,7 +2,7 @@ Source: xfsprogs
>  Section: admin
>  Priority: optional
>  Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
> -Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar
> <anibal@debian.org>
> +Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar
> <anibal@debian.org>, Bastian Germann <bastiangermann@fishpost.de>
>  Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>=
> 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17),
> linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python,
> pkg-config
>  Standards-Version: 4.0.0
>  Homepage: https://xfs.wiki.kernel.org/
> 

Re: [PATCH 0/6] debian: xfsprogs package clean-up

[Eric Sandeen]

On 1/14/21 10:14 PM, Darrick J. Wong wrote:
> On Fri, Jan 15, 2021 at 02:40:39PM +1100, Nathan Scott wrote:
>> Heya,
>>
>> On Fri, Jan 15, 2021 at 5:39 AM Bastian Germann
>> <bastiangermann@fishpost.de> wrote:
>>>
>>> Apply some minor changes to the xfsprogs debian packages, including
>>> missing copyright notices that are required by Debian Policy.
>>>
>>> Bastian Germann (6):
>>>   debian: cryptographically verify upstream tarball
>>>   debian: remove dependency on essential util-linux
>>>   debian: remove "Priority: extra"
>>>   debian: use Package-Type over its predecessor
>>>   debian: add missing copyright info
>>>   debian: new changelog entry
>>
>> Having reviewed each of these, please add for each:
>>
>> Signed-off-by: Nathan Scott <nathans@debian.org>
> 
> Assuming that SOB also applies to the patch below, someone please add a
> commit message, and:
> 
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>

Will do.  Nathan, it's easier if you send a proper patch ;)

Thanks,
-Eric

Re: [PATCH 0/6] debian: xfsprogs package clean-up

[Eric Sandeen]

On 1/14/21 9:40 PM, Nathan Scott wrote:
> Heya,
> 
> On Fri, Jan 15, 2021 at 5:39 AM Bastian Germann
> <bastiangermann@fishpost.de> wrote:
>>
>> Apply some minor changes to the xfsprogs debian packages, including
>> missing copyright notices that are required by Debian Policy.
>>
>> Bastian Germann (6):
>>   debian: cryptographically verify upstream tarball
>>   debian: remove dependency on essential util-linux
>>   debian: remove "Priority: extra"
>>   debian: use Package-Type over its predecessor
>>   debian: add missing copyright info
>>   debian: new changelog entry
> 
> Having reviewed each of these, please add for each:
> 
> Signed-off-by: Nathan Scott <nathans@debian.org>

Do you maybe mean Reviewed-by: ?

-Eric

Re: [PATCH 0/6] debian: xfsprogs package clean-up

[Bastian Germann]

[-- Attachment #1.1: Type: text/plain, Size: 1842 bytes --]

Am 15.01.21 um 04:40 schrieb Nathan Scott:
> Heya,
> 
> On Fri, Jan 15, 2021 at 5:39 AM Bastian Germann
> <bastiangermann@fishpost.de> wrote:
>>
>> Apply some minor changes to the xfsprogs debian packages, including
>> missing copyright notices that are required by Debian Policy.
>>
>> Bastian Germann (6):
>>    debian: cryptographically verify upstream tarball
>>    debian: remove dependency on essential util-linux
>>    debian: remove "Priority: extra"
>>    debian: use Package-Type over its predecessor
>>    debian: add missing copyright info
>>    debian: new changelog entry
> 
> Having reviewed each of these, please add for each:
> 
> Signed-off-by: Nathan Scott <nathans@debian.org>
> 
> 
> Also, please add Bastion to the list of deb uploaders - thanks!

Hi Nathan,

There is no point in adding me unless you allow uploads for my key
2861 2573 17C7 AEE4 F880  497E C386 0AC5 9F57 4E3A via

https://wiki.debian.org/DebianMaintainer#Granting_Permissions

Thanks,
Bastian

> 
> diff --git a/debian/control b/debian/control
> index 49ffd340..06b92400 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -2,7 +2,7 @@ Source: xfsprogs
>   Section: admin
>   Priority: optional
>   Maintainer: XFS Development Team <linux-xfs@vger.kernel.org>
> -Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar
> <anibal@debian.org>
> +Uploaders: Nathan Scott <nathans@debian.org>, Anibal Monsalve Salazar
> <anibal@debian.org>, Bastian Germann <bastiangermann@fishpost.de>
>   Build-Depends: libinih-dev, uuid-dev, dh-autoreconf, debhelper (>=
> 5), gettext, libtool, libedit-dev, libblkid-dev (>= 2.17),
> linux-libc-dev, libdevmapper-dev, libattr1-dev, libicu-dev, dh-python,
> pkg-config
>   Standards-Version: 4.0.0
>   Homepage: https://xfs.wiki.kernel.org/
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 665 bytes --]

Re: [PATCH 0/6] debian: xfsprogs package clean-up

[Nathan Scott]

Hi Bastian,

On Sat, Jan 16, 2021 at 8:34 PM Bastian Germann
<bastiangermann@fishpost.de> wrote:
> [...]
> There is no point in adding me unless you allow uploads for my key
> 2861 2573 17C7 AEE4 F880  497E C386 0AC5 9F57 4E3A via
>

Will do, thanks for the pointer.

cheers.

--
Nathan

[PATCH v2 0/6] debian: xfsprogs package clean-up

[Bastian Germann]

Apply some minor changes to the xfsprogs debian packages, including
missing copyright notices that are required by Debian Policy.

v2:
  resend with Reviewed-by annotations applied, Nathan actually sent:
  "Signed-off-by: Nathan Scott <nathans@debian.org>"

Bastian Germann (6):
  debian: cryptographically verify upstream tarball
  debian: remove dependency on essential util-linux
  debian: remove "Priority: extra"
  debian: use Package-Type over its predecessor
  debian: add missing copyright info
  debian: new changelog entry

 debian/changelog                |  11 ++++
 debian/control                  |   5 +-
 debian/copyright                | 111 ++++++++++++++++++++++++++++----
 debian/upstream/signing-key.asc |  63 ++++++++++++++++++
 debian/watch                    |   2 +-
 5 files changed, 175 insertions(+), 17 deletions(-)
 create mode 100644 debian/upstream/signing-key.asc

-- 
2.30.0

[PATCH v2 1/6] debian: cryptographically verify upstream tarball

[Bastian Germann]

Debian's uscan utility can verify a downloaded tarball. As the
uncompressed tarball is signed, the decompress rule has to be applied.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Nathan Scott <nathans@debian.org>
---
 debian/upstream/signing-key.asc | 63 +++++++++++++++++++++++++++++++++
 debian/watch                    |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 debian/upstream/signing-key.asc

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 00000000..5a9ec9b8
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=El1H
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 88f6a0f1..ecf0648c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+opts=pgpsigurlmangle=s/xz$/sign/,decompress,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
 https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-(.+)\.tar\.xz
-- 
2.30.0

[PATCH v2 2/6] debian: remove dependency on essential util-linux

[Bastian Germann]

Essential packages must not be part of Depends.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 49ffd340..34dce4d5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 4.0.0
 Homepage: https://xfs.wiki.kernel.org/
 
 Package: xfsprogs
-Depends: ${shlibs:Depends}, ${misc:Depends}, python3:any, util-linux
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3:any
 Provides: fsck-backend
 Suggests: xfsdump, acl, attr, quota
 Breaks: xfsdump (<< 3.0.0)
-- 
2.30.0

[PATCH v2 3/6] debian: remove "Priority: extra"

[Bastian Germann]

Priority "extra" was replaced by "optional" which is already used by the
package in general. There is one Priority extra left, so remove it.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index 34dce4d5..64e01f93 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Description: Utilities for managing the XFS filesystem
 
 Package: xfslibs-dev
 Section: libdevel
-Priority: extra
 Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends}
 Breaks: xfsprogs (<< 3.0.0)
 Architecture: any
-- 
2.30.0

[PATCH v2 4/6] debian: use Package-Type over its predecessor

[Bastian Germann]

The debian/control file contains an XC-Package-Type field.
As of dpkg-dev 1.15.7, the dpkg development utilities recognize
Package-Type as an official field name.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 64e01f93..ceda0241 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Description: XFS filesystem-specific static libraries and headers
  for complete details.
 
 Package: xfsprogs-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
 Section: debian-installer
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-- 
2.30.0

[PATCH v2 5/6] debian: add missing copyright info

[Bastian Germann]

For binary distribution, the copyright info in (L)GPL licensed, compiled
files needs to be retained in the copyright file.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
---
 debian/copyright | 111 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 98 insertions(+), 13 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 74f4c897..c225bec3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,19 +1,104 @@
-This package was debianized by Nathan Scott nathans@debian.org on
-Sun, 19 Nov 2000 07:37:09 -0500.
-
-It can be downloaded from https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: xfsprogs
+Comment: This package was debianized by Nathan Scott <nathans@debian.org>
+Source: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/
 
+Files: *
 Copyright:
+ 1995-2013 Silicon Graphics, Inc.
+ 2010-2018 Red Hat, Inc.
+ 2016-2020 Oracle.  All Rights Reserved.
+Comment: For most files, only one of the copyrights applies.
+License: GPL-2
+
+Files:
+ libhandle/*.c
+Copyright: 1995, 2001-2002, 2005 Silicon Graphics, Inc.
+Comment: This also applies to some header files.
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; version 2.1 of the License.
+ .
+ This library is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details.
+ .
+ On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
+ for the complete text of the GNU Lesser General Public License.
+
+Files: config.*
+Copyright: 1992-2013 Free Software Foundation, Inc.
+License: GPL-3+ with autoconf exception
+ This file is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program.  This Exception is an additional permission under section 7
+ of the GNU General Public License, version 3 ("GPLv3").
+ .
+ On Debian systems, the full text of the GNU General Public License version 3
+ License can be found in /usr/share/common-licenses/GPL-3 file.
+
+Files: io/copy_file_range.c
+Copyright: 2016 Netapp, Inc. All rights reserved.
+License: GPL-2
 
-Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+Files: io/encrypt.c
+Copyright: 2016, 2019 Google LLC
+License: GPL-2
 
-You are free to distribute this software under the terms of
-the GNU General Public License.
-On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+Files:
+ io/link.c
+ libxfs/xfs_iext_tree.c
+Copyright: 2014, 2017 Christoph Hellwig.
+License: GPL-2
+
+Files: io/log_writes.c
+Copyright: 2017 Intel Corporation.
+License: GPL-2
+
+Files: io/utimes.c
+Copyright: 2016 Deepa Dinamani
+License: GPL-2
+
+Files: libfrog/radix-tree.*
+Copyright:
+ 2001 Momchil Velikov
+ 2001 Christoph Hellwig
+ 2005 SGI, Christoph Lameter <clameter@sgi.com>
+License: GPL-2
 
-The library named "libhandle" and the headers in "xfslibs-dev" are
-licensed under Version 2.1 of the GNU Lesser General Public License.
-On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
-for the complete text of the GNU Lesser General Public License.
+Files: libxfs/xfs_log_rlimit.c
+Copyright: 2013 Jie Liu.
+License: GPL-2
 
+License: GPL-2
+ This program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful, 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.
+ .
+ You should have received a copy of the GNU General Public License along with
+ this package; if not, write to the Free Software Foundation, Inc., 51 Franklin
+ St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ License can be found in /usr/share/common-licenses/GPL-2 file.
-- 
2.30.0

[PATCH v2 6/6] debian: new changelog entry

[Bastian Germann]

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Nathan Scott <nathans@debian.org>
---
 debian/changelog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5d46f0a3..ce4a224d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xfsprogs (5.10.0-2) unstable; urgency=low
+
+  * Team upload
+  * debian: cryptographically verify upstream tarball (Closes: #979644)
+  * debian: remove dependency on essential util-linux
+  * debian: remove "Priority: extra"
+  * debian: use Package-Type over its predecessor
+  * debian: add missing copyright info (Closes: #979653)
+
+ -- Bastian Germann <bastiangermann@fishpost.de>  Thu, 14 Jan 2021 18:59:14 +0100
+
 xfsprogs (5.10.0-1) unstable; urgency=low
 
   * New upstream release
-- 
2.30.0

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Eric Sandeen]

On 1/16/21 3:23 AM, Bastian Germann wrote:
> Apply some minor changes to the xfsprogs debian packages, including
> missing copyright notices that are required by Debian Policy.
> 
> v2:
>   resend with Reviewed-by annotations applied, Nathan actually sent:
>   "Signed-off-by: Nathan Scott <nathans@debian.org>"

Heya Nate - please confirm that this was your intent.

-Eric

> 
> Bastian Germann (6):
>   debian: cryptographically verify upstream tarball
>   debian: remove dependency on essential util-linux
>   debian: remove "Priority: extra"
>   debian: use Package-Type over its predecessor
>   debian: add missing copyright info
>   debian: new changelog entry
> 
>  debian/changelog                |  11 ++++
>  debian/control                  |   5 +-
>  debian/copyright                | 111 ++++++++++++++++++++++++++++----
>  debian/upstream/signing-key.asc |  63 ++++++++++++++++++
>  debian/watch                    |   2 +-
>  5 files changed, 175 insertions(+), 17 deletions(-)
>  create mode 100644 debian/upstream/signing-key.asc
> 

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Nathan Scott]

On Sun, Jan 17, 2021 at 12:09 PM Eric Sandeen <sandeen@sandeen.net> wrote:
>
>
>
> On 1/16/21 3:23 AM, Bastian Germann wrote:
> > Apply some minor changes to the xfsprogs debian packages, including
> > missing copyright notices that are required by Debian Policy.
> >
> > v2:
> >   resend with Reviewed-by annotations applied, Nathan actually sent:
> >   "Signed-off-by: Nathan Scott <nathans@debian.org>"
>
> Heya Nate - please confirm that this was your intent.
>

Yep - thanks!

cheers.

--
Nathan

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Eric Sandeen]

On 1/16/21 3:23 AM, Bastian Germann wrote:
> Apply some minor changes to the xfsprogs debian packages, including
> missing copyright notices that are required by Debian Policy.
> 
> v2:
>   resend with Reviewed-by annotations applied, Nathan actually sent:
>   "Signed-off-by: Nathan Scott <nathans@debian.org>"

I've pushed these, plus Nathan's patch to add you to Uploaders

Thanks,
-Eric

> Bastian Germann (6):
>   debian: cryptographically verify upstream tarball
>   debian: remove dependency on essential util-linux
>   debian: remove "Priority: extra"
>   debian: use Package-Type over its predecessor
>   debian: add missing copyright info
>   debian: new changelog entry
> 
>  debian/changelog                |  11 ++++
>  debian/control                  |   5 +-
>  debian/copyright                | 111 ++++++++++++++++++++++++++++----
>  debian/upstream/signing-key.asc |  63 ++++++++++++++++++
>  debian/watch                    |   2 +-
>  5 files changed, 175 insertions(+), 17 deletions(-)
>  create mode 100644 debian/upstream/signing-key.asc
> 

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Bastian Germann]

Am 18.01.21 um 22:33 schrieb Eric Sandeen:
> On 1/16/21 3:23 AM, Bastian Germann wrote:
>> Apply some minor changes to the xfsprogs debian packages, including
>> missing copyright notices that are required by Debian Policy.
>>
>> v2:
>>    resend with Reviewed-by annotations applied, Nathan actually sent:
>>    "Signed-off-by: Nathan Scott <nathans@debian.org>"
> 
> I've pushed these, plus Nathan's patch to add you to Uploaders

Thanks! It would be great to have a 5.10.0 version available in Debian 
bullseye. Currently, it has 5.6.0. The freeze is in three weeks, so to 
give the package time to migrate it should be uploaded in January.

> 
> Thanks,
> -Eric
> 
>> Bastian Germann (6):
>>    debian: cryptographically verify upstream tarball
>>    debian: remove dependency on essential util-linux
>>    debian: remove "Priority: extra"
>>    debian: use Package-Type over its predecessor
>>    debian: add missing copyright info
>>    debian: new changelog entry
>>
>>   debian/changelog                |  11 ++++
>>   debian/control                  |   5 +-
>>   debian/copyright                | 111 ++++++++++++++++++++++++++++----
>>   debian/upstream/signing-key.asc |  63 ++++++++++++++++++
>>   debian/watch                    |   2 +-
>>   5 files changed, 175 insertions(+), 17 deletions(-)
>>   create mode 100644 debian/upstream/signing-key.asc
>>

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Eric Sandeen]

On 1/19/21 9:02 AM, Bastian Germann wrote:
> Am 18.01.21 um 22:33 schrieb Eric Sandeen:
>> On 1/16/21 3:23 AM, Bastian Germann wrote:
>>> Apply some minor changes to the xfsprogs debian packages, including
>>> missing copyright notices that are required by Debian Policy.
>>>
>>> v2:
>>>    resend with Reviewed-by annotations applied, Nathan actually sent:
>>>    "Signed-off-by: Nathan Scott <nathans@debian.org>"
>>
>> I've pushed these, plus Nathan's patch to add you to Uploaders
> 
> Thanks! It would be great to have a 5.10.0 version available in Debian bullseye. Currently, it has 5.6.0. The freeze is in three weeks, so to give the package time to migrate it should be uploaded in January.

It's not clear to me who you're asking to do this, but I'm
afraid it's not my role (or my ability). :)

-Eric

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Bastian Germann]

Am 19.01.21 um 18:07 schrieb Eric Sandeen:
> On 1/19/21 9:02 AM, Bastian Germann wrote:
>> Thanks! It would be great to have a 5.10.0 version available in Debian bullseye. Currently, it has 5.6.0. The freeze is in three weeks, so to give the package time to migrate it should be uploaded in January.
> 
> It's not clear to me who you're asking to do this, but I'm
> afraid it's not my role (or my ability). :)
> 
> -Eric
> 

Nathan uploaded most of the versions, so I guess he can upload.
The Debian package is "team maintained" though with this list address as 
recorded maintainer.

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Nathan Scott]

Hey all,

On Wed, Jan 20, 2021 at 4:16 AM Bastian Germann
<bastiangermann@fishpost.de> wrote:
> [...]
> Nathan uploaded most of the versions, so I guess he can upload.
> The Debian package is "team maintained" though with this list address as
> recorded maintainer.
>

You should have the necessary permissions to do uploads since
yesterday Bastian - is that not the case?

BTW Eric, not directly related but I think the -rc versions being
added to the debian/changelog can lead to some confusion - I *think*
dpkg finds that version suffix to be more recent than the actual
release version string (seems odd, but that seemed to be the behaviour
I observed recently).  Could the release script(s) skip adding -rc
versions to debian/changelog?

cheers.

--
Nathan

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Bastian Germann]

Am 19.01.21 um 22:26 schrieb Nathan Scott:
> You should have the necessary permissions to do uploads since
> yesterday Bastian - is that not the case?

I just checked. Yes, it is the case. However, I was not notified about 
the upload permissions, which usually is the case. Thanks.

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Darrick J. Wong]

On Wed, Jan 20, 2021 at 08:26:45AM +1100, Nathan Scott wrote:
> Hey all,
> 
> On Wed, Jan 20, 2021 at 4:16 AM Bastian Germann
> <bastiangermann@fishpost.de> wrote:
> > [...]
> > Nathan uploaded most of the versions, so I guess he can upload.
> > The Debian package is "team maintained" though with this list address as
> > recorded maintainer.
> >
> 
> You should have the necessary permissions to do uploads since
> yesterday Bastian - is that not the case?
> 
> BTW Eric, not directly related but I think the -rc versions being
> added to the debian/changelog can lead to some confusion - I *think*
> dpkg finds that version suffix to be more recent than the actual
> release version string (seems odd, but that seemed to be the behaviour
> I observed recently).  Could the release script(s) skip adding -rc
> versions to debian/changelog?

The release maintainer could also skip adding the ~rc tags to
debian/changelog since it's not like we're going to upload /that/ into
debian anyway.  All of my internal builds add their own tag with dch, so
it wouldn't matter much to me.

(But let's see if Dave has opinions...)

--D

> cheers.
> 
> --
> Nathan
> 

Re: [PATCH v2 0/6] debian: xfsprogs package clean-up

[Eric Sandeen]

On 1/19/21 3:26 PM, Nathan Scott wrote:
> Hey all,
> 
> On Wed, Jan 20, 2021 at 4:16 AM Bastian Germann
> <bastiangermann@fishpost.de> wrote:
>> [...]
>> Nathan uploaded most of the versions, so I guess he can upload.
>> The Debian package is "team maintained" though with this list address as
>> recorded maintainer.
>>
> 
> You should have the necessary permissions to do uploads since
> yesterday Bastian - is that not the case?
> 
> BTW Eric, not directly related but I think the -rc versions being
> added to the debian/changelog can lead to some confusion - I *think*
> dpkg finds that version suffix to be more recent than the actual
> release version string (seems odd, but that seemed to be the behaviour
> I observed recently).  Could the release script(s) skip adding -rc
> versions to debian/changelog?

Er, I got yelled at (in the nicest possible way of course) for
/omitting/ -rc versions from the changelog, IIRC.

Tell me more about how upstream should be maintaining distro-specific
metadata?  :/

-Eric