diff -Nru quassel-0.14.0/debian/changelog quassel-0.14.0/debian/changelog --- quassel-0.14.0/debian/changelog 2022-01-01 21:30:39.000000000 +0000 +++ quassel-0.14.0/debian/changelog 2022-01-17 11:00:00.000000000 +0000 @@ -1,4 +1,10 @@ -quassel (1:0.14.0-0ubuntu0~ppa0~21.10.0) impish; urgency=medium +quassel (1:0.14.0-1ubuntu0~ppa0~21.10.0) impish; urgency=medium + + * Rebase on 1:0.14.0-1 + + -- Michael Marley Mon, 17 Jan 2022 06:00:00 -0500 + +quassel (1:0.14.0-0ubuntu0~ppa0~16.04.0) xenial; urgency=medium * New upstream release diff -Nru quassel-0.14.0/debian/control quassel-0.14.0/debian/control --- quassel-0.14.0/debian/control 2021-06-28 20:25:08.000000000 +0000 +++ quassel-0.14.0/debian/control 2022-01-17 11:00:00.000000000 +0000 @@ -1,7 +1,7 @@ Source: quassel Section: net Priority: optional -Maintainer: Ubuntu Developers +Maintainer: Michael Marley XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Thomas Mueller , Felix Geyer , @@ -15,6 +15,8 @@ qttools5-dev, qtscript5-dev, qtmultimedia5-dev, + libboost-dev, + libldap2-dev, libphonon4qt5-dev, libphonon4qt5experimental-dev, libdbusmenu-qt5-dev, @@ -26,10 +28,7 @@ libkf5notifications-dev, libkf5notifyconfig-dev, libkf5widgetsaddons-dev, - libssl-dev, - libldap2-dev, - libboost-dev, - git + libssl-dev Homepage: https://www.quassel-irc.org/ Standards-Version: 4.5.0 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/quassel.git @@ -37,7 +36,8 @@ Package: quassel-core Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libquassel-common (= ${binary:Version}), libquassel-core (= ${binary:Version}), adduser, libqt5sql5-sqlite, lsb-base (>= 3.2-14), openssl +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libqt5sql5-sqlite, lsb-base (>= 3.2-14), openssl Recommends: ca-certificates Suggests: libqt5sql5-psql Description: distributed IRC client - core component @@ -50,8 +50,7 @@ Package: quassel-client Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libquassel-client (= ${binary:Version}), libquassel-common (= ${binary:Version}), quassel-data (= ${source:Version}), default-dbus-session-bus | dbus-session-bus | dbus-user-session | dbus-x11 -Recommends: ca-certificates +Depends: ${shlibs:Depends}, ${misc:Depends}, quassel-data (= ${source:Version}), default-dbus-session-bus | dbus-session-bus Breaks: quassel-client-kde4 (<< 0.12.2) Replaces: quassel-client-kde4 (<< 0.12.2) Description: distributed IRC client - client component @@ -64,7 +63,7 @@ Package: quassel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libquassel-common (= ${binary:Version}), libquassel-core (= ${binary:Version}), libquassel-client (= ${binary:Version}), libqt5sql5-sqlite, quassel-data (= ${source:Version}), default-dbus-session-bus | dbus-session-bus | dbus-user-session | dbus-x11 +Depends: ${shlibs:Depends}, ${misc:Depends}, libqt5sql5-sqlite, quassel-data (= ${source:Version}), default-dbus-session-bus | dbus-session-bus Recommends: ca-certificates Breaks: quassel-qt4 (<< 0.12.2) Replaces: quassel-qt4 (<< 0.12.2) @@ -78,39 +77,6 @@ client and can be used like a traditional IRC client, without requiring an external core. -Package: libquassel-core -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: distributed IRC client - core library component - Quassel is a modern, cross-platform, distributed IRC client, meaning that - one or more clients can attach to and detach from the central core. It's - much like the popular combination of screen and a text-based IRC client - such as WeeChat or irssi, but graphical. - . - This package provides only the core library component. - -Package: libquassel-client -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: distributed IRC client - client library component - Quassel is a modern, cross-platform, distributed IRC client, meaning that - one or more clients can attach to and detach from the central core. It's - much like the popular combination of screen and a text-based IRC client - such as WeeChat or irssi, but graphical. - . - This package provides only the client library component. - -Package: libquassel-common -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: distributed IRC client - common library component - Quassel is a modern, cross-platform, distributed IRC client, meaning that - one or more clients can attach to and detach from the central core. It's - much like the popular combination of screen and a text-based IRC client - such as WeeChat or irssi, but graphical. - . - This package provides only the common library component. - Package: quassel-data Architecture: all Depends: ${misc:Depends} diff -Nru quassel-0.14.0/debian/libquassel-client.install quassel-0.14.0/debian/libquassel-client.install --- quassel-0.14.0/debian/libquassel-client.install 2018-11-18 23:05:11.000000000 +0000 +++ quassel-0.14.0/debian/libquassel-client.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/lib/*/libquassel-qtui.so* -usr/lib/*/libquassel-uisupport.so* -usr/lib/*/libquassel-client.so* diff -Nru quassel-0.14.0/debian/libquassel-common.install quassel-0.14.0/debian/libquassel-common.install --- quassel-0.14.0/debian/libquassel-common.install 2018-11-18 23:05:11.000000000 +0000 +++ quassel-0.14.0/debian/libquassel-common.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libquassel-common.so* diff -Nru quassel-0.14.0/debian/libquassel-core.install quassel-0.14.0/debian/libquassel-core.install --- quassel-0.14.0/debian/libquassel-core.install 2018-11-18 23:05:11.000000000 +0000 +++ quassel-0.14.0/debian/libquassel-core.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libquassel-core.so* diff -Nru quassel-0.14.0/debian/manpages/quasselcore.1 quassel-0.14.0/debian/manpages/quasselcore.1 --- quassel-0.14.0/debian/manpages/quasselcore.1 2019-02-15 18:00:08.000000000 +0000 +++ quassel-0.14.0/debian/manpages/quasselcore.1 2022-01-12 22:29:46.000000000 +0000 @@ -1,199 +1,179 @@ -.TH "QUASSELCORE" "1" "0.13.1" "Quassel IRC Team, Internet." "" -.SH "NAME" -quasselcore \(em the daemon process for the Quassel IRC client -.SH "SYNPOSIS" -\fBquasselcore\fR [\fIOPTION\fR]... -. -.SH "DESCRIPTION" -.B Quassel IRC -is a modern, cross-platform, distributed IRC client, meaning that one -(or multiple) client(s) can attach to and detach from a central core -- much -like the popular combination of screen and a text-based IRC client such as -WeeChat, but graphical. +.TH QUASSEL "1" "January 2022" "quassel v0.14.0 (dist-da9c1c9)" "User Commands" +.SH NAME +quassel \- manual page for quassel v0.14.0 (dist-da9c1c9) +.SH SYNOPSIS +.B quasselcore +[\fI\,options\/\fR] +.SH DESCRIPTION +Quassel IRC is a modern, distributed IRC client. One (or multiple) client(s) +can attach to and detach from a central core -- much like the popular +combination of screen and a text-based IRC client such as WeeChat, but +graphical. .PP \fBquasselcore\fR provides the daemon which connects to IRC networks, allowing any number of Quassel clients to connect, including the official desktop client, the \fBquasselclient\fR program. -. -.SH "OPTIONS" + +.SH OPTIONS .TP -\fB\-\-add\-user\fR -Starts an interactive session to add a new core user +\fB\-c\fR, \fB\-\-configdir\fR +Specify the directory holding +configuration files, the SQlite +database and the SSL certificate. +.TP +\fB\-\-listen\fR <
[,
[,...]]> +The address(es) quasselcore will +listen on. +.TP +\fB\-p\fR, \fB\-\-port\fR +The port quasselcore will listen +at. .TP -\fB\-\-change\-userpass\fR=\fIUSERNAME\fR -Starts an interactive session to change the password of the user identified by -USERNAME. -.TP -\fB\-c\fR, \fB\-\-configdir\fR=\fICONFIGDIR\fR -Specify the directory holding the configuration files, the SQLite database with -chat logs (unless another database backend is selected), and the SSL/TLS -certificate. +\fB\-n\fR, \fB\-\-norestore\fR +Don't restore last core's state. .TP \fB\-\-config\-from\-environment\fR -Load configuration from environment variables, ignoring the configuration file. -See the section on \fBENVIRONMENT VARIABLES\fR. +Load configuration from +environment variables. .TP -\fB\-d\fR, \fB\-\-debug\fR -Enable extra debugging output. Requires setting \fB\-\-loglevel=Debug\fR. +\fB\-\-select\-backend\fR +Switch storage backend +(migrating data if possible). .TP -\fB\-\-debug-irc\fR -Enable logging of all raw IRC messages to debug log, \fBincluding passwords!\fR -In most cases you should also set \fB--loglevel Debug\fR. +\fB\-\-select\-authenticator\fR +Select authentication backend. .TP -\fB\-\-debug\-irc\-id\fR=\fIDATABASENETWORKID\fR -Limit raw IRC logging to this network ID. Implies \fB\-\-debug-irc\fR. +\fB\-\-add\-user\fR +Starts an interactive session to +add a new core user. .TP -\fB\-h\fR, \fB\-\-help\fR -Show help message. +\fB\-\-change\-userpass\fR +Starts an interactive session to +change the password of the user +identified by . +.TP +\fB\-\-strict\-ident\fR +Use users' quasselcore username +as ident reply. Ignores each +user's configured ident setting. .TP \fB\-\-ident\-daemon\fR Enable internal ident daemon. .TP -\fB\-\-ident\-listen\fR=\fIIDENTLISTEN\fR -The address(es) quasselcore will listen on for ident requests. Same format as -\fB\-\-listen\fR. Only meaningful with \fB\-\-ident\-daemon\fR. Default is: -::1,127.0.0.1 (only localhost) -.TP -\fB\-\-ident\-port\fR=\fIIDENTPORT\fR -The port the quasselcore will listen at for ident requests. Only meaningful -with \fB\-\-ident\-daemon\fR. Default is: 10113 -.TP -\fB\-\-listen\fR=\fILISTEN\fR -The address(es) quasselcore will listen on. Default is: ::,0.0.0.0 (all -addresses) -.TP -\fB\-L\fR, \fB\-\-loglevel\fR=\fILOGLEVEL\fR -Set the logging level to LOGLEVEL: Debug, Info, Warning, Error. Default is: -Info -.TP -\fB\-l\fR, \fB\-\-logfile\fR=\fILOGFILE\fR -Log to a file. -.TP -\fB\-n\fR, \fB\-\-norestore\fR -Don't restore last core's state, such as previously connected networks. +\fB\-\-ident\-port\fR +The port quasselcore will listen +at for ident requests. Only +meaningful with \fB\-\-ident\-daemon\fR. +.TP +\fB\-\-ident\-listen\fR <
[,...]> +The address(es) quasselcore will +listen on for ident requests. +Same format as \fB\-\-listen\fR. .TP \fB\-\-oidentd\fR -Enable oidentd integration. In most cases you should also enable -\fB\-\-strict-ident\fR. +Enable oidentd integration. In +most cases you should also enable +\fB\-\-strict\-ident\fR. +.TP +\fB\-\-oidentd\-conffile\fR +Set path to oidentd +configuration file. +.TP +\fB\-\-proxy\-cidr\fR <
[,...]> +Set IP range from which proxy +protocol definitions are allowed +.TP +\fB\-\-require\-ssl\fR +Require SSL for remote +(non\-loopback) client +connections. .TP -\fB\-\-oidentd\-conffile\fR=\fIOIDENTCONF\fR -Set path to oidentd configuration file. +\fB\-\-ssl\-cert\fR +Specify the path to the SSL +certificate. .TP -\fB\-p\fR, \fB\-\-port\fR=\fIPORT\fR -The port quasselcore will listen at. Default is: 4242 +\fB\-\-ssl\-key\fR +Specify the path to the SSL key. .TP -\fB\-\-require\-ssl\fR -Require SSL for remote (non-loopback) client connections. +\fB\-\-metrics\-daemon\fR +Enable metrics API. .TP -\fB\-\-select\-authenticator\fR=\fIAUTHENTICATOR\fR -Starts an interactive session to switch your current user authentication -backend to the new one. -.TP -\fB\-\-select\-backend\fR=\fIBACKEND\fR -Starts an interactive session to switch your current storage backend to the new -one. Attempts a merge if the new backend is uninitialized and the old backend -supports migration, otherwise prompts for new user credentials. -.TP -\fB\-\-ssl\-cert\fR=\fISSLCERTFILE\fR -Specify the path to the SSL certificate. Reloaded when quasselcore is sent a -SIGHUP. Default is: CONFIGDIR/quasselCert.pem -.TP -\fB\-\-ssl\-key\fR=\fISSLKEYFILE\fR -Specify the path to the SSL key. Reloaded when quasselcore is sent a SIGHUP. -Only needed if not combined with the SSL certificate. +\fB\-\-metrics\-port\fR +The port quasselcore will listen +at for metrics requests. Only +meaningful with \fB\-\-metrics\-daemon\fR. +.TP +\fB\-\-metrics\-listen\fR <
[,...]> +The address(es) quasselcore will +listen on for metrics requests. +Same format as \fB\-\-listen\fR. +.TP +\fB\-L\fR, \fB\-\-loglevel\fR +Supports one of +Debug|Info|Warning|Error; default +is Info. .TP -\fB\-\-strict\-ident\fR -Use users' quasselcore username as ident reply. Ignores each user's configured -ident setting. Useful for multi-user quasselcores connecting to IRC networks -that require a fixed identifier for each user. +\fB\-l\fR, \fB\-\-logfile\fR +Log to a file. .TP \fB\-\-syslog\fR Log to syslog. .TP +\fB\-d\fR, \fB\-\-debug\fR +Enable debug output. +.TP +\fB\-\-debug\-irc\fR +Enable logging of all raw IRC +messages to debug log, including +passwords! In most cases you +should also set \fB\-\-loglevel\fR Debug +.TP +\fB\-\-debug\-irc\-id\fR +Limit raw IRC logging to this +network ID. Implies \fB\-\-debug\-irc\fR +.TP +\fB\-\-debug\-irc\-parsed\fR +Enable logging of all parsed IRC +messages to debug log, including +passwords! In most cases you +should also set \fB\-\-loglevel\fR Debug +.TP +\fB\-\-debug\-irc\-parsed\-id\fR +Limit parsed IRC logging to this +network ID. Implies +\fB\-\-debug\-irc\-parsed\fR +.TP +\fB\-h\fR, \fB\-\-help\fR +Displays help on commandline +options. +.TP +\fB\-\-help\-all\fR +Displays help including Qt +specific options. +.TP \fB\-v\fR, \fB\-\-version\fR -Display version information. -. -.SH "ENVIRONMENT" -When \fB\-\-config\-from\-environment\fR is specified, the quasselcore will use -the following environment variables instead of the configuration file. This may -be useful for container setups or automated deployment. -. -.TP -\fBAUTH_AUTHENTICATOR\fR -Specifies the selected user authentication backend. See -\fB\-\-select\-authenticator\fR. -.TP -\fBAUTH_LDAP_BASE_DN\fR -Specifies the LDAP authenticator base DN. -.TP -\fBAUTH_LDAP_BIND_DN\fR -Specifies the LDAP authenticator bind DN. -.TP -\fBAUTH_LDAP_BIND_PASSWORD\fR -Specifies the LDAP authenticator bind password. -.TP -\fBAUTH_LDAP_FILTER\fR -Specifies the LDAP authenticator filter. -.TP -\fBAUTH_LDAP_HOSTNAME\fR -Specifies the LDAP authenticator connection hostname. -.TP -\fBAUTH_LDAP_PORT\fR -Specifies the LDAP authenticator connection port. -.TP -\fBAUTH_LDAP_UID_ATTRIBUTE\fR -Specifies the LDAP authenticator UID attribute. -.TP -\fBDB_BACKEND\fR -Specifies the selected database backend. See \fB\-\-select\-backend\fR. -.TP -\fBDB_PGSQL_DATABASE\fR -Specifies the Postgres connection database name. -.TP -\fBDB_PGSQL_HOSTNAME\fR -Specifies the Postgres connection hostname. -.TP -\fBDB_PGSQL_USERNAME\fR -Specifies the Postgres connection username. -.TP -\fBDB_PGSQL_PASSWORD\fR -Specifies the Postgres connection user password. -.TP -\fBDB_PGSQL_PORT\fR -Specifies the Postgres connection port. -. -.SH FILES -. -.TP -\fI/var/lib/quassel\fR -Configuration files, the SQLite database with chat logs (unless another -database backend is selected), and the SSL/TLS certificate. To override, see -\fB\-\-configdir\fR. -.TP -\fI/etc/default/quasselcore\fR -Additional configuration parameters, including default port and logging level. -. -.SH "NOTES" -In a typical installation, \fBquasselcore\fR runs as the \fIquasselcore\fR -user, with configuration data stored in \fI/var/lib/quassel\fR. When manually -running quasselcore, you should specify the proper user and \fB\-\-configdir\fR -as follows. -.PP -.nf -.RS 4 -$\ sudo\ \-\-user=quasselcore\ \\ -quasselcore\ \-\-configdir=/var/lib/quassel [\fIOPTIONS\fR] -.RE -.fi -. +Displays version information. + .SH AUTHORS The full list of Quassel IRC authors and contributors may be seen in quasselclient's About window. .PP This manual page was written by Thomas Mueller and updated by Shane Synan -, for the Debian GNU/Linux -system (but may be used by others). Permission is -granted to copy, distribute and/or modify this document under -the terms of the GNU General Public License -version 2 or any later version published by the Free Software Foundation. + and Scott Kitterman +(with the assitance of help2man), for the Debian GNU/Linux system (but may be +used by others). Permission is granted to copy, distribute and/or modify this +document under the terms of the GNU General Public License version 2 or any +later version published by the Free Software Foundation. +.SH "SEE ALSO" +The full documentation for +.B quassel +is maintained as a Texinfo manual. If the +.B info +and +.B quassel +programs are properly installed at your site, the command +.IP +.B info quassel +.PP +should give you access to the complete manual. diff -Nru quassel-0.14.0/debian/patches/lubuntu_01_default_network_channel.patch quassel-0.14.0/debian/patches/lubuntu_01_default_network_channel.patch --- quassel-0.14.0/debian/patches/lubuntu_01_default_network_channel.patch 2021-10-13 10:33:26.000000000 +0000 +++ quassel-0.14.0/debian/patches/lubuntu_01_default_network_channel.patch 2021-06-13 15:56:10.000000000 +0000 @@ -1,8 +1,6 @@ -Index: quassel-0.14-rc2/data/networks.ini -=================================================================== ---- quassel-0.14-rc2.orig/data/networks.ini -+++ quassel-0.14-rc2/data/networks.ini -@@ -26,6 +26,11 @@ Servers=irc.euirc.net:+6697,irc.euirc.ne +--- a/data/networks.ini ++++ b/data/networks.ini +@@ -21,6 +21,11 @@ [Freenode] Servers=chat.freenode.net:+6697,chat.freenode.net:6667 diff -Nru quassel-0.14.0/debian/quassel-core.dirs quassel-0.14.0/debian/quassel-core.dirs --- quassel-0.14.0/debian/quassel-core.dirs 1970-01-01 00:00:00.000000000 +0000 +++ quassel-0.14.0/debian/quassel-core.dirs 2016-08-01 06:09:27.000000000 +0000 @@ -0,0 +1,2 @@ +etc/ufw/applications.d +lib/systemd/system diff -Nru quassel-0.14.0/debian/quassel.NEWS quassel-0.14.0/debian/quassel.NEWS --- quassel-0.14.0/debian/quassel.NEWS 2019-12-09 16:48:20.000000000 +0000 +++ quassel-0.14.0/debian/quassel.NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -quassel (1:0.13.0-1) experimental; urgency=medium - - Upstream recommends making a backup of your quassel database before - proceeding with the upgrade to 0.13.0: - - "Before you upgrade, please be aware that both the database schema and the - config file formats have been updated since 0.12. Quassel will - automatically upgrade both once the new version is started for the first - time, however no rollback is possible, so do make a backup before starting - the new version! The upgrade may take a long time (up to several hours) if - your database is (un)reasonably large, during which the core or mono client - cannot be used. The upgrade may also temporarily require up to double the - disk space. Do not interrupt the upgrade process, otherwise your database - may become corrupted!" - - The package does not restart on upgrade. The database upgrade will be done - after system reboot or manual restart. - - Please make a backup or decide to live dangerously before proceeding. - - -- Scott Kitterman Sun, 02 Dec 2018 17:21:06 -0500 - diff -Nru quassel-0.14.0/debian/rules quassel-0.14.0/debian/rules --- quassel-0.14.0/debian/rules 2020-12-17 18:41:02.000000000 +0000 +++ quassel-0.14.0/debian/rules 2022-01-17 11:00:00.000000000 +0000 @@ -10,13 +10,11 @@ WEB_BACKEND = -DWITH_WEBKIT=ON -DWITH_WEBENGINE=OFF endif -DEBHELPER_GT_10 := $(shell if [ $(dpkg -s debhelper | grep '^Version:' | cut -d" " -f2 | cut -d"." -f1) -gt "10" ]; then echo "true"; fi) - %: dh $@ override_dh_auto_configure: - dh_auto_configure -- -DWITH_OXYGEN_ICONS=ON -DWITH_BUNDLED_ICONS=OFF -DUSE_QT5=ON -DWITH_KDE=ON $(WEB_BACKEND) + dh_auto_configure -- -DWITH_OXYGEN_ICONS=ON -DWITH_BUNDLED_ICONS=OFF -DUSE_QT5=ON -DWITH_KDE=ON -DENABLE_SHARED=OFF $(WEB_BACKEND) override_dh_install: dh_install @@ -24,16 +22,14 @@ ifneq (,$(filter quassel-data, $(shell dh_listpackages))) rm debian/quassel-data/usr/share/quassel/scripts/inxi endif -ifeq (true,$(DEBHELPER_GT_10)) + + dh_apparmor -pquassel-core --profile-name=usr.bin.quasselcore + +override_dh_missing: dh_missing --fail-missing -endif override_dh_installinit: - dh_apparmor -pquassel-core --profile-name=usr.bin.quasselcore dh_installinit --no-stop-on-upgrade --no-restart-after-upgrade --error-handler=exit --name=quasselcore -override_dh_systemd_enable: - dh_systemd_enable --name=quasselcore - -override_dh_systemd_start: - dh_systemd_start --name=quasselcore +override_dh_installsystemd: + dh_installsystemd --no-stop-on-upgrade --no-restart-after-upgrade --name=quasselcore diff -Nru quassel-0.14.0/debian/watch quassel-0.14.0/debian/watch --- quassel-0.14.0/debian/watch 2019-01-06 16:40:53.000000000 +0000 +++ quassel-0.14.0/debian/watch 2022-01-17 11:00:00.000000000 +0000 @@ -1,4 +1,2 @@ -version=3 - -https://quassel-irc.org/downloads \ - /pub/quassel-(.*)\.tar\.bz2 +version=4 +https://www.quassel-irc.org/pub/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@