debian: switch to Guile 2.2 in Debian build

Guile 2.2 is now used by default in Debian/Ubuntu builds, except on these old
distribution versions where only Guile 2.0 is available:

- Debian Stretch
- Debian Jessie
- Debian Wheezy
- Ubuntu Xenial
- Ubuntu Trusty

6 files changed, 58 insertions, 38 deletions

diff --git a/tools/debian/patches/weechat_debian_buster.patch b/tools/debian/patches/weechat_debian_buster.patch
index 9d816477a..031858d28 100644
--- a/tools/debian/patches/weechat_debian_buster.patch
+++ b/tools/debian/patches/weechat_debian_buster.patch
@@ -5,7 +5,7 @@ index ffca1a17f..5e93066ef 100644
 @@ -14,7 +14,6 @@ Build-Depends:
      liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+     guile-2.2-dev,
 -    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
      php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
      libxml2-dev,
@@ -92,7 +92,7 @@ index 8fd0bf1a6..d8ab6f6e2 100644
 @@ -14,7 +14,6 @@ Build-Depends:
      liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+     guile-2.2-dev,
 -    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
      php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
      libxml2-dev,
diff --git a/tools/debian/patches/weechat_debian_jessie.patch b/tools/debian/patches/weechat_debian_jessie.patch
index ad728977b..6087254d8 100644
--- a/tools/debian/patches/weechat_debian_jessie.patch
+++ b/tools/debian/patches/weechat_debian_jessie.patch
@@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
 -12
 +9
 diff --git a/debian-devel/control b/debian-devel/control
-index 957110a55..574235330 100644
+index a862fdd6c..574235330 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -3,20 +3,17 @@ Section: net
@@ -25,7 +25,8 @@ index 957110a55..574235330 100644
 -    liblua5.3-dev,
 +    liblua5.1-0-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
++    guile-2.0-dev,
      libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 -    libxml2-dev,
@@ -116,7 +117,7 @@ index 48082f72f..ec635144f 100644
 -12
 +9
 diff --git a/debian-stable/control b/debian-stable/control
-index 516580bed..c3e7ed681 100644
+index c0326b3f5..c3e7ed681 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -3,20 +3,17 @@ Section: net
@@ -135,7 +136,8 @@ index 516580bed..c3e7ed681 100644
 -    liblua5.3-dev,
 +    liblua5.1-0-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
++    guile-2.0-dev,
      libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 -    libxml2-dev,
diff --git a/tools/debian/patches/weechat_debian_stretch.patch b/tools/debian/patches/weechat_debian_stretch.patch
index 88ae3a656..f1bbdd8c9 100644
--- a/tools/debian/patches/weechat_debian_stretch.patch
+++ b/tools/debian/patches/weechat_debian_stretch.patch
@@ -1,12 +1,12 @@
 diff --git a/debian-devel/compat b/debian-devel/compat
-index b4de39476..f599e28b8 100644
+index 48082f72f..f599e28b8 100644
 --- a/debian-devel/compat
 +++ b/debian-devel/compat
 @@ -1 +1 @@
 -12
 +10
 diff --git a/debian-devel/control b/debian-devel/control
-index d3a1dad8b..401f9c519 100644
+index a862fdd6c..82f60bba5 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -4,7 +4,7 @@ Priority: optional
@@ -18,9 +18,12 @@ index d3a1dad8b..401f9c519 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -15,7 +15,7 @@ Build-Depends:
+@@ -13,9 +13,9 @@ Build-Depends:
+     libaspell-dev,
+     liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
++    guile-2.0-dev,
      libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 +    php-dev, libphp-embed,
@@ -28,14 +31,14 @@ index d3a1dad8b..401f9c519 100644
      libcurl4-gnutls-dev,
      libgcrypt20-dev,
 diff --git a/debian-stable/compat b/debian-stable/compat
-index b4de39476..f599e28b8 100644
+index 48082f72f..f599e28b8 100644
 --- a/debian-stable/compat
 +++ b/debian-stable/compat
 @@ -1 +1 @@
 -12
 +10
 diff --git a/debian-stable/control b/debian-stable/control
-index 8fbf582b3..20cd5038f 100644
+index c0326b3f5..b0abc205a 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -4,7 +4,7 @@ Priority: optional
@@ -47,9 +50,12 @@ index 8fbf582b3..20cd5038f 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -15,7 +15,7 @@ Build-Depends:
+@@ -13,9 +13,9 @@ Build-Depends:
+     libaspell-dev,
+     liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
++    guile-2.0-dev,
      libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 +    php-dev, libphp-embed,
diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch
index cfe8e843f..0e6f7b499 100644
--- a/tools/debian/patches/weechat_debian_wheezy.patch
+++ b/tools/debian/patches/weechat_debian_wheezy.patch
@@ -1,12 +1,12 @@
 diff --git a/debian-devel/compat b/debian-devel/compat
-index b4de39476..ec635144f 100644
+index 48082f72f..ec635144f 100644
 --- a/debian-devel/compat
 +++ b/debian-devel/compat
 @@ -1 +1 @@
 -12
 +9
 diff --git a/debian-devel/control b/debian-devel/control
-index d3a1dad8b..4c5953e46 100644
+index a862fdd6c..0b3c016ff 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -3,8 +3,7 @@ Section: net
@@ -24,11 +24,12 @@ index d3a1dad8b..4c5953e46 100644
      libaspell-dev,
      liblua5.3-dev,
 -    tcl8.6-dev,
