debian: update debian/ubuntu/raspbian patches

7 files changed, 291 insertions, 208 deletions

diff --git a/tools/debian/patches/README b/tools/debian/patches/README
index c73ded8ae..a251bab14 100644
--- a/tools/debian/patches/README
+++ b/tools/debian/patches/README
@@ -12,7 +12,4 @@ Notes for some versions of distributions:
 
       - Debian jessie (8.0)
       - Debian wheezy (7.0)
-      - Ubuntu wily (15.10)
       - Ubuntu trusty (14.04)
-      - Ubuntu precise (12.04)
-      - Raspbian jessie
diff --git a/tools/debian/patches/weechat_debian_jessie.patch b/tools/debian/patches/weechat_debian_jessie.patch
index 2f1f13554..d197fec83 100644
--- a/tools/debian/patches/weechat_debian_jessie.patch
+++ b/tools/debian/patches/weechat_debian_jessie.patch
@@ -1,24 +1,34 @@
+diff --git a/debian-devel/compat b/debian-devel/compat
+index b4de394..ec63514 100644
+--- a/debian-devel/compat
++++ b/debian-devel/compat
+@@ -1 +1 @@
+-11
++9
 diff --git a/debian-devel/control b/debian-devel/control
-index 46b2f9a7e..3cb558e4e 100644
+index d3a1dad..948815c 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -3,7 +3,6 @@ Section: net
+@@ -3,8 +3,7 @@ Section: net
  Priority: optional
  Maintainer: Sébastien Helleu <flashcode@flashtux.org>
  Build-Depends:
 -    asciidoctor (>= 1.5.4),
-     debhelper (>= 9),
-     dh-exec,
+-    debhelper (>= 11),
++    debhelper (>= 9),
      cmake, pkg-config,
-@@ -16,7 +15,6 @@ Build-Depends:
+     libncursesw5-dev,
+     gem2deb,
+@@ -15,8 +14,6 @@ Build-Depends:
      tcl8.6-dev,
      guile-2.0-dev,
-     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-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,
      libcurl4-gnutls-dev,
      libgcrypt20-dev,
      libgnutls28-dev,
-@@ -46,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -27,7 +37,7 @@ index 46b2f9a7e..3cb558e4e 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -72,7 +70,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -36,7 +46,7 @@ index 46b2f9a7e..3cb558e4e 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -100,7 +98,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -45,16 +55,19 @@ index 46b2f9a7e..3cb558e4e 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -215,17 +213,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
   .
   This package provides the JavaScript scripting API plugin.
  
 -Package: weechat-devel-php
 -Architecture: any
--Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
-- weechat-devel-headless (= ${binary:Version}), libphp7.2-embed
+-Depends:
+-    ${misc:Depends},
+-    ${shlibs:Depends},
+-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version}),
+-    libphp-embed
 -Conflicts: weechat-php
--Description: Fast, light and extensible chat client - php plugin
+-Description: Fast, light and extensible chat client - PHP plugin
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.
 - .
@@ -65,7 +78,7 @@ index 46b2f9a7e..3cb558e4e 100644
  Architecture: all
 diff --git a/debian-devel/weechat-devel-php.dirs b/debian-devel/weechat-devel-php.dirs
 deleted file mode 120000
-index e4853a588..000000000
+index e4853a5..0000000
 --- a/debian-devel/weechat-devel-php.dirs
 +++ /dev/null
 @@ -1 +0,0 @@
@@ -73,33 +86,43 @@ index e4853a588..000000000
 \ No newline at end of file
 diff --git a/debian-devel/weechat-devel-php.install b/debian-devel/weechat-devel-php.install
 deleted file mode 120000
-index e358b515a..000000000
+index e358b51..0000000
 --- a/debian-devel/weechat-devel-php.install
 +++ /dev/null
 @@ -1 +0,0 @@
 -../debian-stable/weechat-php.install
 \ No newline at end of file
+diff --git a/debian-stable/compat b/debian-stable/compat
+index b4de394..ec63514 100644
+--- a/debian-stable/compat
++++ b/debian-stable/compat
+@@ -1 +1 @@
+-11
++9
 diff --git a/debian-stable/control b/debian-stable/control
-index 4ed65f37e..7e9821af6 100644
+index 8fbf582..53743f5 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -3,7 +3,6 @@ Section: net
+@@ -3,8 +3,7 @@ Section: net
  Priority: optional
  Maintainer: Emmanuel Bouthenot <kolter@debian.org>
  Build-Depends:
 -    asciidoctor (>= 1.5.4),
