From 8ab6422520baa82cb9be3fe513ec8bbde7a73655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Wed, 25 Sep 2019 20:58:22 +0200 Subject: 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 --- tools/debian/patches/weechat_debian_stretch.patch | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'tools/debian/patches/weechat_debian_stretch.patch') 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, -- cgit v1.2.3