-+    tcl8.5-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
 -    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 -    libxml2-dev,
++    tcl8.5-dev,
++    guile-2.0-dev,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
@@ -115,14 +116,14 @@ index e358b515a..000000000
 -../debian-stable/weechat-php.install
 \ No newline at end of file
 diff --git a/debian-stable/compat b/debian-stable/compat
-index b4de39476..ec635144f 100644
+index 48082f72f..ec635144f 100644
 --- a/debian-stable/compat
 +++ b/debian-stable/compat
 @@ -1 +1 @@
 -12
 +9
 diff --git a/debian-stable/control b/debian-stable/control
-index 8fbf582b3..a30e30053 100644
+index c0326b3f5..44206d418 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -3,8 +3,7 @@ Section: net
@@ -140,11 +141,12 @@ index 8fbf582b3..a30e30053 100644
      libaspell-dev,
      liblua5.3-dev,
 -    tcl8.6-dev,
-+    tcl8.5-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
 -    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 -    libxml2-dev,
++    tcl8.5-dev,
++    guile-2.0-dev,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch
index b8f7a8884..eae0df050 100644
--- a/tools/debian/patches/weechat_ubuntu_trusty.patch
+++ b/tools/debian/patches/weechat_ubuntu_trusty.patch
@@ -1,12 +1,12 @@
 diff --git a/debian-devel/compat b/debian-devel/compat
-index b4de39476..ec635144f 100644
+index 48082f72f..ec635144f 100644
 --- a/debian-devel/compat
 +++ b/debian-devel/compat
 @@ -1 +1 @@
 -12
 +9
 diff --git a/debian-devel/control b/debian-devel/control
-index d3a1dad8b..718ae26b5 100644
+index a862fdd6c..968534b1c 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -3,8 +3,7 @@ Section: net
@@ -19,13 +19,15 @@ index d3a1dad8b..718ae26b5 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -14,12 +13,10 @@ Build-Depends:
+@@ -13,13 +12,11 @@ Build-Depends:
+     libaspell-dev,
      liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
 -    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 -    libxml2-dev,
++    guile-2.0-dev,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
@@ -100,14 +102,14 @@ index e358b515a..000000000
 -../debian-stable/weechat-php.install
 \ No newline at end of file
 diff --git a/debian-stable/compat b/debian-stable/compat
-index b4de39476..ec635144f 100644
+index 48082f72f..ec635144f 100644
 --- a/debian-stable/compat
 +++ b/debian-stable/compat
 @@ -1 +1 @@
 -12
 +9
 diff --git a/debian-stable/control b/debian-stable/control
-index 8fbf582b3..f08af5ea6 100644
+index c0326b3f5..a5a44c65a 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -3,8 +3,7 @@ Section: net
@@ -120,13 +122,15 @@ index 8fbf582b3..f08af5ea6 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -14,12 +13,10 @@ Build-Depends:
+@@ -13,13 +12,11 @@ Build-Depends:
+     libaspell-dev,
      liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
 -    libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 -    libxml2-dev,
++    guile-2.0-dev,
 +    libv8-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 f916609b5..5d2d81fa2 100644
--- a/tools/debian/patches/weechat_ubuntu_xenial.patch
+++ b/tools/debian/patches/weechat_ubuntu_xenial.patch
@@ -1,12 +1,12 @@
 diff --git a/debian-devel/compat b/debian-devel/compat
-index b4de39476..ec635144f 100644
+index 48082f72f..ec635144f 100644
 --- a/debian-devel/compat
 +++ b/debian-devel/compat
 @@ -1 +1 @@
 -12
 +9
 diff --git a/debian-devel/control b/debian-devel/control
-index d3a1dad8b..b078f38ac 100644
+index a862fdd6c..cf68a75dd 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -4,7 +4,7 @@ Priority: optional
@@ -18,9 +18,12 @@ index d3a1dad8b..b078f38ac 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -15,7 +15,7 @@ Build-Depends:
+@@ -13,9 +13,9 @@ Build-Depends:
+     libaspell-dev,
+     liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
++    guile-2.0-dev,
      libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 +    php-dev, libphp-embed,
@@ -28,14 +31,14 @@ index d3a1dad8b..b078f38ac 100644
      libcurl4-gnutls-dev,
      libgcrypt20-dev,
 diff --git a/debian-stable/compat b/debian-stable/compat
-index b4de39476..ec635144f 100644
+index 48082f72f..ec635144f 100644
 --- a/debian-stable/compat
 +++ b/debian-stable/compat
 @@ -1 +1 @@
 -12
 +9
 diff --git a/debian-stable/control b/debian-stable/control
-index 8fbf582b3..cb34db2da 100644
+index c0326b3f5..2a3892192 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -4,7 +4,7 @@ Priority: optional
@@ -47,9 +50,12 @@ index 8fbf582b3..cb34db2da 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -15,7 +15,7 @@ Build-Depends:
+@@ -13,9 +13,9 @@ Build-Depends:
+     libaspell-dev,
+     liblua5.3-dev,
      tcl8.6-dev,
-     guile-2.0-dev,
+-    guile-2.2-dev,
++    guile-2.0-dev,
      libv8-dev [amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386],
 -    php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
 +    php-dev, libphp-embed,