-     debhelper (>= 9),
-     dh-exec,
+-    debhelper (>= 11),
++    debhelper (>= 9),
      cmake, pkg-config,
-@@ -16,7 +15,6 @@ Build-Depends:
+     libncursesw5-dev,
+     gem2deb,
+@@ -15,8 +14,6 @@ Build-Depends:
      tcl8.6-dev,
      guile-2.0-dev,
-     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-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,
      libcurl4-gnutls-dev,
      libgcrypt20-dev,
      libgnutls28-dev,
-@@ -45,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -108,7 +131,7 @@ index 4ed65f37e..7e9821af6 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -72,7 +70,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -117,7 +140,7 @@ index 4ed65f37e..7e9821af6 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -101,7 +99,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -126,15 +149,18 @@ index 4ed65f37e..7e9821af6 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -209,16 +207,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
   .
   This package provides the JavaScript scripting API plugin.
  
 -Package: weechat-php
 -Architecture: any
--Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
-- weechat-headless (= ${binary:Version}), libphp7.2-embed
--Description: Fast, light and extensible chat client - php plugin
+-Depends:
+-    ${misc:Depends},
+-    ${shlibs:Depends},
+-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}),
+-    libphp-embed
+-Description: Fast, light and extensible chat client - PHP plugin
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.
 - .
@@ -145,15 +171,15 @@ index 4ed65f37e..7e9821af6 100644
  Architecture: all
 diff --git a/debian-stable/weechat-php.dirs b/debian-stable/weechat-php.dirs
 deleted file mode 100644
-index 68457717b..000000000
+index 6845771..0000000
 --- a/debian-stable/weechat-php.dirs
 +++ /dev/null
 @@ -1 +0,0 @@
 -usr/lib
 diff --git a/debian-stable/weechat-php.install b/debian-stable/weechat-php.install
 deleted file mode 100644
-index 28b19cc1d..000000000
+index 0a1b735..0000000
 --- a/debian-stable/weechat-php.install
 +++ /dev/null
 @@ -1 +0,0 @@
