[Pkg-xmpp-devel] Bug#976886: movim: diff for NMU version 0.17.1-1.1

[Robin Gustafsson]

Control: tags 976886 + patch
Control: tags 976886 + pending

Dear maintainer,

I've prepared an NMU for movim (versioned as 0.17.1-1.1). The diff
is attached to this message.

I require a sponsor to have it uploaded.

Regards.

diff -Nru movim-0.17.1/debian/autoload.php movim-0.17.1/debian/autoload.php
--- movim-0.17.1/debian/autoload.php	2020-03-09 19:45:26.000000000 +0000
+++ movim-0.17.1/debian/autoload.php	2020-12-22 14:00:10.000000000 +0000
@@ -2,7 +2,7 @@
 
 require_once('Composer/Autoload/ClassLoader.php');
 include_once('/usr/share/php/HTMLPurifier.composer.php');
-include_once('/usr/share/php/Illuminate/Support/helpers.php');
+include_once('/usr/share/php/Illuminate/Database/autoload.php');
 include_once('/usr/share/php/GuzzleHttp/Psr7/functions_include.php');
 include_once('/usr/share/php/React/Promise/functions_include.php');
 include_once('/usr/share/php/React/Promise/Stream/functions_include.php');
diff -Nru movim-0.17.1/debian/changelog movim-0.17.1/debian/changelog
--- movim-0.17.1/debian/changelog	2020-03-30 15:10:58.000000000 +0000
+++ movim-0.17.1/debian/changelog	2020-12-22 14:00:13.000000000 +0000
@@ -1,3 +1,10 @@
+movim (0.17.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use php-illuminate-database 6 (Closes: #976886)
+
+ -- Robin Gustafsson <robin at rgson.se>  Tue, 22 Dec 2020 15:00:13 +0100
+
 movim (0.17.1-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru movim-0.17.1/debian/patches/composer-versions.diff movim-0.17.1/debian/patches/composer-versions.diff
--- movim-0.17.1/debian/patches/composer-versions.diff	2020-03-09 22:23:38.000000000 +0000
+++ movim-0.17.1/debian/patches/composer-versions.diff	2020-12-22 14:00:10.000000000 +0000
@@ -25,9 +25,8 @@
          "defuse/php-encryption": "^2.2.1",
  
 -        "robmorgan/phinx": "^0.11.4",
--        "illuminate/database": "^6.0",
 +        "robmorgan/phinx": "^0.9",
-+        "illuminate/database": "^5.8",
+         "illuminate/database": "^6.0",
          "doctrine/dbal": "^2.10",
  
          "cboden/ratchet": "^0.4.2",