diff -Nru tj3-3.6.0/debian/changelog tj3-3.6.0/debian/changelog
--- tj3-3.6.0/debian/changelog	2018-03-13 07:27:55.000000000 +0000
+++ tj3-3.6.0/debian/changelog	2019-01-27 15:25:12.000000000 +0000
@@ -1,3 +1,11 @@
+tj3 (3.6.0-6) unstable; urgency=medium
+
+  * d/control: update Vcs-* fields.
+  * d/patches: fix failing tests with recent versions of ruby-mail.
+    Closes: #919736.
+
+ -- Vincent Bernat <bernat@debian.org>  Sun, 27 Jan 2019 16:25:12 +0100
+
 tj3 (3.6.0-5) unstable; urgency=medium
 
   * Fix FTBFS with newer versions of Ruby. Closes: #892652.
diff -Nru tj3-3.6.0/debian/control tj3-3.6.0/debian/control
--- tj3-3.6.0/debian/control	2018-03-13 07:27:55.000000000 +0000
+++ tj3-3.6.0/debian/control	2019-01-27 15:25:12.000000000 +0000
@@ -11,8 +11,8 @@
                localehelper,
                help2man
 Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/tj3.git
-Vcs-Git: https://anonscm.debian.org/git/collab-maint/tj3.git
+Vcs-Browser: https://salsa.debian.org/debian/tj3
+Vcs-Git: https://salsa.debian.org/debian/tj3.git
 Homepage: http://www.taskjuggler.org
 XS-Ruby-Versions: all
 
diff -Nru tj3-3.6.0/debian/patches/0010-tests-normalize-CRLF-when-checking-MIME-attachments.patch tj3-3.6.0/debian/patches/0010-tests-normalize-CRLF-when-checking-MIME-attachments.patch
--- tj3-3.6.0/debian/patches/0010-tests-normalize-CRLF-when-checking-MIME-attachments.patch	1970-01-01 00:00:00.000000000 +0000
+++ tj3-3.6.0/debian/patches/0010-tests-normalize-CRLF-when-checking-MIME-attachments.patch	2019-01-27 15:25:12.000000000 +0000
@@ -0,0 +1,39 @@
+From: Vincent Bernat <vincent@bernat.ch>
+Date: Sun, 27 Jan 2019 16:33:08 +0100
+Subject: tests: normalize CRLF when checking MIME attachments
+
+---
+ spec/StatusSheets_spec.rb | 4 ++--
+ spec/TimeSheets_spec.rb   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/spec/StatusSheets_spec.rb b/spec/StatusSheets_spec.rb
+index 1da147e..9d7be05 100644
+--- a/spec/StatusSheets_spec.rb
++++ b/spec/StatusSheets_spec.rb
+@@ -229,8 +229,8 @@ EOT
+ 
+       it 'should have matching status sheets in body and attachment' do
+         @sss_mails.each do |mail|
+-          bodySheet = extractStatusSheet(mail.parts[0].decoded)
+-          attachedSheet = extractStatusSheet(mail.part[1].decoded)
++          bodySheet = extractStatusSheet(mail.parts[0].decoded).gsub /\r\n/, "\n"
++          attachedSheet = extractStatusSheet(mail.part[1].decoded).gsub /\r\n/, "\n"
+           bodySheet.should == attachedSheet
+         end
+       end
+diff --git a/spec/TimeSheets_spec.rb b/spec/TimeSheets_spec.rb
+index 9360130..f649ae0 100644
+--- a/spec/TimeSheets_spec.rb
++++ b/spec/TimeSheets_spec.rb
+@@ -215,8 +215,8 @@ EOT
+ 
+       it 'should have matching timesheets in body and attachment' do
+         @tss_mails.each do |mail|
+-          bodySheet = extractTimeSheet(mail.parts[0].decoded)
+-          attachedSheet = extractTimeSheet(mail.part[1].decoded)
++          bodySheet = extractTimeSheet(mail.parts[0].decoded).gsub /\r\n/, "\n"
++          attachedSheet = extractTimeSheet(mail.part[1].decoded).gsub /\r\n/, "\n"
+           bodySheet.should == attachedSheet
+         end
+       end
diff -Nru tj3-3.6.0/debian/patches/series tj3-3.6.0/debian/patches/series
--- tj3-3.6.0/debian/patches/series	2018-03-13 07:27:55.000000000 +0000
+++ tj3-3.6.0/debian/patches/series	2019-01-27 15:25:12.000000000 +0000
@@ -7,3 +7,4 @@
 reproducible-build.patch
 manual-path.patch
 224.patch
+0010-tests-normalize-CRLF-when-checking-MIME-attachments.patch