Merge ~michal-maloszewski99/ubuntu/+source/backuppc:fix-canonical-path-ping6 into ubuntu/+source/backuppc:ubuntu/bionic-devel

[Michał Małoszewski]

[Michał Małoszewski (michal-maloszewski99)]

I am about to finish SRU bug report and push a package with changes to PPA.

[Michał Małoszewski (michal-maloszewski99)]

Please review SRU report
https://docs.google.com/document/d/1QC0OeUp1fX0_qv2jgghA0aQSLNBDXlnxNiJO8AazBqo/edit?usp=sharing

[Michał Małoszewski (michal-maloszewski99)]

Results: (from http://autopkgtest.ubuntu.com/results/autopkgtest-bionic-michal-maloszewski99-backuppc-sru-lp782890-bionic/?format=plain)
  backuppc @ amd64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-bionic-michal-maloszewski99-backuppc-sru-lp782890-bionic/bionic/amd64/b/backuppc/20220808_121845_16bc3@/log.gz
    08.08.22 12:18:45 ✅ Triggers: backuppc/3.3.1-4ubuntu1.1~ppa1
  backuppc @ arm64:
    http://autopkgtest.ubuntu.com/results/autopkgtest-bionic-michal-maloszewski99-backuppc-sru-lp782890-bionic/bionic/arm64/b/backuppc/20220808_122103_bac2b@/log.gz
    08.08.22 12:21:03 ✅ Triggers: backuppc/3.3.1-4ubuntu1.1~ppa1
  backuppc @ armhf:
    http://autopkgtest.ubuntu.com/results/autopkgtest-bionic-michal-maloszewski99-backuppc-sru-lp782890-bionic/bionic/armhf/b/backuppc/20220808_125102_252e0@/log.gz
    08.08.22 12:51:02 ✅ Triggers: backuppc/3.3.1-4ubuntu1.1~ppa1
  backuppc @ ppc64el:
    http://autopkgtest.ubuntu.com/results/autopkgtest-bionic-michal-maloszewski99-backuppc-sru-lp782890-bionic/bionic/ppc64el/b/backuppc/20220808_121930_9bfa3@/log.gz
    08.08.22 12:19:30 ✅ Triggers: backuppc/3.3.1-4ubuntu1.1~ppa1
  backuppc @ s390x:
    http://autopkgtest.ubuntu.com/results/autopkgtest-bionic-michal-maloszewski99-backuppc-sru-lp782890-bionic/bionic/s390x/b/backuppc/20220808_121946_8af1d@/log.gz
    08.08.22 12:19:46 ✅ Triggers: backuppc/3.3.1-4ubuntu1.1~ppa1

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Michał.

This is not correct because there is a missing backslash on d/rules, which causes the new configure option to be ignored. I would strongly recommend you to install the package from your PPA inside a Bionic container and double check that the fix is indeed there; you will notice that Ping6Path is still empty.

review: Needs Fixing

[Michał Małoszewski (michal-maloszewski99)]

> Thanks for the MP, Michał.
>
> This is not correct because there is a missing backslash on d/rules, which
> causes the new configure option to be ignored. I would strongly recommend you
> to install the package from your PPA inside a Bionic container and double
> check that the fix is indeed there; you will notice that Ping6Path is still
> empty.
Done

[Sergio Durigan Junior (sergiodj)]

Thanks. Uploaded:

$ dput backuppc_3.3.1-4ubuntu1.1_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/backuppc/backuppc_3.3.1-4ubuntu1.1_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/backuppc/backuppc_3.3.1-4ubuntu1.1.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading backuppc_3.3.1-4ubuntu1.1.dsc: done.
  Uploading backuppc_3.3.1-4ubuntu1.1.diff.gz: done.
  Uploading backuppc_3.3.1-4ubuntu1.1_source.buildinfo: done.
  Uploading backuppc_3.3.1-4ubuntu1.1_source.changes: done.
Successfully uploaded packages.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, michal-maloszewski99
Uploaders: sergiodj
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 825006c..e9b5834 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+backuppc (3.3.1-4ubuntu1.1) bionic; urgency=medium
+
+  * d/rules: Specify canonical path to ping6 (LP: #782890)
+
+ -- Michal Maloszewski <[e-mail]>  Fri, 05 Aug 2022 14:37:19 +0200
+
 backuppc (3.3.1-4ubuntu1) zesty; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/rules b/debian/rules
index 6945b92..e8165ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,8 +64,9 @@ install: build
 	    --bin-path rsync=/usr/bin/rsync --bin-path ping=/bin/ping \
 	    --bin-path df=/bin/df --bin-path ssh=/usr/bin/ssh \
 	    --bin-path sendmail=/usr/sbin/sendmail --bin-path hostname=/bin/hostname \
-	    --bin-path par2=/usr/bin/par2 --bin-path gzip=/bin/gzip --bin-path bzip2=/bin/bzip2
-	    
+	    --bin-path par2=/usr/bin/par2 \
+	    --bin-path gzip=/bin/gzip --bin-path bzip2=/bin/bzip2 \
+	    --bin-path ping6=/bin/ping6
 	pod2man --section=8 --center="BackupPC manual" doc/BackupPC.pod backuppc.8
 	perl -e "s/.IX Title.*/.SH NAME\nbackuppc \\- BackupPC manual/g" -p -i.tmp backuppc.8
 	mv -f debian/backuppc/usr/share/backuppc/cgi-bin/* debian/backuppc/usr/share/backuppc/lib/realindex.cgi