diff -Nru firewalld-0.9.3/debian/changelog firewalld-0.9.3/debian/changelog --- firewalld-0.9.3/debian/changelog 2021-01-13 19:55:42.000000000 +0000 +++ firewalld-0.9.3/debian/changelog 2021-02-02 19:39:45.000000000 +0000 @@ -1,3 +1,24 @@ +firewalld (0.9.3-2ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - increase timeouts on arm64, to let this slow architecture pass the test. + + -- Gianfranco Costamagna Tue, 02 Feb 2021 20:39:45 +0100 + +firewalld (0.9.3-2) unstable; urgency=medium + + [ Debian Janitor ] + * Update watch file format version to 4. + * Use secure URI in Homepage field. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + [ Michael Biebl ] + * Fix path for ipset. + The binary was moved from /sbin to /usr/sbin. (Closes: #981547) + + -- Michael Biebl Mon, 01 Feb 2021 13:54:28 +0100 + firewalld (0.9.3-1ubuntu1) hirsute; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru firewalld-0.9.3/debian/control firewalld-0.9.3/debian/control --- firewalld-0.9.3/debian/control 2021-01-12 21:14:51.000000000 +0000 +++ firewalld-0.9.3/debian/control 2021-02-01 21:19:56.000000000 +0000 @@ -18,7 +18,7 @@ Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/utopia-team/firewalld.git Vcs-Browser: https://salsa.debian.org/utopia-team/firewalld -Homepage: http://www.firewalld.org/ +Homepage: https://www.firewalld.org/ Package: firewalld Architecture: all diff -Nru firewalld-0.9.3/debian/rules firewalld-0.9.3/debian/rules --- firewalld-0.9.3/debian/rules 2021-01-12 21:14:51.000000000 +0000 +++ firewalld-0.9.3/debian/rules 2021-02-01 21:19:56.000000000 +0000 @@ -19,7 +19,7 @@ --with-ip6tables-restore=/usr/sbin/ip6tables-restore \ --with-ebtables=/usr/sbin/ebtables \ --with-ebtables-restore=/usr/sbin/ebtables-restore \ - --with-ipset=/sbin/ipset \ + --with-ipset=/usr/sbin/ipset \ MODPROBE=/sbin/modprobe \ RMMOD=/sbin/rmmod \ SYSCTL=/sbin/sysctl diff -Nru firewalld-0.9.3/debian/upstream/metadata firewalld-0.9.3/debian/upstream/metadata --- firewalld-0.9.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ firewalld-0.9.3/debian/upstream/metadata 2021-02-01 12:54:28.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/firewalld/firewalld/issues +Bug-Submit: https://github.com/firewalld/firewalld/issues/new +Repository: https://github.com/firewalld/firewalld.git +Repository-Browse: https://github.com/firewalld/firewalld diff -Nru firewalld-0.9.3/debian/watch firewalld-0.9.3/debian/watch --- firewalld-0.9.3/debian/watch 2021-01-12 21:14:51.000000000 +0000 +++ firewalld-0.9.3/debian/watch 2021-02-01 21:19:56.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 https://github.com/firewalld/firewalld/releases/ .*/firewalld-(\d\S*)\.tar\.gz