Lintian Fixes - cloud-init
Ready changes
Summary
- Trim trailing whitespace. ( trailing-whitespace )
- Use secure copyright file specification URI. ( insecure-copyright-format-uri )
- Update watch file format version to 4. ( older-debian-watch-file-standard )
- Bump debhelper from old 10 to 13. ( package-uses-old-debhelper-compat-version )
- Set debhelper-compat version in Build-Depends. ( uses-debhelper-compat-file )
- Set upstream metadata fields: Repository, Repository-Browse. ( upstream-metadata-file-is-missing , upstream-metadata-missing-repository )
- Update standards version to 4.6.1, no changes needed. ( out-of-date-standards-version )
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index 35ed160e..b2087d1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,22 @@
cloud-init (22.2-4) UNRELEASED; urgency=medium
+ [ Bastian Blank ]
* Remove unused integration into rsyslog.
* Remove unneeded config overrides.
+ [ Debian Janitor ]
+ * Trim trailing whitespace.
+ * Use secure copyright file specification URI.
+ * Update watch file format version to 4.
+ * Bump debhelper from old 10 to 13.
+ + Drop check for DEB_BUILD_OPTIONS containing "nocheck", since debhelper now
+ does this.
+ + Replace --no-restart-on-upgrade with --no-stop-on-upgrade.
+ + Use dh_installsystemd rather than deprecated dh_systemd_start.
+ * Set debhelper-compat version in Build-Depends.
+ * Set upstream metadata fields: Repository, Repository-Browse.
+ * Update standards version to 4.6.1, no changes needed.
+
-- Bastian Blank <waldi@debian.org> Mon, 05 Sep 2022 16:05:22 +0200
cloud-init (22.2-3) unstable; urgency=medium
@@ -468,7 +482,7 @@ cloud-init (0.7.6~bzr976-3) unstable; urgency=medium
cloud-init (0.7.6~bzr976-2) unstable; urgency=medium
- * Build-depend on iproute2 instead of iproute (Closes: #753695).
+ * Build-depend on iproute2 instead of iproute (Closes: #753695).
* Translation updates:
- Portuguese: Américo Monteiro <a_monteiro@gmx.com>, closes: #748520.
- German: Chris Leick <c.leick@vollbio.de>, closes: #750852.
@@ -503,14 +517,14 @@ cloud-init (0.7.5-1) unstable; urgency=medium
cloud-init (0.7.2-3) unstable; urgency=low
[ Charles Plessy ]
- * Added python-requests to build dependencies (Closes: #711797).
+ * Added python-requests to build dependencies (Closes: #711797).
* Conforms with Policy 3.9.4.
* Depend on ${python:Depends}.
* Description and Debconf messages reviewed by the Smith project.
Closes: #710444, thanks to Justin B Rye and Christian Perrier.
* German translation (Closes: #714738, thanks to Chris Leick).
* Swedish translation (Closes: #714646, thanks to Martin Bagge).
- * French translation (Closes: #714608, thanks to Julien Patriarca).
+ * French translation (Closes: #714608, thanks to Julien Patriarca).
* Russian translation (Closes: #714093, #715168, thanks to Yuri Kozlov).
* Danish translation (Closes: #714785, thanks to Joe Dalton).
* Czech tranlsation (Closes: #714356, thanks to Michal Šimůnek).
@@ -597,7 +611,7 @@ cloud-init (0.7.1-1) unstable; urgency=low
cloud-init (0.6.3-2) experimental; urgency=low
* First version in Debian (Closes: #672375).
- * Do not depend on cloud-utils, which is only in Ubuntu.
+ * Do not depend on cloud-utils, which is only in Ubuntu.
-- Charles Plessy <plessy@debian.org> Wed, 23 May 2012 09:26:29 +0900
@@ -612,7 +626,7 @@ cloud-init (0.6.3-1) experimental; urgency=low
- Removed debian/pycompat.
- Build-depend on CDBS >= 0.4.90~.
- Removed XS-Python-Version and XB-Python-Version in debian/control.
- * Use Debhelper 9 (debian/control, debian/compat).
+ * Use Debhelper 9 (debian/control, debian/compat).
* Removed debian/cloud-init.prerm as /etc/cron.d/cloudinit-updates
seems to have been removed from the package earlier.
* Removed unneeded debian/dirs debian/cloud-init.install.
@@ -664,7 +678,7 @@ cloud-init (0.6.3~bzr547-0ubuntu1) precise; urgency=low
* New upstream snapshot.
* rename DataSourceMaaS to DataSourceMAAS.
* support public-keys in DataSourceMAAS
- * Warn in user-data processing on non-multipart, non-handled data
+ * Warn in user-data processing on non-multipart, non-handled data
* CloudStack data source added (not enabled by default)
* fix bug in cloud-init.postinst where the name used was wrong
causing config-apt-pipelining to run more than intended
@@ -695,7 +709,7 @@ cloud-init (0.6.3~bzr539-0ubuntu1) precise; urgency=low
* run-parts now uses internal implementation rather than
separate command.
* add MaaS datasource (LP: #942061)
- * debian/cloud-init.postinst: address population of apt_pipeline
+ * debian/cloud-init.postinst: address population of apt_pipeline
setting on installation.
* debian/cloud-init.postinst: support configuring cloud-init
maas datasource via preseed values cloud-init/maas-metadata-url and
@@ -843,7 +857,7 @@ cloud-init (0.6.1-0ubuntu14) oneiric; urgency=low
* change the handling of user-data (LP: #810044)
* boothooks will now run more than once as they were intended
* cloud-config and user-scripts will be updated from user data every boot
- * Add a second type of part-handler that will be called on every boot
+ * Add a second type of part-handler that will be called on every boot
* fix bad handling of /etc/hosts if manage_etc_hosts was false
-- Scott Moser <smoser@ubuntu.com> Mon, 08 Aug 2011 12:46:56 -0500
@@ -871,7 +885,7 @@ cloud-init (0.6.1-0ubuntu12) oneiric; urgency=low
[Adam Gandalman]
* improve the updating of /etc/hosts with correct fqdn when possible
(LP: #812539)
-
+
[Avishai Ish-Shalom]
* add chef support (cloudinit/CloudConfig/cc_chef.py) (LP: #798844)
@@ -988,7 +1002,7 @@ cloud-init (0.6.1-0ubuntu1) natty; urgency=low
cloud-init (0.6.0-0ubuntu4) natty; urgency=low
- * fix running of user scripts (LP: #711480) (cherry pick 344)
+ * fix running of user scripts (LP: #711480) (cherry pick 344)
* fix 2 lintian warnings
-- Scott Moser <smoser@ubuntu.com> Tue, 01 Feb 2011 16:15:30 -0500
@@ -1031,7 +1045,7 @@ cloud-init (0.6.0-0ubuntu1) natty; urgency=low
* indicate "all the way up" with message to console and file creation
in /var/lib/cloud/instance/ (LP: #653271)
* write ssh keys to console late in boot to ensure they're in console buffer
- * add support for redirecting output of cloud-init, cloud-config,
+ * add support for redirecting output of cloud-init, cloud-config,
cloud-final via the config file, or user data config file
* add support for posting data about the instance to a url (phone_home)
* add minimal OVF transport (iso) support
@@ -1043,7 +1057,7 @@ cloud-init (0.6.0-0ubuntu1) natty; urgency=low
(LP: #641504)
* add support for reading Rightscale style user data (LP: #668400)
* make the message on 'disable_root' more clear (LP: #672417)
- * do not require public key if private is given in ssh cloud-config
+ * do not require public key if private is given in ssh cloud-config
(LP: #648905)
-- Scott Moser <smoser@ubuntu.com> Wed, 26 Jan 2011 17:28:36 -0500
@@ -1146,7 +1160,7 @@ cloud-init (0.5.12-0ubuntu8) maverick; urgency=low
cloud-init (0.5.12-0ubuntu7) maverick; urgency=low
- * update-grub-legacy-ec2:
+ * update-grub-legacy-ec2:
- force setting of indomU so output of build process has
a menu.lst with -ec2 kernels listed.
- remove 'quite splash' from kernel options
@@ -1157,7 +1171,7 @@ cloud-init (0.5.12-0ubuntu7) maverick; urgency=low
cloud-init (0.5.12-0ubuntu6) maverick; urgency=low
* fix installation error
- * add quilt-setup rule for package development
+ * add quilt-setup rule for package development
-- Scott Moser <smoser@ubuntu.com> Tue, 13 Jul 2010 12:04:21 -0400
@@ -1193,7 +1207,7 @@ cloud-init (0.5.12-0ubuntu1) maverick; urgency=low
* New upstream release.
* fix cloud-init-run-module to allow 'always' (LP: #568139)
- * add support for setting debconf selections
+ * add support for setting debconf selections
* add cloud-config support for debconf selections (LP: #582667),
byobu enablement, and ssh-import-lp-id
@@ -1383,7 +1397,7 @@ ec2-init (0.4.999-0ubuntu5) karmic; urgency=low
ec2-init (0.4.999-0ubuntu4) karmic; urgency=low
- * set locale to en_US.UTF-8 if get_location_from_availability_zone
+ * set locale to en_US.UTF-8 if get_location_from_availability_zone
doesn't have a match (LP: #407949)
-- Scott Moser <smoser@ubuntu.com> Tue, 20 Oct 2009 09:57:49 -0400
@@ -1467,9 +1481,9 @@ ec2-init (0.3.4ubuntu6) karmic; urgency=low
ec2-init (0.3.4ubuntu5) karmic; urgency=low
- * debian/init: Move instance reboot detection out of python
+ * debian/init: Move instance reboot detection out of python
scripts and move them to the init script.
- * debian/ec2-set-defaults.py:
+ * debian/ec2-set-defaults.py:
- Point to the right location for locate (LP: #387611)
- Default to UTC (LP: #341060)
* debian/ec2-set-apt-sources.py: If you cant contact EC2 then use the
@@ -1492,7 +1506,7 @@ ec2-init (0.3.4ubuntu3) karmic; urgency=low
* debian/init: Move init script to run before ssh and regenerate the ssh
host kes in the init script rather than /etc/rc.local (LP: #370628)
- * ec2-set-apt-sources.py:
+ * ec2-set-apt-sources.py:
- Move sources.list to /var/ec2 so it doesnt get removed after user
reboots.
* ec2-set-defaults.py:
@@ -1504,7 +1518,7 @@ ec2-init (0.3.4ubuntu3) karmic; urgency=low
ec2-init (0.3.4ubuntu2) karmic; urgency=low
- * Really change the locale when setting up an instance. (LP: #341066)
+ * Really change the locale when setting up an instance. (LP: #341066)
* Run ec2-run-user-data script last. (LP: #373055)
* Minor comment tweaks. (LP: #373057)
@@ -1518,7 +1532,7 @@ ec2-init (0.3.4ubuntu1) karmic; urgency=low
ec2-init (0.3.3ubuntu12) jaunty; urgency=low
- * ec2-run-user-data.py: Fix error.
+ * ec2-run-user-data.py: Fix error.
-- Chuck Short <zulcss@ubuntu.com> Tue, 07 Apr 2009 08:14:07 -0400
@@ -1539,27 +1553,27 @@ ec2-init (0.3.3ubuntu10) jaunty; urgency=low
* ec2-set-hostname.py:
- Use template for /etc/hosts creation.
- - Dont use public_hostname in /etc/hosts. (LP: #352745)
+ - Dont use public_hostname in /etc/hosts. (LP: #352745)
-- Chuck Short <zulcss@ubuntu.com> Wed, 01 Apr 2009 08:48:05 -0400
ec2-init (0.3.3ubuntu9) jaunty; urgency=low
* ec2-set-apt-sources.py:
- - Use a template to generate the sources.list and generate it based on the lsb_release.
+ - Use a template to generate the sources.list and generate it based on the lsb_release.
-- Chuck Short <zulcss@ubuntu.com> Tue, 31 Mar 2009 15:15:55 -0400
ec2-init (0.3.3ubuntu8) jaunty; urgency=low
* ec2-set-apt-sources.py:
- - Add the ubuntu-on-ec2 ppa.
+ - Add the ubuntu-on-ec2 ppa.
-- Chuck Short <zulcss@ubuntu.com> Tue, 31 Mar 2009 09:37:13 -0400
ec2-init (0.3.3ubuntu7) jaunty; urgency=low
- * debian/rules: Fix typo.
+ * debian/rules: Fix typo.
-- Chuck Short <zulcss@ubuntu.com> Sun, 22 Mar 2009 17:14:16 -0400
@@ -1567,7 +1581,7 @@ ec2-init (0.3.3ubuntu6) jaunty; urgency=low
* Set the configuration file to jaunty.
* ec2-fetch-credentials: Fix typo.
- * ec2-set-defaults.py:
+ * ec2-set-defaults.py:
- Remove timezone change when booting the instance.
- Redirect output to /dev/null.
* ec2-set-apt-sources.py:
@@ -1611,8 +1625,8 @@ ec2-init (0.3.3ubuntu3~intrepid4) intrepid; urgency=low
ec2-init (0.3.3ubuntu3) jaunty; urgency=low
* debian/ec2-init: Log results of ec2-run-user-data to syslog.
- * ec2-run-user-data.py :Dont leave files around and log the
- output to syslog.
+ * ec2-run-user-data.py :Dont leave files around and log the
+ output to syslog.
-- Chuck Short <zulcss@ubuntu.com> Thu, 26 Feb 2009 10:24:35 -0500
@@ -1628,7 +1642,7 @@ ec2-init (0.3.3ubuntu2) jaunty; urgency=low
ec2-init (0.3.3ubuntu1) jaunty; urgency=low
- * debian/init: Fix init script.
+ * debian/init: Fix init script.
-- Chuck Short <zulcss@ubuntu.com> Fri, 20 Feb 2009 09:22:54 -0500
@@ -1647,7 +1661,7 @@ ec2-init (0.3.3) jaunty; urgency=low
- Add python-configobj as a dependency.
* debian/{install,dirs}
- Create an /etc/ec2-init to read the configuration file and install it.
-
+
-- Chuck Short <zulcss@ubuntu.com> Mon, 09 Feb 2009 10:35:56 -0500
ec2-init (0.3.2) jaunty; urgency=low
@@ -1661,7 +1675,7 @@ ec2-init (0.3.2) jaunty; urgency=low
public hostname.
* ec2-fetch-credentials:
- Copy the ssh keys to the ubuntu user.
- - Setup authorized keys for root to tell the user to login as the
+ - Setup authorized keys for root to tell the user to login as the
ubuntu user when they try to connect.
* ec2-run-user-data:
- Create an .already-ran file to check to see if ec2-run-user-data
@@ -1680,7 +1694,7 @@ ec2-init (0.3.1) jaunty; urgency=low
ec2-init (0.3) jaunty; urgency=low
- * ec2-run-user-data: Fix python error when writing a file to the disk.
+ * ec2-run-user-data: Fix python error when writing a file to the disk.
-- Chuck Short <zulcss@ubuntu.com> Thu, 15 Jan 2009 11:49:08 -0500
@@ -1698,4 +1712,3 @@ ec2-init (0.1) intrepid; urgency=low
* Initial release (LP: #269434).
-- Soren Hansen <soren@ubuntu.com> Fri, 12 Sep 2008 15:30:32 +0200
-
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28b..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index fff0d87f..2791191f 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Section: admin
Priority: optional
Build-Depends:
- debhelper (>= 10),
+ debhelper-compat (= 13),
dh-python,
iproute2,
po-debconf,
@@ -33,7 +33,7 @@ Build-Depends-Indep:
python3-serial,
python3-unittest2,
python3-yaml,
-Standards-Version: 4.5.0
+Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/cloud-team/cloud-init
Vcs-Git: https://salsa.debian.org/cloud-team/cloud-init.git
Homepage: https://launchpad.net/cloud-init
diff --git a/debian/copyright b/debian/copyright
index 1b0d0b45..76c3822d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://launchpad.net/cloud-init/trunk/0.7.4/+download/cloud-init-0.7.4.tar.gz
Files: *
diff --git a/debian/rules b/debian/rules
index 3c302ff8..fe15a1cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,19 +12,17 @@ override_dh_auto_install:
$(CURDIR)/debian/cloud-init/etc/NetworkManager/dispatcher.d/cloud-init-hook-network-manager
override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
set -e && set -x && for pyvers in $(PYTHON3S); do \
PYMAJOR=`echo $$pyvers | cut -d'.' -f1` ; \
echo "===> Testing with python$$pyvers (python$$PYMAJOR)" ; \
PYTHON=python$$pyvers PYTHONPATH=. python$$pyvers -m pytest -v tests/unittests --ignore-glob $(CURDIR)/tests/unittests/test_datasource/test_opennebula.py ; \
done
-endif
override_dh_installinit:
- dh_installinit --onlyscripts --no-start --no-restart-on-upgrade --name cloud-init-local
- dh_installinit --onlyscripts --no-start --no-restart-on-upgrade
- dh_installinit --onlyscripts --no-start --no-restart-on-upgrade --name cloud-config
- dh_installinit --onlyscripts --no-start --no-restart-on-upgrade --name cloud-final
+ dh_installinit --onlyscripts --no-start --no-stop-on-upgrade --name cloud-init-local
+ dh_installinit --onlyscripts --no-start --no-stop-on-upgrade
+ dh_installinit --onlyscripts --no-start --no-stop-on-upgrade --name cloud-config
+ dh_installinit --onlyscripts --no-start --no-stop-on-upgrade --name cloud-final
-override_dh_systemd_start:
- dh_systemd_start --no-restart-on-upgrade --no-start
+override_dh_installsystemd:
+ dh_installsystemd --no-restart-on-upgrade --no-start
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
new file mode 100644
index 00000000..582c96c8
--- /dev/null
+++ b/debian/upstream/metadata
@@ -0,0 +1,3 @@
+---
+Repository: https://github.com/canonical/cloud-init.git
+Repository-Browse: https://github.com/canonical/cloud-init
diff --git a/debian/watch b/debian/watch
index ff9e7043..4029372b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
https://github.com/canonical/cloud-init/tags .*/(\d+\.\d+).tar.gz
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-apt.txt -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-chef.txt -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-disk-setup.txt -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-user-groups.txt -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config.txt
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-apt.txt.gz -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-chef.txt.gz -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-disk-setup.txt.gz -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config-user-groups.txt.gz -rw-r--r-- root/root /usr/share/doc/cloud-init/examples/cloud-config.txt.gz
No differences were encountered in the control files