--usr/lib/weechat/plugins/php.so
+-usr/lib/*/weechat/plugins/php.so
diff --git a/tools/debian/patches/weechat_debian_stretch.patch b/tools/debian/patches/weechat_debian_stretch.patch
index 95efbab5d..3d9b31112 100644
--- a/tools/debian/patches/weechat_debian_stretch.patch
+++ b/tools/debian/patches/weechat_debian_stretch.patch
@@ -1,44 +1,58 @@
+diff --git a/debian-devel/compat b/debian-devel/compat
+index b4de39476..f599e28b8 100644
+--- a/debian-devel/compat
++++ b/debian-devel/compat
+@@ -1 +1 @@
+-11
++10
 diff --git a/debian-devel/control b/debian-devel/control
-index 46b2f9a7e..3a29e501a 100644
+index d3a1dad8b..401f9c519 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -16,7 +16,7 @@ Build-Depends:
+@@ -4,7 +4,7 @@ Priority: optional
+ Maintainer: Sébastien Helleu <flashcode@flashtux.org>
+ Build-Depends:
+     asciidoctor (>= 1.5.4),
+-    debhelper (>= 11),
++    debhelper (>= 10),
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -15,7 +15,7 @@ Build-Depends:
      tcl8.6-dev,
      guile-2.0-dev,
-     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-dev,
-+    php7.0-dev, libphp7.0-embed, libxml2-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,
+     libxml2-dev,
      libcurl4-gnutls-dev,
      libgcrypt20-dev,
-     libgnutls28-dev,
-@@ -218,7 +218,7 @@ Description: Fast, light and extensible chat client - javascript plugin
- Package: weechat-devel-php
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
-- weechat-devel-headless (= ${binary:Version}), libphp7.2-embed
-+ weechat-devel-headless (= ${binary:Version}), libphp7.0-embed
- Conflicts: weechat-php
- Description: Fast, light and extensible chat client - php plugin
-  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+diff --git a/debian-stable/compat b/debian-stable/compat
+index b4de39476..f599e28b8 100644
+--- a/debian-stable/compat
++++ b/debian-stable/compat
+@@ -1 +1 @@
+-11
++10
 diff --git a/debian-stable/control b/debian-stable/control
-index 4ed65f37e..2e1e55446 100644
+index 8fbf582b3..20cd5038f 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -16,7 +16,7 @@ Build-Depends:
+@@ -4,7 +4,7 @@ Priority: optional
+ Maintainer: Emmanuel Bouthenot <kolter@debian.org>
+ Build-Depends:
+     asciidoctor (>= 1.5.4),
+-    debhelper (>= 11),
++    debhelper (>= 10),
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -15,7 +15,7 @@ Build-Depends:
      tcl8.6-dev,
      guile-2.0-dev,
-     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-dev,
-+    php7.0-dev, libphp7.0-embed, libxml2-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,
+     libxml2-dev,
      libcurl4-gnutls-dev,
      libgcrypt20-dev,
-     libgnutls28-dev,
-@@ -212,7 +212,7 @@ Description: Fast, light and extensible chat client - javascript plugin
- Package: weechat-php
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
-- weechat-headless (= ${binary:Version}), libphp7.2-embed
-+ weechat-headless (= ${binary:Version}), libphp7.0-embed
- Description: Fast, light and extensible chat client - php plugin
-  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
-  for many operating systems. Everything can be done with a keyboard.
diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch
index 2e415d585..ca1a36c17 100644
--- a/tools/debian/patches/weechat_debian_wheezy.patch
+++ b/tools/debian/patches/weechat_debian_wheezy.patch
@@ -1,26 +1,34 @@
+diff --git a/debian-devel/compat b/debian-devel/compat
+index b4de39476..ec635144f 100644
+--- a/debian-devel/compat
++++ b/debian-devel/compat
+@@ -1 +1 @@
+-11
++9
 diff --git a/debian-devel/control b/debian-devel/control
-index 46b2f9a7e..609cb9942 100644
+index d3a1dad8b..4c5953e46 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -3,9 +3,7 @@ Section: net
+@@ -3,8 +3,7 @@ Section: net
  Priority: optional
  Maintainer: Sébastien Helleu <flashcode@flashtux.org>
  Build-Depends:
 -    asciidoctor (>= 1.5.4),
-     debhelper (>= 9),
--    dh-exec,
+-    debhelper (>= 11),
++    debhelper (>= 9),
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -13,13 +11,12 @@ Build-Depends:
+@@ -12,14 +11,12 @@ Build-Depends:
      python-dev,
      libaspell-dev,
      liblua5.1-0-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],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-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,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
@@ -28,9 +36,9 @@ index 46b2f9a7e..609cb9942 100644
 +    libgcrypt11-dev,
 +    libgnutls-dev,
      zlib1g-dev
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.3
  Homepage: https://weechat.org/
-@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -39,7 +47,7 @@ index 46b2f9a7e..609cb9942 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -72,7 +69,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -48,7 +56,7 @@ index 46b2f9a7e..609cb9942 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -100,7 +97,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -57,16 +65,19 @@ index 46b2f9a7e..609cb9942 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -215,17 +212,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
   .
   This package provides the JavaScript scripting API plugin.
  
 -Package: weechat-devel-php
 -Architecture: any
--Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
-- weechat-devel-headless (= ${binary:Version}), libphp7.2-embed
+-Depends:
+-    ${misc:Depends},
+-    ${shlibs:Depends},
+-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version}),
+-    libphp-embed
 -Conflicts: weechat-php
--Description: Fast, light and extensible chat client - php plugin
+-Description: Fast, light and extensible chat client - PHP plugin
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.
 - .
@@ -75,6 +86,18 @@ index 46b2f9a7e..609cb9942 100644
  Package: weechat-devel-doc
  Section: doc
  Architecture: all
+diff --git a/debian-devel/rules b/debian-devel/rules
+index 16a5f9516..3edb65fa5 100755
+--- a/debian-devel/rules
++++ b/debian-devel/rules
+@@ -1,7 +1,5 @@
+ #!/usr/bin/make -f
+ 
+-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+-
+ BUILDDIR = builddir
+ 
+ $(BUILDDIR)/Makefile:
 diff --git a/debian-devel/weechat-devel-php.dirs b/debian-devel/weechat-devel-php.dirs
 deleted file mode 120000
 index e4853a588..000000000
@@ -91,29 +114,37 @@ index e358b515a..000000000
 @@ -1 +0,0 @@
 -../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
+--- a/debian-stable/compat
++++ b/debian-stable/compat
+@@ -1 +1 @@
+-11
++9
 diff --git a/debian-stable/control b/debian-stable/control
-index 4ed65f37e..08fe92709 100644
+index 8fbf582b3..a30e30053 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -3,9 +3,7 @@ Section: net
+@@ -3,8 +3,7 @@ Section: net
  Priority: optional
  Maintainer: Emmanuel Bouthenot <kolter@debian.org>
  Build-Depends:
 -    asciidoctor (>= 1.5.4),
-     debhelper (>= 9),
--    dh-exec,
+-    debhelper (>= 11),
++    debhelper (>= 9),
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -13,13 +11,12 @@ Build-Depends:
+@@ -12,14 +11,12 @@ Build-Depends:
      python-dev,
      libaspell-dev,
      liblua5.1-0-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],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-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,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
@@ -121,9 +152,9 @@ index 4ed65f37e..08fe92709 100644
 +    libgcrypt11-dev,
 +    libgnutls-dev,
      zlib1g-dev
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.3
  Homepage: https://weechat.org/
-@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -132,7 +163,7 @@ index 4ed65f37e..08fe92709 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -72,7 +69,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -141,7 +172,7 @@ index 4ed65f37e..08fe92709 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -101,7 +98,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -150,15 +181,18 @@ index 4ed65f37e..08fe92709 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -209,16 +206,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
   .
   This package provides the JavaScript scripting API plugin.
  
 -Package: weechat-php
 -Architecture: any
--Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
-- weechat-headless (= ${binary:Version}), libphp7.2-embed
--Description: Fast, light and extensible chat client - php plugin
+-Depends:
+-    ${misc:Depends},
+-    ${shlibs:Depends},
+-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}),
+-    libphp-embed
+-Description: Fast, light and extensible chat client - PHP plugin
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.
 - .
@@ -167,17 +201,18 @@ index 4ed65f37e..08fe92709 100644
  Package: weechat-doc
  Section: doc
  Architecture: all
-diff --git a/debian-stable/weechat-javascript.install b/debian-stable/weechat-javascript.install
-old mode 100755
-new mode 100644
-index 428bb933e..e6cabcbec
---- a/debian-stable/weechat-javascript.install
-+++ b/debian-stable/weechat-javascript.install
-@@ -1,3 +1 @@
--#!/usr/bin/dh-exec
+diff --git a/debian-stable/rules b/debian-stable/rules
+index 16a5f9516..3edb65fa5 100755
+--- a/debian-stable/rules
++++ b/debian-stable/rules
+@@ -1,7 +1,5 @@
+ #!/usr/bin/make -f
+ 
+-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 -
--[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
-+usr/lib/weechat/plugins/javascript.so
+ BUILDDIR = builddir
+ 
+ $(BUILDDIR)/Makefile:
 diff --git a/debian-stable/weechat-php.dirs b/debian-stable/weechat-php.dirs
 deleted file mode 100644
 index 68457717b..000000000
@@ -187,8 +222,8 @@ index 68457717b..000000000
 -usr/lib
 diff --git a/debian-stable/weechat-php.install b/debian-stable/weechat-php.install
 deleted file mode 100644
-index 28b19cc1d..000000000
+index 0a1b73563..000000000
 --- a/debian-stable/weechat-php.install
 +++ /dev/null
 @@ -1 +0,0 @@
--usr/lib/weechat/plugins/php.so
+-usr/lib/*/weechat/plugins/php.so
diff --git a/tools/debian/patches/weechat_ubuntu_artful.patch b/tools/debian/patches/weechat_ubuntu_artful.patch
index 703f2a2dd..ab23b0230 100644..120000
--- a/tools/debian/patches/weechat_ubuntu_artful.patch
+++ b/tools/debian/patches/weechat_ubuntu_artful.patch
@@ -1,44 +1 @@
-diff --git a/debian-devel/control b/debian-devel/control
-index 46b2f9a7e..b21e4ec33 100644
---- a/debian-devel/control
-+++ b/debian-devel/control
-@@ -16,7 +16,7 @@ Build-Depends:
-     tcl8.6-dev,
-     guile-2.0-dev,
-     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-dev,
-+    php7.1-dev, libphp7.1-embed, libxml2-dev,
-     libcurl4-gnutls-dev,
-     libgcrypt20-dev,
-     libgnutls28-dev,
-@@ -218,7 +218,7 @@ Description: Fast, light and extensible chat client - javascript plugin
- Package: weechat-devel-php
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
-- weechat-devel-headless (= ${binary:Version}), libphp7.2-embed
-+ weechat-devel-headless (= ${binary:Version}), libphp7.1-embed
- Conflicts: weechat-php
- Description: Fast, light and extensible chat client - php plugin
-  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
-diff --git a/debian-stable/control b/debian-stable/control
-index 4ed65f37e..63aba85ef 100644
---- a/debian-stable/control
-+++ b/debian-stable/control
-@@ -16,7 +16,7 @@ Build-Depends:
-     tcl8.6-dev,
-     guile-2.0-dev,
-     libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-dev,
-+    php7.1-dev, libphp7.1-embed, libxml2-dev,
-     libcurl4-gnutls-dev,
-     libgcrypt20-dev,
-     libgnutls28-dev,
-@@ -212,7 +212,7 @@ Description: Fast, light and extensible chat client - javascript plugin
- Package: weechat-php
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
-- weechat-headless (= ${binary:Version}), libphp7.2-embed
-+ weechat-headless (= ${binary:Version}), libphp7.1-embed
- Description: Fast, light and extensible chat client - php plugin
-  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
-  for many operating systems. Everything can be done with a keyboard.
+weechat_debian_stretch.patch
\ No newline at end of file
diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch
index dc622347a..dd67baf2a 100644
--- a/tools/debian/patches/weechat_ubuntu_trusty.patch
+++ b/tools/debian/patches/weechat_ubuntu_trusty.patch
@@ -1,23 +1,31 @@
+diff --git a/debian-devel/compat b/debian-devel/compat
+index b4de39476..ec635144f 100644
+--- a/debian-devel/compat
++++ b/debian-devel/compat
+@@ -1 +1 @@
+-11
++9
 diff --git a/debian-devel/control b/debian-devel/control
