debian: build Tcl plugin against Tcl 8.6

3 files changed, 88 insertions, 11 deletions

diff --git a/tools/debian/patches/weechat_debian_squeeze.patch b/tools/debian/patches/weechat_debian_squeeze.patch
index 284c82d0e..3530690c5 100644
--- a/tools/debian/patches/weechat_debian_squeeze.patch
+++ b/tools/debian/patches/weechat_debian_squeeze.patch
@@ -6,7 +6,7 @@ index ec63514..45a4fb7 100644
 -9
 +8
 diff --git a/debian-devel/control b/debian-devel/control
-index 8fd3e49..a5f9ceb 100644
+index 50f1217..bff1b8f 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -8,21 +8,20 @@ Build-Depends:
@@ -24,7 +24,8 @@ index 8fd3e49..a5f9ceb 100644
      python-dev,
      libaspell-dev,
      liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
++    tcl8.5-dev,
      guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
@@ -44,7 +45,7 @@ index ec63514..45a4fb7 100644
 -9
 +8
 diff --git a/debian-stable/control b/debian-stable/control
-index 0f3c34b..790b315 100644
+index f9e9aa0..ae1567e 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -8,21 +8,20 @@ Build-Depends:
@@ -62,7 +63,8 @@ index 0f3c34b..790b315 100644
      python-dev,
      libaspell-dev,
      liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
++    tcl8.5-dev,
      guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch
index f12da409f..b70d75c1f 100644
--- a/tools/debian/patches/weechat_debian_wheezy.patch
+++ b/tools/debian/patches/weechat_debian_wheezy.patch
@@ -1,5 +1,5 @@
 diff --git a/debian-devel/control b/debian-devel/control
-index 8fd3e49..38773be 100644
+index 50f1217..24daebc 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -9,7 +9,6 @@ Build-Depends:
@@ -10,9 +10,12 @@ index 8fd3e49..38773be 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -19,10 +18,10 @@ Build-Depends:
+@@ -17,12 +16,12 @@ Build-Depends:
+     python-dev,
+     libaspell-dev,
      liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
++    tcl8.5-dev,
      guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
@@ -25,7 +28,7 @@ index 8fd3e49..38773be 100644
  Standards-Version: 3.9.6
  Homepage: https://weechat.org/
 diff --git a/debian-stable/control b/debian-stable/control
-index 0f3c34b..0d73171 100644
+index f9e9aa0..919202a 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -9,7 +9,6 @@ Build-Depends:
@@ -36,9 +39,12 @@ index 0f3c34b..0d73171 100644
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -19,10 +18,10 @@ Build-Depends:
+@@ -17,12 +16,12 @@ Build-Depends:
+     python-dev,
+     libaspell-dev,
      liblua5.1-0-dev,
-     tcl8.5-dev,
+-    tcl8.6-dev,
++    tcl8.5-dev,
      guile-2.0-dev,
 -    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
 +    libv8-dev,
diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch
index 737378e74..76c1c3bcb 120000..100644
--- a/tools/debian/patches/weechat_ubuntu_trusty.patch
+++ b/tools/debian/patches/weechat_ubuntu_trusty.patch
@@ -1 +1,70 @@
-weechat_debian_wheezy.patch
\ No newline at end of file
+diff --git a/debian-devel/control b/debian-devel/control
+index 50f1217..81f0bcb 100644
+--- a/debian-devel/control
++++ b/debian-devel/control
+@@ -9,7 +9,6 @@ Build-Depends:
+     docbook-xsl,
+     docbook-xml,
+     debhelper (>= 9),
+-    dh-exec,
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -19,10 +18,10 @@ Build-Depends:
+     liblua5.1-0-dev,
+     tcl8.6-dev,
+     guile-2.0-dev,
+-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
++    libv8-dev,
+     libcurl4-gnutls-dev,
+-    libgcrypt20-dev,
+-    libgnutls28-dev,
++    libgcrypt11-dev,
++    libgnutls-dev,
+     zlib1g-dev
+ Standards-Version: 3.9.6
+ Homepage: https://weechat.org/
+diff --git a/debian-stable/control b/debian-stable/control
+index f9e9aa0..6841c04 100644
+--- a/debian-stable/control
++++ b/debian-stable/control
+@@ -9,7 +9,6 @@ Build-Depends:
+     docbook-xsl,
+     docbook-xml,
+     debhelper (>= 9),
+-    dh-exec,
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -19,10 +18,10 @@ Build-Depends:
+     liblua5.1-0-dev,
+     tcl8.6-dev,
+     guile-2.0-dev,
+-    libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
++    libv8-dev,
+     libcurl4-gnutls-dev,
+-    libgcrypt20-dev,
+-    libgnutls28-dev,
++    libgcrypt11-dev,
++    libgnutls-dev,
+     zlib1g-dev
+ Standards-Version: 3.9.6
+ Homepage: https://weechat.org/
+diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install
+old mode 100755
+new mode 100644
+index 198360f..980192f
+--- a/debian-stable/weechat-plugins.install
++++ b/debian-stable/weechat-plugins.install
+@@ -1,10 +1,8 @@
+-#!/usr/bin/dh-exec
+-
+ usr/lib/weechat/plugins/aspell.so
+ usr/lib/weechat/plugins/exec.so
+ usr/lib/weechat/plugins/fifo.so
+ usr/lib/weechat/plugins/guile.so
+-[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
++usr/lib/weechat/plugins/javascript.so
+ usr/lib/weechat/plugins/lua.so
+ usr/lib/weechat/plugins/perl.so
+ usr/lib/weechat/plugins/python.so