debian: update debian/ubuntu/raspbian patches

1 files changed, 30 insertions, 12 deletions

diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch
index 3f62ddbec..dc622347a 100644
--- a/tools/debian/patches/weechat_ubuntu_trusty.patch
+++ b/tools/debian/patches/weechat_ubuntu_trusty.patch
@@ -1,5 +1,5 @@
 diff --git a/debian-devel/control b/debian-devel/control
-index f8f027d8e..d382c2c9d 100644
+index 46b2f9a7e..8f6af7d42 100644
 --- a/debian-devel/control
 +++ b/debian-devel/control
 @@ -3,9 +3,7 @@ Section: net
@@ -27,7 +27,7 @@ index f8f027d8e..d382c2c9d 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
-@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client
+@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -36,7 +36,7 @@ index f8f027d8e..d382c2c9d 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -71,7 +68,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -72,7 +69,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -45,14 +45,23 @@ index f8f027d8e..d382c2c9d 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -178,17 +175,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -100,7 +97,7 @@ Description: Fast, light and extensible chat client - console client
+   - 256 colors support
+   - incremental text search
+   - dynamic filtering of buffer content
+-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
++  - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
+   - script manager
+   - spell checking
+   - highly customizable and extensible
+@@ -215,17 +212,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}),
-- libphp7.2-embed
+-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+- weechat-devel-headless (= ${binary:Version}), libphp7.2-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
@@ -80,7 +89,7 @@ index e358b515a..000000000
 -../debian-stable/weechat-php.install
 \ No newline at end of file
 diff --git a/debian-stable/control b/debian-stable/control
-index a68d181e8..6c5ef314a 100644
+index 4ed65f37e..280b38d92 100644
 --- a/debian-stable/control
 +++ b/debian-stable/control
 @@ -3,9 +3,7 @@ Section: net
@@ -108,7 +117,16 @@ index a68d181e8..6c5ef314a 100644
      zlib1g-dev
  Standards-Version: 3.9.8
  Homepage: https://weechat.org/
-@@ -44,7 +41,7 @@ Description: Fast, light and extensible chat client
+@@ -45,7 +42,7 @@ Description: Fast, light and extensible chat client (metapackage)
+   - 256 colors support
+   - incremental text search
+   - dynamic filtering of buffer content
+-  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
++  - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
+   - script manager
+   - spell checking
+   - highly customizable and extensible
+@@ -72,7 +69,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -117,7 +135,7 @@ index a68d181e8..6c5ef314a 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -71,7 +68,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -101,7 +98,7 @@ Description: Fast, light and extensible chat client - console client
    - 256 colors support
    - incremental text search
    - dynamic filtering of buffer content
@@ -126,14 +144,14 @@ index a68d181e8..6c5ef314a 100644
    - script manager
    - spell checking
    - highly customizable and extensible
-@@ -171,16 +168,6 @@ Description: Fast, light and extensible chat client - javascript plugin
+@@ -209,16 +206,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}),
-- libphp7.2-embed
+-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
 - WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
 - for many operating systems. Everything can be done with a keyboard.