diff --git a/tools/debian/patches/weechat_debian_jessie.patch b/tools/debian/patches/weechat_debian_jessie.patch index 57c9b42e6..7d81d87f8 100644 --- a/tools/debian/patches/weechat_debian_jessie.patch +++ b/tools/debian/patches/weechat_debian_jessie.patch @@ -1,5 +1,5 @@ diff --git a/debian-devel/control b/debian-devel/control -index cc7685a70..feccc9b0d 100644 +index f8f027d8e..2d8385074 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -3,7 +3,6 @@ Section: net @@ -36,17 +36,42 @@ index cc7685a70..feccc9b0d 100644 - scripts manager - spell checking - highly customizable and extensible -@@ -102,7 +100,7 @@ Description: Fast, light and extensible chat client - plugins +@@ -178,17 +176,6 @@ Description: Fast, light and extensible chat client - javascript plugin . - This package provides some plugins to enhance WeeChat. It currently - ships the following plugins: -- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting -+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting - - scripts manager - - Spell checking (thanks to aspell) - - FIFO pipe for remote control + 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.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 +- for many operating systems. Everything can be done with a keyboard. +- . +- This package provides the PHP scripting API plugin. +- + Package: weechat-devel-doc + Section: doc + 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 +--- a/debian-devel/weechat-devel-php.dirs ++++ /dev/null +@@ -1 +0,0 @@ +-../debian-stable/weechat-php.dirs +\ 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 +--- 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/control b/debian-stable/control -index 2829be49b..bd11f06bb 100644 +index a68d181e8..e71154b6d 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -3,7 +3,6 @@ Section: net @@ -83,24 +108,34 @@ index 2829be49b..bd11f06bb 100644 - scripts manager - spell checking - highly customizable and extensible -@@ -102,7 +100,7 @@ Description: Fast, light and extensible chat client - plugins +@@ -171,16 +169,6 @@ Description: Fast, light and extensible chat client - javascript plugin . - This package provides some plugins to enhance WeeChat. It currently - ships the following plugins: -- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting -+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting - - scripts manager - - Spell checking (thanks to aspell) - - FIFO pipe for remote control -diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install -index 2d601e09b..198360ffa 100755 ---- a/debian-stable/weechat-plugins.install -+++ b/debian-stable/weechat-plugins.install -@@ -7,7 +7,6 @@ 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/lua.so - usr/lib/weechat/plugins/perl.so + This package provides the JavaScript scripting API plugin. + +-Package: weechat-php +-Architecture: any +-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${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. +- . +- This package provides the PHP scripting API plugin. +- + Package: weechat-doc + Section: doc + Architecture: all +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 - usr/lib/weechat/plugins/python.so - usr/lib/weechat/plugins/relay.so - usr/lib/weechat/plugins/ruby.so diff --git a/tools/debian/patches/weechat_debian_stretch.patch b/tools/debian/patches/weechat_debian_stretch.patch index 9a6b54314..10fad3e06 100644 --- a/tools/debian/patches/weechat_debian_stretch.patch +++ b/tools/debian/patches/weechat_debian_stretch.patch @@ -1,5 +1,5 @@ diff --git a/debian-devel/control b/debian-devel/control -index cc7685a70..7904b7454 100644 +index f8f027d8e..1161649fc 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -16,7 +16,7 @@ Build-Depends: @@ -11,8 +11,17 @@ index cc7685a70..7904b7454 100644 libcurl4-gnutls-dev, libgcrypt20-dev, libgnutls28-dev, +@@ -181,7 +181,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}), +- libphp7.1-embed ++ 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/control b/debian-stable/control -index 2829be49b..e7185abb5 100644 +index a68d181e8..656e2def3 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -16,7 +16,7 @@ Build-Depends: @@ -24,3 +33,12 @@ index 2829be49b..e7185abb5 100644 libcurl4-gnutls-dev, libgcrypt20-dev, libgnutls28-dev, +@@ -174,7 +174,7 @@ Description: Fast, light and extensible chat client - javascript plugin + Package: weechat-php + Architecture: any + Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}), +- libphp7.1-embed ++ 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 855243e38..2631b5d66 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 cc7685a70..465269b3e 100644 +index f8f027d8e..312d315fa 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -3,9 +3,7 @@ Section: net @@ -48,17 +48,42 @@ index cc7685a70..465269b3e 100644 - scripts manager - spell checking - highly customizable and extensible -@@ -102,7 +99,7 @@ Description: Fast, light and extensible chat client - plugins +@@ -178,17 +175,6 @@ Description: Fast, light and extensible chat client - javascript plugin . - This package provides some plugins to enhance WeeChat. It currently - ships the following plugins: -- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting -+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting - - scripts manager - - Spell checking (thanks to aspell) - - FIFO pipe for remote control + 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.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 +- for many operating systems. Everything can be done with a keyboard. +- . +- This package provides the PHP scripting API plugin. +- + Package: weechat-devel-doc + Section: doc + 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 +--- a/debian-devel/weechat-devel-php.dirs ++++ /dev/null +@@ -1 +0,0 @@ +-../debian-stable/weechat-php.dirs +\ 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 +--- 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/control b/debian-stable/control -index 2829be49b..09a7327d3 100644 +index a68d181e8..9554e0884 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -3,9 +3,7 @@ Section: net @@ -107,33 +132,45 @@ index 2829be49b..09a7327d3 100644 - scripts manager - spell checking - highly customizable and extensible -@@ -102,7 +99,7 @@ Description: Fast, light and extensible chat client - plugins +@@ -171,16 +168,6 @@ Description: Fast, light and extensible chat client - javascript plugin . - This package provides some plugins to enhance WeeChat. It currently - ships the following plugins: -- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting -+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting - - scripts manager - - Spell checking (thanks to aspell) - - FIFO pipe for remote control -diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install + This package provides the JavaScript scripting API plugin. + +-Package: weechat-php +-Architecture: any +-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${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. +- . +- This package provides the PHP scripting API plugin. +- + 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 2d601e09b..980192fa4 ---- a/debian-stable/weechat-plugins.install -+++ b/debian-stable/weechat-plugins.install -@@ -1,13 +1,10 @@ +index 428bb933e..e6cabcbec +--- a/debian-stable/weechat-javascript.install ++++ b/debian-stable/weechat-javascript.install +@@ -1,3 +1 @@ -#!/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 +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 - usr/lib/weechat/plugins/python.so - usr/lib/weechat/plugins/relay.so - usr/lib/weechat/plugins/ruby.so diff --git a/tools/debian/patches/weechat_ubuntu_trusty.patch b/tools/debian/patches/weechat_ubuntu_trusty.patch index c3894bbb9..b46c3543b 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 cc7685a70..7d33e63e4 100644 +index f8f027d8e..d382c2c9d 100644 --- a/debian-devel/control +++ b/debian-devel/control @@ -3,9 +3,7 @@ Section: net @@ -45,17 +45,42 @@ index cc7685a70..7d33e63e4 100644 - scripts manager - spell checking - highly customizable and extensible -@@ -102,7 +99,7 @@ Description: Fast, light and extensible chat client - plugins +@@ -178,17 +175,6 @@ Description: Fast, light and extensible chat client - javascript plugin . - This package provides some plugins to enhance WeeChat. It currently - ships the following plugins: -- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting -+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting - - scripts manager - - Spell checking (thanks to aspell) - - FIFO pipe for remote control + 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.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 +- for many operating systems. Everything can be done with a keyboard. +- . +- This package provides the PHP scripting API plugin. +- + Package: weechat-devel-doc + Section: doc + 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 +--- a/debian-devel/weechat-devel-php.dirs ++++ /dev/null +@@ -1 +0,0 @@ +-../debian-stable/weechat-php.dirs +\ 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 +--- 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/control b/debian-stable/control -index 2829be49b..8dbfc0902 100644 +index a68d181e8..6c5ef314a 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -3,9 +3,7 @@ Section: net @@ -101,33 +126,45 @@ index 2829be49b..8dbfc0902 100644 - scripts manager - spell checking - highly customizable and extensible -@@ -102,7 +99,7 @@ Description: Fast, light and extensible chat client - plugins +@@ -171,16 +168,6 @@ Description: Fast, light and extensible chat client - javascript plugin . - This package provides some plugins to enhance WeeChat. It currently - ships the following plugins: -- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting -+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting - - scripts manager - - Spell checking (thanks to aspell) - - FIFO pipe for remote control -diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install + This package provides the JavaScript scripting API plugin. + +-Package: weechat-php +-Architecture: any +-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${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. +- . +- This package provides the PHP scripting API plugin. +- + 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 2d601e09b..980192fa4 ---- a/debian-stable/weechat-plugins.install -+++ b/debian-stable/weechat-plugins.install -@@ -1,13 +1,10 @@ +index 428bb933e..e6cabcbec +--- a/debian-stable/weechat-javascript.install ++++ b/debian-stable/weechat-javascript.install +@@ -1,3 +1 @@ -#!/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 +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 - usr/lib/weechat/plugins/python.so - usr/lib/weechat/plugins/relay.so - usr/lib/weechat/plugins/ruby.so