summaryrefslogtreecommitdiff
path: root/tools/debian
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2020-06-13 13:51:01 +0200
committerSébastien Helleu <flashcode@flashtux.org>2020-06-13 14:34:13 +0200
commit340d6646a6371e2f224d392c9b1b44c8a20b5074 (patch)
tree8b376bb55fda309f4943e1859c5bfe1e41e6870b /tools/debian
parent99a324b76f4dd91e15e6ccabf7ae5b97927105c5 (diff)
downloadweechat-340d6646a6371e2f224d392c9b1b44c8a20b5074.zip
javascript: disable build by default and remove Debian packaging of JavaScript plugin (issue #360)
Diffstat (limited to 'tools/debian')
l---------tools/debian/patches/weechat_debian_bullseye.patch1
l---------tools/debian/patches/weechat_debian_buster.patch1
-rw-r--r--tools/debian/patches/weechat_debian_jessie.patch58
-rw-r--r--tools/debian/patches/weechat_debian_sid.patch171
-rw-r--r--tools/debian/patches/weechat_debian_stretch.patch14
-rw-r--r--tools/debian/patches/weechat_debian_wheezy.patch56
l---------tools/debian/patches/weechat_ubuntu_eoan.patch1
l---------tools/debian/patches/weechat_ubuntu_focal.patch1
l---------tools/debian/patches/weechat_ubuntu_groovy.patch1
-rw-r--r--tools/debian/patches/weechat_ubuntu_trusty.patch70
-rw-r--r--tools/debian/patches/weechat_ubuntu_xenial.patch14
11 files changed, 106 insertions, 282 deletions
diff --git a/tools/debian/patches/weechat_debian_bullseye.patch b/tools/debian/patches/weechat_debian_bullseye.patch
deleted file mode 120000
index 2c583046b..000000000
--- a/tools/debian/patches/weechat_debian_bullseye.patch
+++ /dev/null
@@ -1 +0,0 @@
-weechat_debian_sid.patch \ No newline at end of file
diff --git a/tools/debian/patches/weechat_debian_buster.patch b/tools/debian/patches/weechat_debian_buster.patch
deleted file mode 120000
index 2c583046b..000000000
--- a/tools/debian/patches/weechat_debian_buster.patch
+++ /dev/null
@@ -1 +0,0 @@
-weechat_debian_sid.patch \ No newline at end of file
diff --git a/tools/debian/patches/weechat_debian_jessie.patch b/tools/debian/patches/weechat_debian_jessie.patch
index 6087254d8..4f695f2f6 100644
--- a/tools/debian/patches/weechat_debian_jessie.patch
+++ b/tools/debian/patches/weechat_debian_jessie.patch
@@ -6,10 +6,10 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
-index a862fdd6c..574235330 100644
+index bf94a36f1..7e7c82a21 100644
--- a/debian-devel/control
+++ b/debian-devel/control
-@@ -3,20 +3,17 @@ Section: net
+@@ -3,19 +3,16 @@ Section: net
Priority: optional
Maintainer: Sébastien Helleu <flashcode@flashtux.org>
Build-Depends:
@@ -26,43 +26,42 @@ index a862fdd6c..574235330 100644
+ liblua5.1-0-dev,
tcl8.6-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,
- libxml2-dev,
++ guile-2.0-dev,
libcurl4-gnutls-dev,
libgcrypt20-dev,
libgnutls28-dev,
-@@ -47,7 +44,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
-- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -76,7 +73,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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
+@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless 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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
+@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
- This package provides the JavaScript scripting API plugin.
+ This package provides the Guile scripting API plugin.
-Package: weechat-devel-php
-Architecture: any
@@ -117,10 +116,10 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
-index c0326b3f5..c3e7ed681 100644
+index ccf81cac8..d753f6856 100644
--- a/debian-stable/control
+++ b/debian-stable/control
-@@ -3,20 +3,17 @@ Section: net
+@@ -3,19 +3,16 @@ Section: net
Priority: optional
Maintainer: Emmanuel Bouthenot <kolter@debian.org>
Build-Depends:
@@ -137,43 +136,42 @@ index c0326b3f5..c3e7ed681 100644
+ liblua5.1-0-dev,
tcl8.6-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,
- libxml2-dev,
++ guile-2.0-dev,
libcurl4-gnutls-dev,
libgcrypt20-dev,
libgnutls28-dev,
-@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -74,7 +71,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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
+@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless 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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
+@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
- This package provides the JavaScript scripting API plugin.
+ This package provides the Guile scripting API plugin.
-Package: weechat-php
-Architecture: any
diff --git a/tools/debian/patches/weechat_debian_sid.patch b/tools/debian/patches/weechat_debian_sid.patch
deleted file mode 100644
index 031858d28..000000000
--- a/tools/debian/patches/weechat_debian_sid.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff --git a/debian-devel/control b/debian-devel/control
-index ffca1a17f..5e93066ef 100644
---- a/debian-devel/control
-+++ b/debian-devel/control
-@@ -14,7 +14,6 @@ Build-Depends:
- liblua5.3-dev,
- tcl8.6-dev,
- guile-2.2-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,
-@@ -47,7 +46,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 PHP scripting
- - script manager
- - spell checking
- - highly customizable and extensible
-@@ -77,7 +76,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 PHP scripting
- - script manager
- - spell checking
- - highly customizable and extensible
-@@ -108,7 +107,7 @@ Description: Fast, light and extensible chat client - headless 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 PHP scripting
- - script manager
- - spell checking
- - highly customizable and extensible
-@@ -233,19 +232,6 @@ Description: Fast, light and extensible chat client - Guile plugin
- .
- This package provides the Guile scripting API plugin.
-
--Package: weechat-devel-javascript
--Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
--Depends:
-- ${misc:Depends},
-- ${shlibs:Depends},
-- weechat-devel-curses (= ${binary:Version}) | weechat-devel-headless (= ${binary:Version})
--Conflicts: weechat-javascript
--Description: Fast, light and extensible chat client - JavaScript 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 JavaScript scripting API plugin.
--
- Package: weechat-devel-php
- Architecture: any
- Depends:
-diff --git a/debian-devel/rules b/debian-devel/rules
-index 16a5f9516..9f6dd8106 100755
---- a/debian-devel/rules
-+++ b/debian-devel/rules
-@@ -12,6 +12,7 @@ $(BUILDDIR)/Makefile:
- -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
- -DENABLE_DOC:BOOL=ON \
- -DENABLE_MAN:BOOL=ON \
-+ -DENABLE_JAVASCRIPT:BOOL=OFF \
- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
- -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
- -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
-diff --git a/debian-devel/weechat-devel-javascript.dirs b/debian-devel/weechat-devel-javascript.dirs
-deleted file mode 120000
-index 1043d969a..000000000
---- a/debian-devel/weechat-devel-javascript.dirs
-+++ /dev/null
-@@ -1 +0,0 @@
--../debian-stable/weechat-javascript.dirs
-\ No newline at end of file
-diff --git a/debian-devel/weechat-devel-javascript.install b/debian-devel/weechat-devel-javascript.install
-deleted file mode 120000
-index d6f1f4a52..000000000
---- a/debian-devel/weechat-devel-javascript.install
-+++ /dev/null
-@@ -1 +0,0 @@
--../debian-stable/weechat-javascript.install
-\ No newline at end of file
-diff --git a/debian-stable/control b/debian-stable/control
-index 8fd0bf1a6..d8ab6f6e2 100644
---- a/debian-stable/control
-+++ b/debian-stable/control
-@@ -14,7 +14,6 @@ Build-Depends:
- liblua5.3-dev,
- tcl8.6-dev,
- guile-2.2-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,
-@@ -46,7 +45,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 PHP scripting
- - script manager
- - spell checking
- - highly customizable and extensible
-@@ -75,7 +74,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 PHP scripting
- - script manager
- - spell checking
- - highly customizable and extensible
-@@ -105,7 +104,7 @@ Description: Fast, light and extensible chat client - headless 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 PHP scripting
- - script manager
- - spell checking
- - highly customizable and extensible
-@@ -222,18 +221,6 @@ Description: Fast, light and extensible chat client - Guile plugin
- .
- This package provides the Guile scripting API plugin.
-
--Package: weechat-javascript
--Architecture: amd64 i386 armel armhf mips mipsel hurd-i386 kfreebsd-amd64 kfreebsd-i386
--Depends:
-- ${misc:Depends},
-- ${shlibs:Depends},
-- weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version})
--Description: Fast, light and extensible chat client - JavaScript 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 JavaScript scripting API plugin.
--
- Package: weechat-php
- Architecture: any
- Depends:
-diff --git a/debian-stable/rules b/debian-stable/rules
-index 16a5f9516..9f6dd8106 100755
---- a/debian-stable/rules
-+++ b/debian-stable/rules
-@@ -12,6 +12,7 @@ $(BUILDDIR)/Makefile:
- -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \
- -DENABLE_DOC:BOOL=ON \
- -DENABLE_MAN:BOOL=ON \
-+ -DENABLE_JAVASCRIPT:BOOL=OFF \
- -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
- -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$(CFLAGS) -D_FORTIFY_SOURCE=2" \
- -DCMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING="$(LDFLAGS)" \
-diff --git a/debian-stable/weechat-javascript.dirs b/debian-stable/weechat-javascript.dirs
-deleted file mode 100644
-index 68457717b..000000000
---- a/debian-stable/weechat-javascript.dirs
-+++ /dev/null
-@@ -1 +0,0 @@
--usr/lib
-diff --git a/debian-stable/weechat-javascript.install b/debian-stable/weechat-javascript.install
-deleted file mode 100644
-index 6e9829e1c..000000000
---- a/debian-stable/weechat-javascript.install
-+++ /dev/null
-@@ -1 +0,0 @@
--usr/lib/*/weechat/plugins/javascript.so
diff --git a/tools/debian/patches/weechat_debian_stretch.patch b/tools/debian/patches/weechat_debian_stretch.patch
index f1bbdd8c9..d706321a0 100644
--- a/tools/debian/patches/weechat_debian_stretch.patch
+++ b/tools/debian/patches/weechat_debian_stretch.patch
@@ -6,7 +6,7 @@ index 48082f72f..f599e28b8 100644
-12
+10
diff --git a/debian-devel/control b/debian-devel/control
-index a862fdd6c..82f60bba5 100644
+index bf94a36f1..ae29ae9ec 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -4,7 +4,7 @@ Priority: optional
@@ -18,14 +18,13 @@ index a862fdd6c..82f60bba5 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -13,9 +13,9 @@ Build-Depends:
+@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-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,
++ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,
@@ -38,7 +37,7 @@ index 48082f72f..f599e28b8 100644
-12
+10
diff --git a/debian-stable/control b/debian-stable/control
-index c0326b3f5..b0abc205a 100644
+index ccf81cac8..3e6563e42 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -4,7 +4,7 @@ Priority: optional
@@ -50,14 +49,13 @@ index c0326b3f5..b0abc205a 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -13,9 +13,9 @@ Build-Depends:
+@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-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,
++ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,
diff --git a/tools/debian/patches/weechat_debian_wheezy.patch b/tools/debian/patches/weechat_debian_wheezy.patch
index 5934acbc5..0faa49639 100644
--- a/tools/debian/patches/weechat_debian_wheezy.patch
+++ b/tools/debian/patches/weechat_debian_wheezy.patch
@@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
-index a862fdd6c..0b3c016ff 100644
+index bf94a36f1..8d4d60e9f 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -3,8 +3,7 @@ Section: net
@@ -19,18 +19,16 @@ index a862fdd6c..0b3c016ff 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -12,14 +11,12 @@ Build-Depends:
+@@ -12,13 +11,11 @@ Build-Depends:
python3-dev,
libaspell-dev,
liblua5.3-dev,
- tcl8.6-dev,
- guile-2.2-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,
+ tcl8.5-dev,
+ guile-2.0-dev,
-+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@@ -39,36 +37,36 @@ index a862fdd6c..0b3c016ff 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
-@@ -47,7 +44,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
-- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -76,7 +73,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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
+@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless 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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
+@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
- This package provides the JavaScript scripting API plugin.
+ This package provides the Guile scripting API plugin.
-Package: weechat-devel-php
-Architecture: any
@@ -123,7 +121,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
-index c0326b3f5..44206d418 100644
+index ccf81cac8..ee2e092eb 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -3,8 +3,7 @@ Section: net
@@ -136,18 +134,16 @@ index c0326b3f5..44206d418 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -12,14 +11,12 @@ Build-Depends:
+@@ -12,13 +11,11 @@ Build-Depends:
python3-dev,
libaspell-dev,
liblua5.3-dev,
- tcl8.6-dev,
- guile-2.2-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,
+ tcl8.5-dev,
+ guile-2.0-dev,
-+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@@ -156,36 +152,36 @@ index c0326b3f5..44206d418 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
-@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -74,7 +71,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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
+@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless 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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
+@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
- This package provides the JavaScript scripting API plugin.
+ This package provides the Guile scripting API plugin.
-Package: weechat-php
-Architecture: any
diff --git a/tools/debian/patches/weechat_ubuntu_eoan.patch b/tools/debian/patches/weechat_ubuntu_eoan.patch
deleted file mode 120000
index 2c583046b..000000000
--- a/tools/debian/patches/weechat_ubuntu_eoan.patch
+++ /dev/null
@@ -1 +0,0 @@
-weechat_debian_sid.patch \ No newline at end of file
diff --git a/tools/debian/patches/weechat_ubuntu_focal.patch b/tools/debian/patches/weechat_ubuntu_focal.patch
deleted file mode 120000
index 2c583046b..000000000
--- a/tools/debian/patches/weechat_ubuntu_focal.patch
+++ /dev/null
@@ -1 +0,0 @@
-weechat_debian_sid.patch \ No newline at end of file
diff --git a/tools/debian/patches/weechat_ubuntu_groovy.patch b/tools/debian/patches/weechat_ubuntu_groovy.patch
deleted file mode 120000
index 2c583046b..000000000
--- a/tools/debian/patches/weechat_ubuntu_groovy.patch
+++ /dev/null
@@ -1 +0,0 @@
-weechat_debian_sid.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 96ec37b40..b38c529c9 100644
--- a/tools/debian/patches/weechat_ubuntu_trusty.patch
+++ b/tools/debian/patches/weechat_ubuntu_trusty.patch
@@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
-index a862fdd6c..968534b1c 100644
+index bf94a36f1..566d71f09 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -3,8 +3,7 @@ Section: net
@@ -19,16 +19,14 @@ index a862fdd6c..968534b1c 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -13,13 +12,11 @@ Build-Depends:
+@@ -13,12 +12,10 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-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,
+ guile-2.0-dev,
-+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@@ -37,36 +35,36 @@ index a862fdd6c..968534b1c 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
-@@ -47,7 +44,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
-- - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
-+ - Perl, Python, Ruby, Lua, Tcl, Scheme and JavaScript scripting
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -77,7 +74,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -76,7 +73,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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -108,7 +105,7 @@ Description: Fast, light and extensible chat client - headless client
+@@ -107,7 +104,7 @@ Description: Fast, light and extensible chat client - headless 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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -246,20 +243,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
+@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
- This package provides the JavaScript scripting API plugin.
+ This package provides the Guile scripting API plugin.
-Package: weechat-devel-php
-Architecture: any
@@ -109,7 +107,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
-index c0326b3f5..a5a44c65a 100644
+index ccf81cac8..b11b9b64e 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -3,8 +3,7 @@ Section: net
@@ -122,16 +120,14 @@ index c0326b3f5..a5a44c65a 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -13,13 +12,11 @@ Build-Depends:
+@@ -13,12 +12,10 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-dev,
- guile-2.2-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,
+ guile-2.0-dev,
-+ libv8-dev,
libcurl4-gnutls-dev,
- libgcrypt20-dev,
- libgnutls28-dev,
@@ -140,36 +136,36 @@ index c0326b3f5..a5a44c65a 100644
zlib1g-dev
Standards-Version: 4.4.0
Homepage: https://weechat.org/
-@@ -46,7 +43,7 @@ Description: Fast, light and extensible chat client (metapackage)
+@@ -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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -75,7 +72,7 @@ Description: Fast, light and extensible chat client - console client
+@@ -74,7 +71,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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -105,7 +102,7 @@ Description: Fast, light and extensible chat client - headless client
+@@ -104,7 +101,7 @@ Description: Fast, light and extensible chat client - headless 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
+- - Perl, Python, Ruby, Lua, Tcl, Scheme and PHP scripting
++ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
- script manager
- spell checking
- highly customizable and extensible
-@@ -234,19 +231,6 @@ Description: Fast, light and extensible chat client - JavaScript plugin
+@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
.
- This package provides the JavaScript scripting API plugin.
+ This package provides the Guile scripting API plugin.
-Package: weechat-php
-Architecture: any
@@ -187,3 +183,17 @@ index c0326b3f5..a5a44c65a 100644
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 0a1b73563..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 5d2d81fa2..c604e9dda 100644
--- a/tools/debian/patches/weechat_ubuntu_xenial.patch
+++ b/tools/debian/patches/weechat_ubuntu_xenial.patch
@@ -6,7 +6,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-devel/control b/debian-devel/control
-index a862fdd6c..cf68a75dd 100644
+index bf94a36f1..1eb804643 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -4,7 +4,7 @@ Priority: optional
@@ -18,14 +18,13 @@ index a862fdd6c..cf68a75dd 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -13,9 +13,9 @@ Build-Depends:
+@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-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,
++ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,
@@ -38,7 +37,7 @@ index 48082f72f..ec635144f 100644
-12
+9
diff --git a/debian-stable/control b/debian-stable/control
-index c0326b3f5..2a3892192 100644
+index ccf81cac8..7098b52c6 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -4,7 +4,7 @@ Priority: optional
@@ -50,14 +49,13 @@ index c0326b3f5..2a3892192 100644
cmake, pkg-config,
libncursesw5-dev,
gem2deb,
-@@ -13,9 +13,9 @@ Build-Depends:
+@@ -13,8 +13,8 @@ Build-Depends:
libaspell-dev,
liblua5.3-dev,
tcl8.6-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,
++ guile-2.0-dev,
+ php-dev, libphp-embed,
libxml2-dev,
libcurl4-gnutls-dev,