[Piuparts-devel] [Git][debian/piuparts][master] 11 commits: Start 1.1.7 development.
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed Jan 18 21:51:14 GMT 2023
Holger Levsen pushed to branch master at Debian / piuparts
Commits:
5b5a213d by Holger Levsen at 2023-01-11T15:57:37+01:00
Start 1.1.7 development.
d/changelog entries will be written on release
using the git commit messages.
Use 'gbp dch --since debian/1.1.6'
to write d/changelog entries since that last release.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
1190e637 by Holger Levsen at 2023-01-11T15:58:23+01:00
Bump standards version to 4.6.2, no changes needed.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
320b7cbb by Nicolas Dandrimont at 2023-01-11T16:15:00+01:00
Makefile: use dpkg-parsechangelog -S instead of sed
- - - - -
f5dc1171 by Holger Levsen at 2023-01-18T11:25:49+01:00
Add debian/source/lintian-overrides to override a bunch of very-long-line-length-in-source-file warnings
I fail to understand why the 4th one isn't working.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
c08f7a71 by Holger Levsen at 2023-01-18T12:32:10+01:00
d/control: fix cute-field warning, thanks lintian.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
838f800f by Holger Levsen at 2023-01-18T13:23:50+01:00
Bump standards version to 4.6.2, no changes needed.
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
d4c2447a by Holger Levsen at 2023-01-18T13:37:13+01:00
d/piuparts.lintian-overrides: add debian-news-entry-has-unknown-version 0.45 due to trimmed d/chanelog in binary packages
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
bb6dd5b1 by Holger Levsen at 2023-01-18T13:43:42+01:00
Drop unused d./piuparts-(master|slave).lintian-overrides
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
25138b9b by Holger Levsen at 2023-01-18T15:50:17+01:00
d/control: remove version constraints on the depens on python3-debianbts, debootstrap amd debsums as they are met since (at least) buster
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
402a97af by Holger Levsen at 2023-01-18T20:58:09+01:00
piuparts.py, tests and docs: handle new "non-free-firmware" section in Debian. Closes: #1028661.
(Strictly speaking this is only used for bookworm, unstable, experimental and
later suites like trixie, but specifying which suite has which sections is
out of scope for piuparts itself.)
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
8c272296 by Holger Levsen at 2023-01-18T22:45:24+01:00
release as 1.1.7
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
11 changed files:
- Makefile
- debian/changelog
- debian/control
- − debian/piuparts-master.lintian-overrides
- − debian/piuparts-slave.lintian-overrides
- debian/piuparts.lintian-overrides
- + debian/source/lintian-overrides
- docs/README_server.txt
- docs/piuparts/piuparts.1.txt
- piuparts.py
- tests/test_piuparts.py
Changes:
=====================================
Makefile
=====================================
@@ -10,11 +10,11 @@ site3 = $(libdir)/python3/dist-packages
htdocsdir = $(sharedir)/piuparts/htdocs
etcdir = $(prefix)/etc
-distribution=${shell dpkg-parsechangelog | sed -n 's/^Distribution: *//p'}
+distribution=${shell dpkg-parsechangelog -SDistribution}
ifeq ($(distribution),UNRELEASED)
-version := ${shell echo "`dpkg-parsechangelog | sed -n 's/^Version: *//p'`~`date +%Y%m%d%H%M`~`git describe --dirty`"}
+version := ${shell echo "`dpkg-parsechangelog -SVersion`~`date +%Y%m%d%H%M`~`git describe --dirty`"}
else
-version := ${shell dpkg-parsechangelog | sed -n 's/^Version: *//p'}
+version := ${shell dpkg-parsechangelog -SVersion}
endif
=====================================
debian/changelog
=====================================
@@ -1,30 +1,51 @@
+piuparts (1.1.7) unstable; urgency=medium
+
+ [ Holger Levsen ]
+ * piuparts.py, tests and docs: handle new "non-free-firmware" section in
+ Debian. Closes: #1028661.
+ * d/control:
+ - remove version constraints on the (build-)depends on python3-debianbts,
+ debootstrap amd debsums as they are met since (at least) buster.
+ - fix cute-field warning, thanks lintian.
+ - bump standards version to 4.6.2, no changes needed.
+ * Add debian/source/lintian-overrides to override a bunch of very-long-line-
+ length-in-source-file warnings.
+ * d/piuparts.lintian-overrides: add debian-news-entry-has-unknown-version
+ 0.45 due to trimmed d/chanelog in binary packages.
+ * Drop unused d./piuparts-(master|slave).lintian-overrides.
+
+ [ Nicolas Dandrimont ]
+ * Makefile: use dpkg-parsechangelog -S instead of sed.
+
+ -- Holger Levsen <holger at debian.org> Wed, 18 Jan 2023 22:45:04 +0100
+
piuparts (1.1.6) unstable; urgency=medium
[ David Steele ]
- * Remove oldold*stable dists from json summary
+ * Remove oldold*stable dists from json summary.
[ Holger Levsen ]
- * custom-scripts/scripts/pre_test_root_password: fix grammar in comment
+ * custom-scripts/scripts/pre_test_root_password: fix grammar in comment.
[ Luca Boccassi ]
- * piuparts: detect files moving between / and /usr on upgrade
- * piuparts: detect files moving between / and /usr on dist-upgrade
- * p.conf: enable --warn-on-usr-move for bullseye/bookworm
+ * piuparts: detect files moving between / and /usr on upgrade.
+ * piuparts: detect files moving between / and /usr on dist-upgrade.
+ * p.conf: enable --warn-on-usr-move for bullseye/bookworm.
* custom_scripts: ensure usr-is-merged/usrmerge does not fail the
- migration test
+ migration test.
[ David Steele ]
- * Add Stable Release tasks to README_pejacevic.txt
+ * Add Stable Release tasks to README_pejacevic.txt.
[ Nicolas Dandrimont ]
- * piuparts-slave: run isort
- * piuparts-slave: replace pipes.quote with shlex.quote
- * piuparts.py: run isort
- * piuparts.py: replace pipes.quote with shlex.quote
+ * piuparts-slave: run isort.
+ * piuparts-slave: replace pipes.quote with shlex.quote.
+ * piuparts.py: run isort.
+ * piuparts.py: replace pipes.quote with shlex.quote.
* test_piuparts: replace mox3 with unittest.mock (Closes: #1028453)
- * Migrate lintian overrides to pointed hints
- * Simplify docs install in Makefile
- * Use sphinxdoc dh plugin
+ * Migrate lintian overrides to pointed hints.
+ * Simplify docs install in Makefile.
+ * Use sphinxdoc dh plugin.
-- Nicolas Dandrimont <olasd at debian.org> Wed, 11 Jan 2023 13:31:41 +0100
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Nicolas Dandrimont <olasd at debian.org>,
Holger Levsen <holger at debian.org>
Section: devel
Priority: optional
-Standards-Version: 4.5.1
+Standards-Version: 4.6.2
Rules-Requires-Root: no
Build-Depends:
debhelper-compat (= 12),
@@ -13,7 +13,7 @@ Build-Depends:
python3-all,
python3-apt,
python3-debian,
- python3-debianbts (>= 2.10.0),
+ python3-debianbts,
python3-distro-info,
python3-nose,
python3-six,
@@ -25,15 +25,15 @@ Build-Depends-Indep:
Homepage: https://piuparts.debian.org
Vcs-Git: https://salsa.debian.org/debian/piuparts.git
Vcs-Browser: https://salsa.debian.org/debian/piuparts
-Xs-Go-Import-Path: salsa.debian.org/debian/piuparts
+XS-Go-Import-Path: salsa.debian.org/debian/piuparts
Package: piuparts
Architecture: all
Depends:
piuparts-common (= ${binary:Version}),
# keep this list in sync with piuparts-slave-from-git-deps
- debootstrap (>= 1.0.89~),
- debsums (>= 2.2.2~),
+ debootstrap,
+ debsums,
lsb-release,
lsof,
mount,
@@ -66,7 +66,7 @@ Depends:
# keep this list in sync with piuparts-master-from-git-deps
adduser,
openssh-server,
- python3-debianbts (>= 2.10.0),
+ python3-debianbts,
python3-setproctitle,
tango-icon-theme,
xz-utils,
@@ -99,7 +99,7 @@ Depends:
# this list is synced from piuparts-master
adduser,
openssh-server,
- python3-debianbts (>= 2.10.0),
+ python3-debianbts,
python3-setproctitle,
tango-icon-theme,
xz-utils,
@@ -156,8 +156,8 @@ Depends:
screen,
sudo,
# this list is synced from piuparts
- debootstrap (>= 1.0.89~),
- debsums (>= 2.2.2~),
+ debootstrap,
+ debsums,
libjs-sphinxdoc,
lsb-release,
lsof,
=====================================
debian/piuparts-master.lintian-overrides deleted
=====================================
@@ -1,5 +0,0 @@
-# It's ok, because it depends on piuparts-common that has the dependency..
-piuparts-master: python3-script-but-no-python3-dep usr/share/piuparts/master/detect_well_known_errors #!/usr/bin/python3
-piuparts-master: python3-script-but-no-python3-dep usr/share/piuparts/piuparts-analyze #!/usr/bin/python3
-piuparts-master: python3-script-but-no-python3-dep usr/share/piuparts/piuparts-master-backend #!/usr/bin/python3
-piuparts-master: python3-script-but-no-python3-dep usr/share/piuparts/piuparts-report #!/usr/bin/python3
=====================================
debian/piuparts-slave.lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-# It's ok, because it depends on piuparts-common that has the dependency..
-piuparts-slave: python3-script-but-no-python3-dep usr/share/piuparts/piuparts-slave #!/usr/bin/python3
=====================================
debian/piuparts.lintian-overrides
=====================================
@@ -4,3 +4,4 @@ uses-dpkg-database-directly [etc/piuparts/scripts-debug-remove/pre_remove_prerm_
uses-dpkg-database-directly [etc/piuparts/scripts/post_remove_exceptions]
uses-dpkg-database-directly [etc/piuparts/scripts/pre_remove_40_find_missing_md5sums]
uses-dpkg-database-directly [usr/sbin/piuparts]
+debian-news-entry-has-unknown-version 0.45 [usr/share/doc/piuparts/NEWS.Debian.gz:1]
=====================================
debian/source/lintian-overrides
=====================================
@@ -0,0 +1,4 @@
+very-long-line-length-in-source-file 650 > 512 [htdocs/news.tpl:214]
+very-long-line-length-in-source-file 671 > 512 [htdocs/index.tpl:46]
+very-long-line-length-in-source-file 777 > 512 [docs/piuparts/piuparts.1.txt:27]
+very-long-line-length-in-source-file 515 > 512 [known_problems/db_setup_issue.conf:4]
=====================================
docs/README_server.txt
=====================================
@@ -480,7 +480,7 @@ section, too, and will serve as defaults for all other sections
* "area" is the archive area used to get the list of packages to
be tested. The Packages file for this area will be loaded. The
default is "main" and the possible values depend on the vendor,
- for Debian these are main, contrib, non-free.
+ for Debian these are main, contrib, non-free and non-free-firmware.
* "components" sets the archive areas that will be available when
testing the packages selected via the "area" setting. These will
=====================================
docs/piuparts/piuparts.1.txt
=====================================
@@ -3,7 +3,7 @@
piuparts(1)
===========
:doctype: manpage
- :revdate: 2017-03-06
+ :revdate: 2023-01-18
@@ -189,7 +189,7 @@ Options must come before the other command line arguments.
*-m* 'url', *-*-mirror*='url'::
Which Debian mirror to use. The default is the first mirror named in */etc/apt/sources.list* or *http://deb.debian.org/debian* if none is found. This option may be used multiple times to use multiple mirrors. Only the first mirror is used with *debootstrap*.
- The 'components' that are used for a mirror can also be set with this option: a space separated list within the same argument (so you need to quote the entire argument in the shell). If no components are given explicitly, the usual Debian components are used (main, contrib, and non-free). For the mirrors read from */etc/apt/sources.list*, the components are read from the same place.
+ The 'components' that are used for a mirror can also be set with this option: a space separated list within the same argument (so you need to quote the entire argument in the shell). If no components are given explicitly, the usual Debian components are used (main, contrib, non-free and non-free-firmware). For the mirrors read from */etc/apt/sources.list*, the components are read from the same place.
Note that file: addresses works if the directories are made accessible from within the chroot with '--bindmount'.
=====================================
piuparts.py
=====================================
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
#
# Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright © 2007-2018 Holger Levsen (holger at layer-acht.org)
+# Copyright © 2007-2023 Holger Levsen (holger at layer-acht.org)
# Copyright © 2010-2019 Andreas Beckmann (anbe at debian.org)
#
# This program is free software; you can redistribute it and/or modify it
@@ -101,7 +101,7 @@ class Defaults:
class DebianDefaults(Defaults):
def get_components(self):
- return ["main", "contrib", "non-free"]
+ return ["main", "contrib", "non-free", "non-free-firmware"]
def get_mirror(self):
return [("http://deb.debian.org/debian", self.get_components())]
=====================================
tests/test_piuparts.py
=====================================
@@ -23,10 +23,10 @@ class DefaultsFactoryTests(unittest.TestCase):
self.assertEqual(
defaults.get_keyring(), "/usr/share/keyrings/debian-archive-keyring.gpg"
)
- self.assertEqual(defaults.get_components(), ["main", "contrib", "non-free"])
+ self.assertEqual(defaults.get_components(), ["main", "contrib", "non-free", "non-free-firmware"])
self.assertEqual(
defaults.get_mirror(),
- [("http://deb.debian.org/debian", ["main", "contrib", "non-free"])],
+ [("http://deb.debian.org/debian", ["main", "contrib", "non-free", "non-free-firmware"])],
)
self.assertEqual(defaults.get_distribution(), ["sid"])
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/fbca117e15ad105e1560abd1fdc77e63864f00e5...8c272296e253a82db6e50cf939d6bad941da99f7
--
View it on GitLab: https://salsa.debian.org/debian/piuparts/-/compare/fbca117e15ad105e1560abd1fdc77e63864f00e5...8c272296e253a82db6e50cf939d6bad941da99f7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20230118/f4fc8cf1/attachment-0001.htm>
More information about the Piuparts-devel
mailing list