debian: change dependency libargon2-0-dev to libargon2-dev (debian bug #1005703)

3 files changed, 24 insertions, 6 deletions

diff --git a/tools/debian/patches/weechat_debian_stretch.patch b/tools/debian/patches/weechat_debian_stretch.patch
index d706321a0..3f94b77ad 100644
--- a/tools/debian/patches/weechat_debian_stretch.patch
+++ b/tools/debian/patches/weechat_debian_stretch.patch
@@ -23,7 +23,7 @@ index bf94a36f1..ae29ae9ec 100644
      liblua5.3-dev,
      tcl8.6-dev,
 -    guile-2.2-dev,
--    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+-    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
 +    guile-2.0-dev,
 +    php-dev, libphp-embed,
      libxml2-dev,
@@ -54,7 +54,7 @@ index ccf81cac8..3e6563e42 100644
      liblua5.3-dev,
      tcl8.6-dev,
 -    guile-2.2-dev,
--    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+-    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
 +    guile-2.0-dev,
 +    php-dev, libphp-embed,
      libxml2-dev,
diff --git a/tools/debian/patches/weechat_ubuntu_bionic.patch b/tools/debian/patches/weechat_ubuntu_bionic.patch
index c1a9f6d57..6d76bb8e6 100644
--- a/tools/debian/patches/weechat_ubuntu_bionic.patch
+++ b/tools/debian/patches/weechat_ubuntu_bionic.patch
@@ -6,7 +6,7 @@ index 48082f72f..b4de39476 100644
 -12
 +11
 diff --git a/debian-devel/control b/debian-devel/control
-index a6cc3c91c..d078d35b7 100644
+index 9dbbe1fb0..b044f7b44 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -4,7 +4,7 @@ Priority: optional
@@ -18,6 +18,15 @@ index a6cc3c91c..d078d35b7 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
+@@ -14,7 +14,7 @@ Build-Depends:
+     liblua5.3-dev,
+     tcl8.6-dev,
+     guile-2.2-dev,
+-    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
++    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+     libxml2-dev,
+     libcurl4-gnutls-dev,
+     libgcrypt20-dev,
 diff --git a/debian-stable/compat b/debian-stable/compat
 index 48082f72f..b4de39476 100644
 --- a/debian-stable/compat
@@ -26,7 +35,7 @@ index 48082f72f..b4de39476 100644
 -12
 +11
 diff --git a/debian-stable/control b/debian-stable/control
-index 1b0a27009..7880ce7bd 100644
+index ea31b52d4..fd4aad73a 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -4,7 +4,7 @@ Priority: optional
@@ -38,3 +47,12 @@ index 1b0a27009..7880ce7bd 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
+@@ -14,7 +14,7 @@ Build-Depends:
+     liblua5.3-dev,
+     tcl8.6-dev,
+     guile-2.2-dev,
+-    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
++    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+     libxml2-dev,
+     libcurl4-gnutls-dev,
+     libgcrypt20-dev,
diff --git a/tools/debian/patches/weechat_ubuntu_xenial.patch b/tools/debian/patches/weechat_ubuntu_xenial.patch
index c604e9dda..fd395d5d0 100644
--- a/tools/debian/patches/weechat_ubuntu_xenial.patch
+++ b/tools/debian/patches/weechat_ubuntu_xenial.patch
@@ -23,7 +23,7 @@ index bf94a36f1..1eb804643 100644
      liblua5.3-dev,
      tcl8.6-dev,
 -    guile-2.2-dev,
--    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+-    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
 +    guile-2.0-dev,
 +    php-dev, libphp-embed,
      libxml2-dev,
@@ -54,7 +54,7 @@ index ccf81cac8..7098b52c6 100644
      liblua5.3-dev,
      tcl8.6-dev,
 -    guile-2.2-dev,
--    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
+-    php-dev, libphp-embed, libargon2-dev, libsodium-dev,
 +    guile-2.0-dev,
 +    php-dev, libphp-embed,
      libxml2-dev,