Mr/update packaging

debian/control

@@ -2,23 +2,32 @@ Source: ifupdown2
 Section: admin
 Priority: optional
 Maintainer: Julien Fortin <[email protected]>
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 13),
                dh-python,
                python3,
                python3-all,
+               python3-docutils,
                python3-setuptools,
-               python3-docutils
-Standards-Version: 4.5.0.2
+Standards-Version: 4.7.2
 Homepage: https://github.com/cumulusnetworks/ifupdown2
 X-Python-Version: >= 3.7
 
 Package: ifupdown2
 Architecture: all
-Provides: ifupdown
-Conflicts: ifupdown
-Replaces: ifupdown
-Depends: ${python3:Depends}, ${misc:Depends}, iproute2, python3-six, python3-setuptools, python3-systemd
-Suggests: isc-dhcp-client, bridge-utils, ethtool, python3-gvgen, python3-mako
+Provides: ifupdown,
+Conflicts: ifupdown,
+Replaces: ifupdown,
+Depends: iproute2,
+         python3-setuptools,
+         python3-six,
+         python3-systemd,
+         ${misc:Depends},
+         ${python3:Depends},
+Recommends: bridge-utils,
+          ethtool,
+          isc-dhcp-client,
+          python3-gvgen,
+          python3-mako,
 Description: Network Interface Management tool similar to ifupdown
  ifupdown2 is ifupdown re-written in Python. It replaces ifupdown and provides
  the same user interface as ifupdown for network interface configuration.

debian/copyright

@@ -7,6 +7,11 @@ Files: *
 Copyright: 2014,2015,2016,2017,2018,2019,2020,2021,2022 Cumulus Networks, Inc.
 License: GPL-2
 
+Files: ifupdown2/lib/gvgen.py
+Copyright: 2007-2020 Sebastien Tricaud <sebastien at honeynet org>
+License: Expat
+Comment: this is a vendored copy of what used to be python-gvgen
+
 Files: debian/*
 Copyright: 2014,2015,2016,2017,2018,2019,2020,2021,2022 Cumulus Networks, Inc.
 License: GPL-2
@@ -26,3 +31,20 @@ License: GPL-2
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.

debian/ifupdown2.networking.service

@@ -4,6 +4,7 @@ Documentation=man:interfaces(5) man:ifup(8) man:ifdown(8)
 DefaultDependencies=no
 After=local-fs.target network-pre.target
 Before=shutdown.target network.target network-online.target
+Wants=network.target
 Conflicts=shutdown.target
 Wants=systemd-udev-settle.service
 After=systemd-udev-settle.service

debian/rules

@@ -5,7 +5,7 @@ export PYBUILD_NAME=ifupdown2
 export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/ --install-scripts=/usr/share/
 
 %:
-	dh $@ --with=python3 --with systemd --buildsystem=pybuild
+	dh $@ --with=python3 --buildsystem=pybuild
 
 override_dh_installman:
 	./ifupdown2/man/genmanpages.sh ./ifupdown2/man ./man
@@ -19,11 +19,17 @@ override_dh_install:
 override_dh_auto_test:
 	@echo "Skipping tests during the build process."
 
-override_dh_systemd_start:
-	dh_systemd_start --name=networking --no-start
+execute_after_dh_auto_install:
+	rm -rf debian/ifupdown2/usr/share/tests
 
-override_dh_systemd_enable:
-	dh_systemd_enable --name=networking
+override_dh_installsystemd:
+	# should only ever be reloaded, not restarted
+	dh_installsystemd --no-stop-on-upgrade --no-restart-after-upgrade --no-start --name networking
+
+override_dh_installinit:
+	cp etc/init.d/networking debian/ifupdown2.networking.init
+	# should only ever be reloaded, not restarted
+	dh_installinit --no-stop-on-upgrade --no-restart-after-upgrade --no-start --name networking
 
 override_dh_compress:
 	dh_compress -X.py

debian/watch

@@ -1 +1,7 @@
-version=3
+version=4
+  opts=\
+  filenamemangle=s%.*/@ANY_VERSION@%@PACKAGE@-$1.tar.gz%,\
+  downloadurlmangle=s%(api.github.com/repos/[^/]+/[^/]+)/git/refs/%$1/tarball/refs/%g,\
+  searchmode=plain \
+   https://api.github.com/repos/CumulusNetworks/ifupdown2/git/matching-refs/tags/ \
+   https://api.github.com/repos/[^/]+/[^/]+/git/refs/tags/@ANY_VERSION@