-index 46b2f9a7e..8f6af7d42 100644
+index d3a1dad8b..718ae26b5 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
-@@ -3,9 +3,7 @@ Section: net
+@@ -3,8 +3,7 @@ Section: net
  Priority: optional
  Maintainer: Sébastien Helleu <flashcode@flashtux.org>
  Build-Depends:
 -    asciidoctor (>= 1.5.4),
-     debhelper (>= 9),
--    dh-exec,
+-    debhelper (>= 11),
++    debhelper (>= 9),
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -15,11 +13,10 @@ Build-Depends:
+@@ -14,12 +13,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],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-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,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
@@ -25,9 +33,9 @@ index 46b2f9a7e..8f6af7d42 100644
 +    libgcrypt11-dev,
 +    libgnutls-dev,
      zlib1g-dev
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.3
  Homepage: https://weechat.org/
-@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -47,7 +44,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -36,7 +44,7 @@ index 46b2f9a7e..8f6af7d42 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -72,7 +69,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -45,7 +53,7 @@ index 46b2f9a7e..8f6af7d42 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -100,7 +97,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -54,16 +62,19 @@ index 46b2f9a7e..8f6af7d42 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -215,17 +212,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
   .
   This package provides the JavaScript scripting API plugin.
  
 -Package: weechat-devel-php
 -Architecture: any
--Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
-- weechat-devel-headless (= ${binary:Version}), libphp7.2-embed
+-Depends:
+-    ${misc:Depends},
+-    ${shlibs:Depends},
+-    weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version}),
+-    libphp-embed
 -Conflicts: weechat-php
--Description: Fast, light and extensible chat client - php plugin
+-Description: Fast, light and extensible chat client - PHP plugin
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.
 - .
@@ -88,26 +99,34 @@ index e358b515a..000000000
 @@ -1 +0,0 @@
 -../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
+--- a/debian-stable/compat
++++ b/debian-stable/compat
+@@ -1 +1 @@
+-11
++9
 diff --git a/debian-stable/control b/debian-stable/control
-index 4ed65f37e..280b38d92 100644
+index 8fbf582b3..f08af5ea6 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
-@@ -3,9 +3,7 @@ Section: net
+@@ -3,8 +3,7 @@ Section: net
  Priority: optional
  Maintainer: Emmanuel Bouthenot <kolter@debian.org>
  Build-Depends:
 -    asciidoctor (>= 1.5.4),
-     debhelper (>= 9),
--    dh-exec,
+-    debhelper (>= 11),
++    debhelper (>= 9),
      cmake, pkg-config,
      libncursesw5-dev,
      gem2deb,
-@@ -15,11 +13,10 @@ Build-Depends:
+@@ -14,12 +13,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],
--    php7.2-dev, libphp7.2-embed, libxml2-dev, libargon2-0-dev, libsodium-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,
 +    libv8-dev,
      libcurl4-gnutls-dev,
 -    libgcrypt20-dev,
