Sebastien Bacher · Laurent Bigonville · Laurent Bigonville · Laurent Bigonville · Sebastien Bacher · Sebastien Bacher
--- a/debian/changelog
+++ b/debian/changelog
-deja-dup (42.8-1ubuntu1) impish; urgency=medium
+deja-dup (42.8-2ubuntu1) jammy; urgency=medium

  * Resynchronize on Debian, remaining change
  * debian/control.in, debian/rules:
@@ -10,7 +10,15 @@ deja-dup (42.8-1ubuntu1) impish; urgency=medium
    - remove the patch disabling google drive, python3-pydrive is available
      now in Ubuntu

- -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 23 Aug 2021 11:17:36 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 11 Nov 2021 15:11:39 +0100
+
+deja-dup (42.8-2) unstable; urgency=medium
+
+  * d/p/which_removal.patch: Fix a test that is using the deprecated "which"
+    command.  Use "command -v" as recommended
+  * debian/control.in: Bump Standards-Version to 4.6.0 (no further changes)
+
+ -- Laurent Bigonville <bigon@debian.org>  Sat, 25 Sep 2021 15:14:57 +0200

 deja-dup (42.8-1) unstable; urgency=medium


--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: appstream-util,
               meson (>= 0.47),
               pkg-config,
               valac (>= 0.36)
-Standards-Version: 4.4.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/gnome-team/deja-dup
 Vcs-Git: https://salsa.debian.org/gnome-team/deja-dup.git
 Homepage: https://launchpad.net/deja-dup

--- a/debian/control.in
+++ b/debian/control.in
@@ -22,7 +22,7 @@ Build-Depends: appstream-util,
               meson (>= 0.47),
               pkg-config,
               valac (>= 0.36)
-Standards-Version: 4.4.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/gnome-team/deja-dup
 Vcs-Git: https://salsa.debian.org/gnome-team/deja-dup.git
 Homepage: https://launchpad.net/deja-dup

--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,6 +2,7 @@
 pristine-tar = True
 debian-branch = ubuntu/master
 upstream-branch = upstream/latest
+debian-tag = ubuntu/%(version)s

 [buildpackage]
 sign-tags = True

--- a/debian/patches/series
+++ b/debian/patches/series
+which_removal.patch
--- a/debian/patches/which_removal.patch
+++ b/debian/patches/which_removal.patch
+--- a/libdeja/tests/scripts/instance-error.test
+++ b/libdeja/tests/scripts/instance-error.test
+@@ -9,7 +9,7 @@ Type=backup
+ # Delete mockscript ourselves, because the runner will notice that it is still
+ # there and fail.  Since we never run our mock duplicity, it is never cleaned
+ # naturally.  Also symlink python3 since the mock duplicity needs it
+-Script=mkdir -p @TEST_HOME@/mockcopy && cp -r @MOCK_DIR@/* @TEST_HOME@/mockcopy && ln -s `which python3` @TEST_HOME@/mockcopy/python3
+Script=mkdir -p @TEST_HOME@/mockcopy && cp -r @MOCK_DIR@/* @TEST_HOME@/mockcopy && ln -s `command -v python3` @TEST_HOME@/mockcopy/python3
+ Path=@TEST_HOME@/mockcopy
+ Success=false
+ ErrorRegex=Failed to execute child process [“"]duplicity["”] \\(No such file or directory\\)