218 lines
7.2 KiB
Diff
218 lines
7.2 KiB
Diff
diff --git a/debian-devel/compat b/debian-devel/compat
|
|
index 48082f72f..ec635144f 100644
|
|
--- a/debian-devel/compat
|
|
+++ b/debian-devel/compat
|
|
@@ -1 +1 @@
|
|
-12
|
|
+9
|
|
diff --git a/debian-devel/control b/debian-devel/control
|
|
index bf94a36f1..7e7c82a21 100644
|
|
--- a/debian-devel/control
|
|
+++ b/debian-devel/control
|
|
@@ -3,19 +3,16 @@ Section: net
|
|
Priority: optional
|
|
Maintainer: Sébastien Helleu <flashcode@flashtux.org>
|
|
Build-Depends:
|
|
- asciidoctor (>= 1.5.4),
|
|
- debhelper (>= 12),
|
|
+ debhelper (>= 9),
|
|
cmake, pkg-config,
|
|
libncursesw5-dev,
|
|
gem2deb,
|
|
libperl-dev,
|
|
python3-dev,
|
|
libaspell-dev,
|
|
- liblua5.3-dev,
|
|
+ liblua5.1-0-dev,
|
|
tcl8.6-dev,
|
|
- guile-2.2-dev,
|
|
- 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)
|
|
- 256 colors support
|
|
- incremental text search
|
|
- dynamic filtering of buffer content
|
|
- - 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
|
|
@@ -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 and PHP scripting
|
|
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
|
|
- script manager
|
|
- spell checking
|
|
- highly customizable and extensible
|
|
@@ -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 and PHP scripting
|
|
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
|
|
- script manager
|
|
- spell checking
|
|
- highly customizable and extensible
|
|
@@ -232,20 +229,6 @@ Description: Fast, light and extensible chat client - Guile plugin
|
|
.
|
|
This package provides the Guile scripting API plugin.
|
|
|
|
-Package: weechat-devel-php
|
|
-Architecture: any
|
|
-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
|
|
- 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/rules b/debian-devel/rules
|
|
index 16a5f9516..e42c2a6b2 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_PHP: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-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/compat b/debian-stable/compat
|
|
index 48082f72f..ec635144f 100644
|
|
--- a/debian-stable/compat
|
|
+++ b/debian-stable/compat
|
|
@@ -1 +1 @@
|
|
-12
|
|
+9
|
|
diff --git a/debian-stable/control b/debian-stable/control
|
|
index ccf81cac8..d753f6856 100644
|
|
--- a/debian-stable/control
|
|
+++ b/debian-stable/control
|
|
@@ -3,19 +3,16 @@ Section: net
|
|
Priority: optional
|
|
Maintainer: Emmanuel Bouthenot <kolter@debian.org>
|
|
Build-Depends:
|
|
- asciidoctor (>= 1.5.4),
|
|
- debhelper (>= 12),
|
|
+ debhelper (>= 9),
|
|
cmake, pkg-config,
|
|
libncursesw5-dev,
|
|
gem2deb,
|
|
libperl-dev,
|
|
python3-dev,
|
|
libaspell-dev,
|
|
- liblua5.3-dev,
|
|
+ liblua5.1-0-dev,
|
|
tcl8.6-dev,
|
|
- guile-2.2-dev,
|
|
- php-dev, libphp-embed, libargon2-0-dev, libsodium-dev,
|
|
- libxml2-dev,
|
|
+ guile-2.0-dev,
|
|
libcurl4-gnutls-dev,
|
|
libgcrypt20-dev,
|
|
libgnutls28-dev,
|
|
@@ -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 and PHP scripting
|
|
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
|
|
- script manager
|
|
- spell checking
|
|
- highly customizable and extensible
|
|
@@ -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 and PHP scripting
|
|
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
|
|
- script manager
|
|
- spell checking
|
|
- highly customizable and extensible
|
|
@@ -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 and PHP scripting
|
|
+ - Perl, Python, Ruby, Lua, Tcl and Scheme scripting
|
|
- script manager
|
|
- spell checking
|
|
- highly customizable and extensible
|
|
@@ -221,19 +218,6 @@ Description: Fast, light and extensible chat client - Guile plugin
|
|
.
|
|
This package provides the Guile scripting API plugin.
|
|
|
|
-Package: weechat-php
|
|
-Architecture: any
|
|
-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.
|
|
- .
|
|
- This package provides the PHP scripting API plugin.
|
|
-
|
|
Package: weechat-doc
|
|
Section: doc
|
|
Architecture: all
|
|
diff --git a/debian-stable/rules b/debian-stable/rules
|
|
index 16a5f9516..e42c2a6b2 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_PHP: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-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
|