@@ -115,9 +134,9 @@ index 4ed65f37e..280b38d92 100644
 +    libgcrypt11-dev,
 +    libgnutls-dev,
      zlib1g-dev
- Standards-Version: 3.9.8
+ Standards-Version: 4.1.3
  Homepage: https://weechat.org/
-@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -126,7 +145,7 @@ index 4ed65f37e..280b38d92 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -72,7 +69,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -135,7 +154,7 @@ index 4ed65f37e..280b38d92 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -101,7 +98,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -144,15 +163,18 @@ index 4ed65f37e..280b38d92 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -209,16 +206,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
   .
   This package provides the JavaScript scripting API plugin.
  
 -Package: weechat-php
 -Architecture: any
--Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
-- weechat-headless (= ${binary:Version}), libphp7.2-embed
--Description: Fast, light and extensible chat client - php plugin
+-Depends:
+-    ${misc:Depends},
+-    ${shlibs:Depends},
+-    weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}),
+-    libphp-embed
+-Description: Fast, light and extensible chat client - PHP plugin
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.
 - .
@@ -161,28 +183,3 @@ index 4ed65f37e..280b38d92 100644
  Package: weechat-doc
  Section: doc
  Architecture: all
-diff --git a/debian-stable/weechat-javascript.install b/debian-stable/weechat-javascript.install
-old mode 100755
-new mode 100644
-index 428bb933e..e6cabcbec
---- a/debian-stable/weechat-javascript.install
-+++ b/debian-stable/weechat-javascript.install
-@@ -1,3 +1 @@
--#!/usr/bin/dh-exec
--
--[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so
-+usr/lib/weechat/plugins/javascript.so
-diff --git a/debian-stable/weechat-php.dirs b/debian-stable/weechat-php.dirs
-deleted file mode 100644
-index 68457717b..000000000
---- a/debian-stable/weechat-php.dirs
-+++ /dev/null
-@@ -1 +0,0 @@
--usr/lib
-diff --git a/debian-stable/weechat-php.install b/debian-stable/weechat-php.install
-deleted file mode 100644
-index 28b19cc1d..000000000
---- a/debian-stable/weechat-php.install
-+++ /dev/null
-@@ -1 +0,0 @@
--usr/lib/weechat/plugins/php.so
diff --git a/tools/debian/patches/weechat_ubuntu_xenial.patch b/tools/debian/patches/weechat_ubuntu_xenial.patch
index ab23b0230..8b5e54d11 120000..100644
--- a/tools/debian/patches/weechat_ubuntu_xenial.patch
+++ b/tools/debian/patches/weechat_ubuntu_xenial.patch
@@ -1 +1,58 @@
-weechat_debian_stretch.patch
\ No newline at end of file
+diff --git a/debian-devel/compat b/debian-devel/compat
+index b4de39476..ec635144f 100644
+--- a/debian-devel/compat
++++ b/debian-devel/compat
+@@ -1 +1 @@
+-11
++9
+diff --git a/debian-devel/control b/debian-devel/control
+index d3a1dad8b..b078f38ac 100644
+--- a/debian-devel/control
++++ b/debian-devel/control
+@@ -4,7 +4,7 @@ Priority: optional
+ Maintainer: Sébastien Helleu <flashcode@flashtux.org>
+ Build-Depends:
+     asciidoctor (>= 1.5.4),
+-    debhelper (>= 11),
++    debhelper (>= 9),
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -15,7 +15,7 @@ Build-Depends:
+     tcl8.6-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,
+     libxml2-dev,
+     libcurl4-gnutls-dev,
+     libgcrypt20-dev,
+diff --git a/debian-stable/compat b/debian-stable/compat
+index b4de39476..ec635144f 100644
+--- a/debian-stable/compat
++++ b/debian-stable/compat
+@@ -1 +1 @@
+-11
++9
+diff --git a/debian-stable/control b/debian-stable/control
+index 8fbf582b3..cb34db2da 100644
+--- a/debian-stable/control
++++ b/debian-stable/control
+@@ -4,7 +4,7 @@ Priority: optional
+ Maintainer: Emmanuel Bouthenot <kolter@debian.org>
+ Build-Depends:
+     asciidoctor (>= 1.5.4),
+-    debhelper (>= 11),
++    debhelper (>= 9),
+     cmake, pkg-config,
+     libncursesw5-dev,
+     gem2deb,
+@@ -15,7 +15,7 @@ Build-Depends:
+     tcl8.6-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,
+     libxml2-dev,
+     libcurl4-gnutls-dev,
+     libgcrypt20-dev,