diff options
Diffstat (limited to 'tools/debian/patches/weechat_debian_wheezy.patch')
| -rw-r--r-- | tools/debian/patches/weechat_debian_wheezy.patch | 119 |
1 files changed, 77 insertions, 42 deletions
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 |