diff -Nru puppet-lint-4.2.4/debian/changelog puppet-lint-4.2.4/debian/changelog
--- puppet-lint-4.2.4/debian/changelog	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/changelog	2024-02-22 05:30:18.000000000 +0000
@@ -1,3 +1,16 @@
+puppet-lint (4.2.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * generate manpage using help2man
+  * d/control: streamline build-deps
+  * d/control: drop obsolete XB-Ruby-Versions field
+  * d/copyright: set field Upstream-Contact
+  * d/upstream: remove obsolete fields Contact, Name
+  * update upstream github namespace to puppetlabs
+  * drop obsolete d/clean
+
+ -- Jérôme Charaoui <jerome@riseup.net>  Thu, 22 Feb 2024 00:30:18 -0500
+
 puppet-lint (4.2.4-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru puppet-lint-4.2.4/debian/clean puppet-lint-4.2.4/debian/clean
--- puppet-lint-4.2.4/debian/clean	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/clean	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-coverage/
diff -Nru puppet-lint-4.2.4/debian/control puppet-lint-4.2.4/debian/control
--- puppet-lint-4.2.4/debian/control	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/control	2024-02-22 05:30:18.000000000 +0000
@@ -10,11 +10,9 @@
 Build-Depends:
  debhelper-compat (= 13),
  gem2deb,
- ruby-rspec,
- ruby-rspec-collection-matchers,
+ help2man <!nodoc>,
  ruby-rspec-its,
- ruby-simplecov,
- sharness,
+ ruby-rspec-mocks,
 Standards-Version: 4.6.2
 Vcs-Git: https://salsa.debian.org/puppet-team/puppet-lint.git
 Vcs-Browser: https://salsa.debian.org/puppet-team/puppet-lint
@@ -24,7 +22,6 @@
 
 Package: puppet-lint
 Architecture: all
-XB-Ruby-Versions: ${ruby:Versions}
 Depends:
  ruby:any,
  ${misc:Depends},
diff -Nru puppet-lint-4.2.4/debian/copyright puppet-lint-4.2.4/debian/copyright
--- puppet-lint-4.2.4/debian/copyright	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/copyright	2024-02-22 05:30:18.000000000 +0000
@@ -1,6 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: puppet-lint
-Source: https://github.com/rodjek/puppet-lint
+Source: https://github.com/puppetlabs/puppet-lint
+Upstream-Contact: https://github.com/puppetlabs/puppet-lint/issues
 
 Files: *
 Copyright: 2011-2016 Tim Sharpe
diff -Nru puppet-lint-4.2.4/debian/puppet-lint.1 puppet-lint-4.2.4/debian/puppet-lint.1
--- puppet-lint-4.2.4/debian/puppet-lint.1	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/puppet-lint.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-.TH PUPPET-LINT "1" "September 2011" "puppet-lint 0.1.4" "User Commands"
-.SH NAME
-puppet-lint \- check puppet manifests for style guide conformity
-.SH DESCRIPTION
-Puppet\-lint
-.SS "Basic Command Line Usage:"
-.IP
-puppet\-lint [OPTIONS] [PATH]
-.TP
-PATH
-The path to the Puppet manifest.
-.SH OPTIONS
-.TP
-\fB\-\-version\fR
-Display current version.
diff -Nru puppet-lint-4.2.4/debian/puppet-lint.manpages puppet-lint-4.2.4/debian/puppet-lint.manpages
--- puppet-lint-4.2.4/debian/puppet-lint.manpages	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/puppet-lint.manpages	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/puppet-lint.1
diff -Nru puppet-lint-4.2.4/debian/rules puppet-lint-4.2.4/debian/rules
--- puppet-lint-4.2.4/debian/rules	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/rules	2024-02-22 05:30:18.000000000 +0000
@@ -3,5 +3,14 @@
 export GEM2DEB_TEST_RUNNER = --check-dependencies
 export DH_RUBY = --gem-install
 
+mandir := $(CURDIR)/debian/puppet-lint/usr/share/man/man1
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+override_dh_installman:
+	mkdir -p $(mandir)
+	help2man --name='Puppet Lint' --no-info \
+		-o $(mandir)/puppet-lint.1 bin/puppet-lint
+endif
diff -Nru puppet-lint-4.2.4/debian/upstream/metadata puppet-lint-4.2.4/debian/upstream/metadata
--- puppet-lint-4.2.4/debian/upstream/metadata	2024-02-12 13:31:40.000000000 +0000
+++ puppet-lint-4.2.4/debian/upstream/metadata	2024-02-22 05:30:18.000000000 +0000
@@ -1,9 +1,7 @@
 ---
 Archive: GitHub
-Bug-Database: https://github.com/rodjek/puppet-lint/issues
-Bug-Submit: https://github.com/rodjek/puppet-lint/issues
-Changelog: https://github.com/rodjek/puppet-lint/tags
-Contact: https://github.com/rodjek/puppet-lint/issues
-Name: puppet-lint
-Repository: https://github.com/rodjek/puppet-lint.git
-Repository-Browse: https://github.com/rodjek/puppet-lint
+Bug-Database: https://github.com/puppetlabs/puppet-lint/issues
+Bug-Submit: https://github.com/puppetlabs/puppet-lint/issues
+Changelog: https://github.com/puppetlabs/puppet-lint/tags
+Repository: https://github.com/puppetlabs/puppet-lint.git
+Repository-Browse: https://github.com/puppetlabs/puppet-lint