diff options
Diffstat (limited to 'debian-stable')
| -rw-r--r-- | debian-stable/NEWS | 13 | ||||
| -rw-r--r-- | debian-stable/changelog | 74 | ||||
| -rw-r--r-- | debian-stable/compat | 2 | ||||
| -rw-r--r-- | debian-stable/control | 137 | ||||
| -rw-r--r-- | debian-stable/copyright | 173 | ||||
| -rwxr-xr-x | debian-stable/rules | 14 | ||||
| -rw-r--r-- | debian-stable/weechat-core.install | 14 | ||||
| -rw-r--r-- | debian-stable/weechat-dev.install | 2 | ||||
| -rw-r--r-- | debian-stable/weechat-guile.install | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | debian-stable/weechat-javascript.install | 4 | ||||
| -rw-r--r-- | debian-stable/weechat-lua.install | 2 | ||||
| -rw-r--r-- | debian-stable/weechat-perl.install | 2 | ||||
| -rw-r--r-- | debian-stable/weechat-php.install | 2 | ||||
| -rw-r--r-- | debian-stable/weechat-plugins.install | 12 | ||||
| -rw-r--r-- | debian-stable/weechat-python.install | 2 | ||||
| -rw-r--r-- | debian-stable/weechat-ruby.install | 2 | ||||
| -rw-r--r-- | debian-stable/weechat-tcl.install | 2 |
17 files changed, 363 insertions, 96 deletions
diff --git a/debian-stable/NEWS b/debian-stable/NEWS index ff31879ac..47b408779 100644 --- a/debian-stable/NEWS +++ b/debian-stable/NEWS @@ -1,3 +1,16 @@ +weechat (2.1-1) unstable; urgency=medium + + This release introduces a new headless client and a new PHP plugin for + scripting (respectively weechat-headless and weechat-php binary + packages). + To avoid at least unnecessary dependencies, each plugin has its own + separate binary package: + weechat-{perl,python,ruby,lua,guile,javascript,php} + Depending on your needs about scripting with weechat you should consider + to install the missing packages. + + -- Emmanuel Bouthenot <kolter@debian.org> Wed, 21 Mar 2018 07:53:40 +0100 + weechat (1.1.1-1) unstable; urgency=medium Since version 1.1, there is a new format for regexp replacement in diff --git a/debian-stable/changelog b/debian-stable/changelog index 5196f2ecc..4123db737 100644 --- a/debian-stable/changelog +++ b/debian-stable/changelog @@ -1,3 +1,77 @@ +weechat (2.1-1) unstable; urgency=medium + + * New upstream release (Closes: #887114) + - Enable build against Ruby 2.5 (Closes: #892072) + - New PHP plugin (update build dependencies accordingly) + * Split up the package so that plugins are now separated in multiple + binary packages to avoid unnecessary dependencies (Closes: #745266) + * Switch debhelper compatibility to 11 + * Bump Standards-Version to 4.1.3 + * Add debian/upstream/metadata (DEP 12) + * Rewrite debian/copyright to be more accurate + * Update Vcs-Git and Vcs-Browser with new repository on salsa.debian.org + * Update debian/NEWS to introduces weechat-headless and the package split + + -- Emmanuel Bouthenot <kolter@debian.org> Wed, 21 Mar 2018 07:46:21 +0100 + +weechat (1.9.1-1) unstable; urgency=medium + + * New upstream release + - CVE-2017-14727 - Include a patch which fix a possible crash in logger + plugin (Closes: #876553) + * Disable build of javascript plugin to fix weechat autoremoval from + testing (RC bugs in libv8) + * Bump Standards-Version to 4.1.0 + + -- Emmanuel Bouthenot <kolter@debian.org> Sat, 23 Sep 2017 21:47:32 +0200 + +weechat (1.9-1) unstable; urgency=medium + + * New upstream release + * Remove useless weechat-dbg binary package + * Bump Standards-Version to 4.0.0 + + -- Emmanuel Bouthenot <kolter@debian.org> Tue, 04 Jul 2017 13:29:55 +0200 + +weechat (1.8-1) unstable; urgency=medium + + * New upstream release + * Remove usless patches (backports from upstream) + + -- Emmanuel Bouthenot <kolter@debian.org> Tue, 16 May 2017 14:53:07 +0200 + +weechat (1.7-3) unstable; urgency=medium + + * Add a patch to fix CVE-2017-8073 which allows a remote crash by + sending a filename via DCC to the IRC plugin (Closes: #861121) + + -- Emmanuel Bouthenot <kolter@debian.org> Tue, 25 Apr 2017 10:46:10 +0200 + +weechat (1.7-2) unstable; urgency=medium + + * Add a patch to fix slowness after terminal resize (Closes: #855079) + + -- Emmanuel Bouthenot <kolter@debian.org> Fri, 24 Feb 2017 16:43:09 +0100 + +weechat (1.7-1) unstable; urgency=medium + + * New upstream release + * Remove lintian-override for weechat-curses manpage + * Add a lintian-override about no hardening flags on fifo.so plugin + (false positive) + + -- Emmanuel Bouthenot <kolter@debian.org> Thu, 09 Feb 2017 20:15:48 +0100 + +weechat (1.6-1) unstable; urgency=medium + + * New upstream release + * Add a patch to build html documentation without requiring data + (javascript, fonts) on external websites (potential privacy breach) + * Documentation is now built with asciidoctor (adjust dependencies + accordingly) + + -- Emmanuel Bouthenot <kolter@debian.org> Thu, 06 Oct 2016 13:55:35 +0200 + weechat (1.5-1) unstable; urgency=medium * New upstream release diff --git a/debian-stable/compat b/debian-stable/compat index ec635144f..b4de39476 100644 --- a/debian-stable/compat +++ b/debian-stable/compat @@ -1 +1 @@ -9 +11 diff --git a/debian-stable/control b/debian-stable/control index 4ed65f37e..8fbf582b3 100644 --- a/debian-stable/control +++ b/debian-stable/control @@ -4,8 +4,7 @@ Priority: optional Maintainer: Emmanuel Bouthenot <kolter@debian.org> Build-Depends: asciidoctor (>= 1.5.4), - debhelper (>= 9), - dh-exec, + debhelper (>= 11), cmake, pkg-config, libncursesw5-dev, gem2deb, @@ -15,21 +14,23 @@ Build-Depends: liblua5.1-0-dev, tcl8.6-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, libcurl4-gnutls-dev, libgcrypt20-dev, libgnutls28-dev, zlib1g-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.3 Homepage: https://weechat.org/ -Vcs-Git: https://anonscm.debian.org/git/users/kolter/weechat.git -Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git +Vcs-Git: https://salsa.debian.org/kolter/weechat.git +Vcs-Browser: https://salsa.debian.org/kolter/weechat Package: weechat Architecture: all -Depends: ${misc:Depends}, weechat-curses (>= ${source:Version}) | - weechat-headless (>= ${source:Version}) +Depends: + ${misc:Depends}, + weechat-curses (>= ${source:Version}) | weechat-headless (>= ${source:Version}) Suggests: weechat-doc (= ${source:Version}) Description: Fast, light and extensible chat client (metapackage) WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client @@ -53,10 +54,12 @@ Description: Fast, light and extensible chat client (metapackage) Package: weechat-curses Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version}) -Conflicts: weechat-common -Breaks: weechat-scripts (<= 20090221-1) -Recommends: weechat-plugins (= ${binary:Version}) +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-core (= ${binary:Version}) +Recommends: + weechat-plugins (= ${binary:Version}) Suggests: weechat-doc (= ${source:Version}) Description: Fast, light and extensible chat client - console client WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client @@ -82,12 +85,13 @@ Description: Fast, light and extensible chat client - console client Package: weechat-headless Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version}) -Conflicts: weechat-common -Breaks: weechat-scripts (<= 20090221-1) +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-core (= ${binary:Version}) Recommends: weechat-plugins (= ${binary:Version}) Suggests: weechat-doc (= ${source:Version}) -Description: Fast, light and extensible chat client - console client +Description: Fast, light and extensible chat client - headless client WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client for many operating systems. Everything can be done with a keyboard. It is customizable and extensible with plugins/scripts, and includes: @@ -111,8 +115,9 @@ Description: Fast, light and extensible chat client - console client Package: weechat-core Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: weechat-common, weechat-plugins (<< 0.3.0) +Depends: + ${misc:Depends}, + ${shlibs:Depends} Suggests: weechat-doc (= ${source:Version}) Description: Fast, light and extensible chat client - core files WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client @@ -124,8 +129,14 @@ Description: Fast, light and extensible chat client - core files Package: weechat-plugins Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Recommends: + weechat-perl, + weechat-python, + weechat-ruby Suggests: weechat-scripts (>> 20090221-1) Description: Fast, light and extensible chat client - plugins WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client @@ -141,9 +152,11 @@ Description: Fast, light and extensible chat client - plugins Package: weechat-python Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - python plugin +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Description: Fast, light and extensible chat client - Python 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. . @@ -151,9 +164,11 @@ Description: Fast, light and extensible chat client - python plugin Package: weechat-perl Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - perl plugin +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Description: Fast, light and extensible chat client - Perl 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. . @@ -161,9 +176,11 @@ Description: Fast, light and extensible chat client - perl plugin Package: weechat-ruby Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - ruby plugin +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Description: Fast, light and extensible chat client - Ruby 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. . @@ -171,9 +188,11 @@ Description: Fast, light and extensible chat client - ruby plugin Package: weechat-lua Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - lua plugin +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Description: Fast, light and extensible chat client - Lua 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. . @@ -181,29 +200,35 @@ Description: Fast, light and extensible chat client - lua plugin Package: weechat-tcl Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - tcl plugin +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Description: Fast, light and extensible chat client - Tcl 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 TCL scripting API plugin. + This package provides the Tcl scripting API plugin. Package: weechat-guile Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - guile plugin +Depends: + ${misc:Depends}, + ${shlibs:Depends}, + weechat-curses (= ${binary:Version}) | weechat-headless (= ${binary:Version}) +Description: Fast, light and extensible chat client - Guile 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 Guile scripting API plugin. Package: weechat-javascript -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) -Description: Fast, light and extensible chat client - javascript plugin +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. . @@ -211,9 +236,12 @@ Description: Fast, light and extensible chat client - javascript 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. . @@ -231,23 +259,10 @@ Description: Fast, light and extensible chat client - documentation Package: weechat-dev Section: devel -Architecture: all +Architecture: any Depends: ${misc:Depends} Description: Fast, light and extensible chat client - development headers 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 contains the headers needed to build plugins. - -Package: weechat-dbg -Section: debug -Priority: extra -Architecture: any -Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) | - weechat-headless (= ${binary:Version}) | weechat-core (= ${binary:Version}), - weechat-plugins (= ${binary:Version}) -Description: Fast, light and extensible chat client - debugging symbols - 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 contains gdb debugging symbols for the WeeChat packages. diff --git a/debian-stable/copyright b/debian-stable/copyright index e44a053eb..a222b163f 100644 --- a/debian-stable/copyright +++ b/debian-stable/copyright @@ -5,13 +5,152 @@ Source: https://weechat.org/ Files: * Copyright: 2003-2018, Sébastien Helleu <flashcode@flashtux.org> - 2005-2009, Emmanuel Bouthenot <kolter@openics.org> - 2008-2009, Dmitry Kobylin <fnfal@academ.tsc.ru> +License: GPL-3+ + +Files: src/core/wee-command.c + src/core/wee-command.h +Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/core/wee-config-file.c + src/core/wee-config-file.h + src/core/wee-config.c + src/core/wee-config.h +Copyright: 2005-2006, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/core/wee-hook.c +Copyright: 2012, Simon Arlott +License: GPL-3+ + +Files: src/core/wee-hook.h +Copyright: 2012, Simon Arlott +License: GPL-3+ + +Files: src/gui/gui-history.c +Copyright: 2005, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/core/wee-completion.c + src/core/wee-log.c + src/core/wee-utf8.c + src/core/weechat.h + src/plugins/aspell/weechat-aspell-config.c + src/plugins/aspell/weechat-aspell-config.h + src/plugins/aspell/weechat-aspell-speller.c + src/plugins/aspell/weechat-aspell-speller.h + src/plugins/aspell/weechat-aspell.h + src/plugins/irc/irc-command.c + src/plugins/irc/irc.h +Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/core/wee-network.c +Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org> + 2010, Gu1ll4um3r0m41n <aeroxteam@gmail.com> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/aspell/weechat-aspell-bar-item.c + src/plugins/aspell/weechat-aspell-bar-item.h +Copyright: 2012, Nils Görs <weechatter@arcor.de> +License: GPL-3+ + +Files: src/plugins/aspell/weechat-aspell.c +Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org> + 2012, Nils Görs <weechatter@arcor.de> +License: GPL-3+ + +Files: src/plugins/guile/weechat-guile-api.c + src/plugins/irc/irc-server.h + src/plugins/plugin-script-api.c + src/plugins/plugin-script-api.h +Copyright: 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/irc/irc-protocol.c +Copyright: 2006, Emmanuel Bouthenot <kolter@openics.org> + 2014, Shawn Smith <ShawnSmith0828@gmail.com> +License: GPL-3+ + +Files: src/plugins/irc/irc-server.c +Copyright: 2005-2010, Emmanuel Bouthenot <kolter@openics.org> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/javascript/weechat-js-api.cpp + src/plugins/javascript/weechat-js-api.h + src/plugins/javascript/weechat-js-v8.cpp + src/plugins/javascript/weechat-js-v8.h + src/plugins/javascript/weechat-js.cpp + src/plugins/javascript/weechat-js.h +Copyright: 2013, Koka El Kiwi <kokakiwi@kokakiwi.net> +License: GPL-3+ + +Files: src/plugins/lua/weechat-lua-api.c +Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/lua/weechat-lua-api.h + src/plugins/lua/weechat-lua.c + src/plugins/lua/weechat-lua.h +Copyright: 2006-2007, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/plugins/perl/weechat-perl-api.c +Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/perl/weechat-perl.c +Copyright: 2005-2008, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/plugins/php/weechat-php-api.c + src/plugins/php/weechat-php-api.h + src/plugins/php/weechat-php.c + src/plugins/php/weechat-php.h +Copyright: 2006-2017, Adam Saponara <as@php.net> +License: GPL-3-with-openssl-exception + +Files: src/plugins/python/weechat-python-api.c +Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/python/weechat-python-api.h + src/plugins/ruby/weechat-ruby-api.h + src/plugins/ruby/weechat-ruby.c + src/plugins/ruby/weechat-ruby.h +Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/plugins/python/weechat-python.c + src/plugins/ruby/weechat-ruby-api.c +Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/python/weechat-python.h +Copyright: 2005-2007, Emmanuel Bouthenot <kolter@openics.org> +License: GPL-3+ + +Files: src/plugins/tcl/weechat-tcl-api.c +Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru> + 2008, Julien Louis <ptitlouis@sysif.net> + 2012, Simon Arlott +License: GPL-3+ + +Files: src/plugins/tcl/weechat-tcl-api.h + src/plugins/tcl/weechat-tcl.c + src/plugins/tcl/weechat-tcl.h +Copyright: 2008-2010, Dmitry Kobylin <fnfal@academ.tsc.ru> License: GPL-3+ Files: debian/* Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net> - 2008-2016, Emmanuel Bouthenot <kolter@openics.org> + 2008-2018, Emmanuel Bouthenot <kolter@openics.org> License: GPL-3+ License: GPL-3+ @@ -30,3 +169,31 @@ License: GPL-3+ . On Debian systems, the complete text of the GNU General Public License, Version 3 can be found in the file /usr/share/common-licenses/GPL-3 + +License: GPL-3-with-openssl-exception + WeeChat is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + . + WeeChat is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + . + You should have received a copy of the GNU General Public License along + with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General Public License, + Version 3 can be found in the file /usr/share/common-licenses/GPL-3 + . + Additional permission under GNU GPL version 3 section 7: + . + If you modify the Program, or any covered work, by linking or + combining it with the OpenSSL project's OpenSSL library (or a + modified version of that library), containing parts covered by the + terms of the OpenSSL or SSLeay licenses, the licensors of the Program + grant you additional permission to convey the resulting work. + Corresponding Source for a non-source form of such a combination + shall include the source code for the parts of OpenSSL used as well + as that of the covered work. diff --git a/debian-stable/rules b/debian-stable/rules index a4e1e3d3a..16a5f9516 100755 --- a/debian-stable/rules +++ b/debian-stable/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS=hardening=+all + BUILDDIR = builddir $(BUILDDIR)/Makefile: @@ -7,6 +9,7 @@ $(BUILDDIR)/Makefile: cd $(BUILDDIR) && \ cmake .. \ -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \ + -DLIBDIR=/usr/lib/${DEB_HOST_MULTIARCH} \ -DENABLE_DOC:BOOL=ON \ -DENABLE_MAN:BOOL=ON \ -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ @@ -15,19 +18,16 @@ $(BUILDDIR)/Makefile: -DCMAKE_SKIP_RPATH:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -override_dh_auto_build: $(BUILDDIR)/Makefile - dh_auto_build - override_dh_auto_configure: # the package also has autotools buildsys and # debhelper try to use it but that's not needed echo +override_dh_auto_build: $(BUILDDIR)/Makefile + dh_auto_build + override_dh_installchangelogs: dh_installchangelogs ChangeLog.adoc -override_dh_strip: - dh_strip --dbg-package=weechat-dbg - %: - dh $@ --parallel --builddirectory=$(BUILDDIR) + dh $@ --builddirectory=$(BUILDDIR) --without autoreconf diff --git a/debian-stable/weechat-core.install b/debian-stable/weechat-core.install index 9411e449b..aeed25055 100644 --- a/debian-stable/weechat-core.install +++ b/debian-stable/weechat-core.install @@ -1,8 +1,8 @@ usr/share/locale/ -usr/lib/weechat/plugins/alias.so -usr/lib/weechat/plugins/buflist.so -usr/lib/weechat/plugins/charset.so -usr/lib/weechat/plugins/fset.so -usr/lib/weechat/plugins/irc.so -usr/lib/weechat/plugins/logger.so -usr/lib/weechat/plugins/xfer.so +usr/lib/*/weechat/plugins/alias.so +usr/lib/*/weechat/plugins/buflist.so +usr/lib/*/weechat/plugins/charset.so +usr/lib/*/weechat/plugins/fset.so +usr/lib/*/weechat/plugins/irc.so +usr/lib/*/weechat/plugins/logger.so +usr/lib/*/weechat/plugins/xfer.so diff --git a/debian-stable/weechat-dev.install b/debian-stable/weechat-dev.install index 8e40efed0..638e4f2f8 100644 --- a/debian-stable/weechat-dev.install +++ b/debian-stable/weechat-dev.install @@ -1,2 +1,2 @@ usr/include/weechat/* -usr/lib/pkgconfig/* +usr/lib/*/pkgconfig/* diff --git a/debian-stable/weechat-guile.install b/debian-stable/weechat-guile.install index 573b9176b..ea1ab19b7 100644 --- a/debian-stable/weechat-guile.install +++ b/debian-stable/weechat-guile.install @@ -1 +1 @@ -usr/lib/weechat/plugins/guile.so +usr/lib/*/weechat/plugins/guile.so diff --git a/debian-stable/weechat-javascript.install b/debian-stable/weechat-javascript.install index 428bb933e..6e9829e1c 100755..100644 --- a/debian-stable/weechat-javascript.install +++ b/debian-stable/weechat-javascript.install @@ -1,3 +1 @@ -#!/usr/bin/dh-exec - -[amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] usr/lib/weechat/plugins/javascript.so +usr/lib/*/weechat/plugins/javascript.so diff --git a/debian-stable/weechat-lua.install b/debian-stable/weechat-lua.install index 1fefb8f07..c75f19558 100644 --- a/debian-stable/weechat-lua.install +++ b/debian-stable/weechat-lua.install @@ -1 +1 @@ -usr/lib/weechat/plugins/lua.so +usr/lib/*/weechat/plugins/lua.so diff --git a/debian-stable/weechat-perl.install b/debian-stable/weechat-perl.install index 309460a19..d0df856af 100644 --- a/debian-stable/weechat-perl.install +++ b/debian-stable/weechat-perl.install @@ -1 +1 @@ -usr/lib/weechat/plugins/perl.so +usr/lib/*/weechat/plugins/perl.so diff --git a/debian-stable/weechat-php.install b/debian-stable/weechat-php.install index 28b19cc1d..0a1b73563 100644 --- a/debian-stable/weechat-php.install +++ b/debian-stable/weechat-php.install @@ -1 +1 @@ -usr/lib/weechat/plugins/php.so +usr/lib/*/weechat/plugins/php.so diff --git a/debian-stable/weechat-plugins.install b/debian-stable/weechat-plugins.install index 8c8a74d27..fc4b9fb54 100644 --- a/debian-stable/weechat-plugins.install +++ b/debian-stable/weechat-plugins.install @@ -1,6 +1,6 @@ -usr/lib/weechat/plugins/aspell.so -usr/lib/weechat/plugins/exec.so -usr/lib/weechat/plugins/fifo.so -usr/lib/weechat/plugins/relay.so -usr/lib/weechat/plugins/script.so -usr/lib/weechat/plugins/trigger.so +usr/lib/*/weechat/plugins/aspell.so +usr/lib/*/weechat/plugins/exec.so +usr/lib/*/weechat/plugins/fifo.so +usr/lib/*/weechat/plugins/relay.so +usr/lib/*/weechat/plugins/script.so +usr/lib/*/weechat/plugins/trigger.so diff --git a/debian-stable/weechat-python.install b/debian-stable/weechat-python.install index fa26cad2f..71b84a660 100644 --- a/debian-stable/weechat-python.install +++ b/debian-stable/weechat-python.install @@ -1 +1 @@ -usr/lib/weechat/plugins/python.so +usr/lib/*/weechat/plugins/python.so diff --git a/debian-stable/weechat-ruby.install b/debian-stable/weechat-ruby.install index 3725af2fe..9088ecce4 100644 --- a/debian-stable/weechat-ruby.install +++ b/debian-stable/weechat-ruby.install @@ -1 +1 @@ -usr/lib/weechat/plugins/ruby.so +usr/lib/*/weechat/plugins/ruby.so diff --git a/debian-stable/weechat-tcl.install b/debian-stable/weechat-tcl.install index 54711d81c..6f2e4b16f 100644 --- a/debian-stable/weechat-tcl.install +++ b/debian-stable/weechat-tcl.install @@ -1 +1 @@ -usr/lib/weechat/plugins/tcl.so +usr/lib/*/weechat/plugins/tcl.so |