Date: Thursday, May 5, 2016 @ 00:08:05 Author: jlichtblau Revision: 173771
archrelease: copy trunk to community-i686, community-x86_64 Added: quassel/repos/community-i686/PKGBUILD (from rev 173770, quassel/trunk/PKGBUILD) quassel/repos/community-i686/quassel.conf (from rev 173770, quassel/trunk/quassel.conf) quassel/repos/community-i686/quassel.install (from rev 173770, quassel/trunk/quassel.install) quassel/repos/community-i686/quassel.service (from rev 173770, quassel/trunk/quassel.service) quassel/repos/community-x86_64/PKGBUILD (from rev 173770, quassel/trunk/PKGBUILD) quassel/repos/community-x86_64/quassel.conf (from rev 173770, quassel/trunk/quassel.conf) quassel/repos/community-x86_64/quassel.install (from rev 173770, quassel/trunk/quassel.install) quassel/repos/community-x86_64/quassel.service (from rev 173770, quassel/trunk/quassel.service) Deleted: quassel/repos/community-i686/PKGBUILD quassel/repos/community-i686/quassel-client.install quassel/repos/community-i686/quassel-monolithic.install quassel/repos/community-i686/quassel.conf quassel/repos/community-i686/quassel.install quassel/repos/community-i686/quassel.service quassel/repos/community-x86_64/PKGBUILD quassel/repos/community-x86_64/quassel-client.install quassel/repos/community-x86_64/quassel-monolithic.install quassel/repos/community-x86_64/quassel.conf quassel/repos/community-x86_64/quassel.install quassel/repos/community-x86_64/quassel.service ---------------------------------------------+ /PKGBUILD | 234 ++++++++++++++++++++++++++ /quassel.conf | 4 /quassel.install | 40 ++++ /quassel.service | 28 +++ community-i686/PKGBUILD | 118 ------------- community-i686/quassel-client.install | 9 - community-i686/quassel-monolithic.install | 9 - community-i686/quassel.conf | 2 community-i686/quassel.install | 21 -- community-i686/quassel.service | 14 - community-x86_64/PKGBUILD | 118 ------------- community-x86_64/quassel-client.install | 9 - community-x86_64/quassel-monolithic.install | 9 - community-x86_64/quassel.conf | 2 community-x86_64/quassel.install | 21 -- community-x86_64/quassel.service | 14 - 16 files changed, 306 insertions(+), 346 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-05-04 22:07:36 UTC (rev 173770) +++ community-i686/PKGBUILD 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,118 +0,0 @@ -# $Id$ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Vesa Kaihlavirta <ve...@iki.fi> - -pkgbase=quassel -pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic') -pkgver=0.12.3 -pkgrel=1 -pkgdesc="Next-generation distributed IRC client" -arch=('i686' 'x86_64') -url="http://quassel-irc.org/" -license=('GPL') -makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'knotifyconfig') -source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 - $pkgbase.service - $pkgbase.conf) -sha256sums=('4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434' - '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f' - 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') - -prepare() { - cd "${srcdir}" - mkdir build{,-client,-mono} - cd quassel-${pkgver} -} - -build() { - cd "${srcdir}" - - # Core - cd "${srcdir}"/build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DWITH_KDE=OFF \ - -DUSE_QT5=ON \ - -DWITH_OPENSSL=ON \ - -DWANT_CORE=ON \ - -DWANT_MONO=OFF \ - -DWANT_QTCLIENT=OFF \ - -DWITH_DBUS=OFF \ - -DWITH_OXYGEN=OFF \ - -DWITH_PHONON=OFF \ - -DWITH_WEBKIT=OFF \ - -DCMAKE_BUILD_TYPE="Release" \ - ../quassel-${pkgver}/ \ - -Wno-dev - make - - # Client - cd "${srcdir}"/build-client - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DUSE_QT5=ON \ - -DWITH_KDE=ON \ - -DWITH_OPENSSL=ON \ - -DWANT_CORE=OFF \ - -DWANT_QTCLIENT=ON \ - -DWANT_MONO=OFF \ - -DCMAKE_BUILD_TYPE="Release" \ - ../quassel-${pkgver}/ \ - -Wno-dev - make - - # Monolithic - cd "${srcdir}"/build-mono - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DUSE_QT5=ON \ - -DWITH_KDE=ON \ - -DWITH_OPENSSL=ON \ - -DWANT_CORE=OFF \ - -DWANT_QTCLIENT=OFF \ - -DWANT_MONO=ON \ - -DCMAKE_BUILD_TYPE="Release" \ - ../quassel-${pkgver}/ \ - -Wno-dev - make -} - -package_quassel-core() { -pkgdesc="Next-generation distributed IRC client - core only" -depends=('icu' 'qca-qt5' 'qt5-script') -optdepends=('postgresql: PostgreSQL database support') -backup=(etc/conf.d/quassel) -install=quassel.install - cd "${srcdir}"/build - - make DESTDIR="${pkgdir}" install - - # Remove unneeded pixmap icons - rm -r "${pkgdir}"/usr/share - - install -Dm644 "${srcdir}"/$pkgbase.service \ - "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service - install -Dm644 "${srcdir}"/$pkgbase.conf \ - "${pkgdir}"/etc/conf.d/$pkgbase -} - -package_quassel-client() { -pkgdesc="Next-generation distributed IRC client - client only" -depends=('qt5-base' 'qt5-webkit' 'knotifyconfig') -conflicts=('quassel-monolithic') -install=quassel-client.install - cd "${srcdir}"/build-client - - make DESTDIR="${pkgdir}" install -} - -package_quassel-monolithic() { -pkgdesc="Next-generation distributed IRC client - monolithic" -depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig') -optdepends=('postgresql: PostgreSQL database support') -conflicts=('quassel-client') -install=quassel-monolithic.install - cd "${srcdir}"/build-mono - - make DESTDIR="${pkgdir}" install -} Copied: quassel/repos/community-i686/PKGBUILD (from rev 173770, quassel/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,117 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Vesa Kaihlavirta <ve...@iki.fi> + +pkgbase=quassel +pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic') +pkgver=0.12.4 +pkgrel=1 +pkgdesc="Next-generation distributed IRC client" +arch=('i686' 'x86_64') +url="http://quassel-irc.org/" +license=('GPL') +makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools' + 'qca-qt5' 'qt5-script' 'knotifyconfig' 'python') +source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 + $pkgbase.service + $pkgbase.conf) +sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d' + '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f' + 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') + +prepare() { + cd "${srcdir}" + mkdir build{,-client,-mono} + cd quassel-${pkgver} +} + +build() { + cd "${srcdir}" + + # Core + cd "${srcdir}"/build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DWITH_KDE=OFF \ + -DUSE_QT5=ON \ + -DHAVE_SSL=TRUE \ + -DWANT_CORE=ON \ + -DWANT_MONO=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWITH_DBUS=OFF \ + -DWITH_OXYGEN=OFF \ + -DWITH_PHONON=OFF \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + make + + # Client + cd "${srcdir}"/build-client + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DUSE_QT5=ON \ + -DWITH_KDE=ON \ + -DHAVE_SSL=TRUE \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=ON \ + -DWANT_MONO=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + make + + # Monolithic + cd "${srcdir}"/build-mono + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DUSE_QT5=ON \ + -DWITH_KDE=ON \ + -DHAVE_SSL=TRUE \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWANT_MONO=ON \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + make +} + +package_quassel-core() { +pkgdesc="Next-generation distributed IRC client - core only" +depends=('icu' 'qca-qt5' 'qt5-script') +optdepends=('postgresql: PostgreSQL database support') +backup=(etc/conf.d/quassel) +install=$pkgbase.install + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + # Remove unneeded pixmap icons + rm -r "${pkgdir}"/usr/share + + install -Dm644 "${srcdir}"/$pkgbase.service \ + "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service + install -Dm644 "${srcdir}"/$pkgbase.conf \ + "${pkgdir}"/etc/conf.d/$pkgbase +} + +package_quassel-client() { +pkgdesc="Next-generation distributed IRC client - client only" +depends=('qt5-base' 'qt5-webkit' 'knotifyconfig') +conflicts=('quassel-monolithic') + cd "${srcdir}"/build-client + + make DESTDIR="${pkgdir}" install +} + +package_quassel-monolithic() { +pkgdesc="Next-generation distributed IRC client - monolithic" +depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig') +optdepends=('postgresql: PostgreSQL database support') +conflicts=('quassel-client') + cd "${srcdir}"/build-mono + + make DESTDIR="${pkgdir}" install +} Deleted: community-i686/quassel-client.install =================================================================== --- community-i686/quassel-client.install 2016-05-04 22:07:36 UTC (rev 173770) +++ community-i686/quassel-client.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,9 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} -post_upgrade() { - post_install -} -post_remove() { - post_install -} Deleted: community-i686/quassel-monolithic.install =================================================================== --- community-i686/quassel-monolithic.install 2016-05-04 22:07:36 UTC (rev 173770) +++ community-i686/quassel-monolithic.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,9 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} -post_upgrade() { - post_install -} -post_remove() { - post_install -} Deleted: community-i686/quassel.conf =================================================================== --- community-i686/quassel.conf 2016-05-04 22:07:36 UTC (rev 173770) +++ community-i686/quassel.conf 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,2 +0,0 @@ -QUASSEL_USER=quassel -LISTEN=127.0.0.1 Copied: quassel/repos/community-i686/quassel.conf (from rev 173770, quassel/trunk/quassel.conf) =================================================================== --- community-i686/quassel.conf (rev 0) +++ community-i686/quassel.conf 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,2 @@ +QUASSEL_USER=quassel +LISTEN=127.0.0.1 Deleted: community-i686/quassel.install =================================================================== --- community-i686/quassel.install 2016-05-04 22:07:36 UTC (rev 173770) +++ community-i686/quassel.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,21 +0,0 @@ -post_install() { - useradd -r -s /bin/false -d /var/lib/quassel quassel - mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel -# xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - [ `vercmp $2 0.5.2-1` -le 0 ] && ( - cat <<EOF - -==> - quasselcore now runs as the quassel user -==> - quasselcore now listens to port 127.0.0.1 by default -==> - both of above are configurable: /etc/conf.d/quassel -EOF - post_install - ) || true -} - -post_remove() { - userdel quassel -} Copied: quassel/repos/community-i686/quassel.install (from rev 173770, quassel/trunk/quassel.install) =================================================================== --- community-i686/quassel.install (rev 0) +++ community-i686/quassel.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,20 @@ +post_install() { + useradd -r -s /bin/false -d /var/lib/quassel quassel + mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel +} + +post_upgrade() { + [ `vercmp $2 0.5.2-1` -le 0 ] && ( + cat <<EOF + +==> - quasselcore now runs as the quassel user +==> - quasselcore now listens to port 127.0.0.1 by default +==> - both of above are configurable: /etc/conf.d/quassel +EOF + post_install + ) || true +} + +post_remove() { + userdel quassel +} Deleted: community-i686/quassel.service =================================================================== --- community-i686/quassel.service 2016-05-04 22:07:36 UTC (rev 173770) +++ community-i686/quassel.service 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,14 +0,0 @@ -[Unit] -Description=Quassel Core -After=network.target postgresql.service -Wants=postgresql.service - -[Service] -User=quassel -Group=quassel -PIDFile=/var/run/quassel.pid -EnvironmentFile=/etc/conf.d/quassel -ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel - -[Install] -WantedBy=multi-user.target Copied: quassel/repos/community-i686/quassel.service (from rev 173770, quassel/trunk/quassel.service) =================================================================== --- community-i686/quassel.service (rev 0) +++ community-i686/quassel.service 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,14 @@ +[Unit] +Description=Quassel Core +After=network.target postgresql.service +Wants=postgresql.service + +[Service] +User=quassel +Group=quassel +PIDFile=/var/run/quassel.pid +EnvironmentFile=/etc/conf.d/quassel +ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-05-04 22:07:36 UTC (rev 173770) +++ community-x86_64/PKGBUILD 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,118 +0,0 @@ -# $Id$ -# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> -# Contributor: Vesa Kaihlavirta <ve...@iki.fi> - -pkgbase=quassel -pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic') -pkgver=0.12.3 -pkgrel=1 -pkgdesc="Next-generation distributed IRC client" -arch=('i686' 'x86_64') -url="http://quassel-irc.org/" -license=('GPL') -makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools' 'qca-qt5' 'qt5-script' 'knotifyconfig') -source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 - $pkgbase.service - $pkgbase.conf) -sha256sums=('4d3ee91b85cce3d8df62faf55ad35bebd6fc45085ed6248b8a41d2858de3d434' - '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f' - 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') - -prepare() { - cd "${srcdir}" - mkdir build{,-client,-mono} - cd quassel-${pkgver} -} - -build() { - cd "${srcdir}" - - # Core - cd "${srcdir}"/build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DWITH_KDE=OFF \ - -DUSE_QT5=ON \ - -DWITH_OPENSSL=ON \ - -DWANT_CORE=ON \ - -DWANT_MONO=OFF \ - -DWANT_QTCLIENT=OFF \ - -DWITH_DBUS=OFF \ - -DWITH_OXYGEN=OFF \ - -DWITH_PHONON=OFF \ - -DWITH_WEBKIT=OFF \ - -DCMAKE_BUILD_TYPE="Release" \ - ../quassel-${pkgver}/ \ - -Wno-dev - make - - # Client - cd "${srcdir}"/build-client - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DUSE_QT5=ON \ - -DWITH_KDE=ON \ - -DWITH_OPENSSL=ON \ - -DWANT_CORE=OFF \ - -DWANT_QTCLIENT=ON \ - -DWANT_MONO=OFF \ - -DCMAKE_BUILD_TYPE="Release" \ - ../quassel-${pkgver}/ \ - -Wno-dev - make - - # Monolithic - cd "${srcdir}"/build-mono - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr/ \ - -DUSE_QT5=ON \ - -DWITH_KDE=ON \ - -DWITH_OPENSSL=ON \ - -DWANT_CORE=OFF \ - -DWANT_QTCLIENT=OFF \ - -DWANT_MONO=ON \ - -DCMAKE_BUILD_TYPE="Release" \ - ../quassel-${pkgver}/ \ - -Wno-dev - make -} - -package_quassel-core() { -pkgdesc="Next-generation distributed IRC client - core only" -depends=('icu' 'qca-qt5' 'qt5-script') -optdepends=('postgresql: PostgreSQL database support') -backup=(etc/conf.d/quassel) -install=quassel.install - cd "${srcdir}"/build - - make DESTDIR="${pkgdir}" install - - # Remove unneeded pixmap icons - rm -r "${pkgdir}"/usr/share - - install -Dm644 "${srcdir}"/$pkgbase.service \ - "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service - install -Dm644 "${srcdir}"/$pkgbase.conf \ - "${pkgdir}"/etc/conf.d/$pkgbase -} - -package_quassel-client() { -pkgdesc="Next-generation distributed IRC client - client only" -depends=('qt5-base' 'qt5-webkit' 'knotifyconfig') -conflicts=('quassel-monolithic') -install=quassel-client.install - cd "${srcdir}"/build-client - - make DESTDIR="${pkgdir}" install -} - -package_quassel-monolithic() { -pkgdesc="Next-generation distributed IRC client - monolithic" -depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig') -optdepends=('postgresql: PostgreSQL database support') -conflicts=('quassel-client') -install=quassel-monolithic.install - cd "${srcdir}"/build-mono - - make DESTDIR="${pkgdir}" install -} Copied: quassel/repos/community-x86_64/PKGBUILD (from rev 173770, quassel/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,117 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <svetlemo...@archlinux.org> +# Contributor: Vesa Kaihlavirta <ve...@iki.fi> + +pkgbase=quassel +pkgname=('quassel-client' 'quassel-core' 'quassel-monolithic') +pkgver=0.12.4 +pkgrel=1 +pkgdesc="Next-generation distributed IRC client" +arch=('i686' 'x86_64') +url="http://quassel-irc.org/" +license=('GPL') +makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools' + 'qca-qt5' 'qt5-script' 'knotifyconfig' 'python') +source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2 + $pkgbase.service + $pkgbase.conf) +sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d' + '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f' + 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') + +prepare() { + cd "${srcdir}" + mkdir build{,-client,-mono} + cd quassel-${pkgver} +} + +build() { + cd "${srcdir}" + + # Core + cd "${srcdir}"/build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DWITH_KDE=OFF \ + -DUSE_QT5=ON \ + -DHAVE_SSL=TRUE \ + -DWANT_CORE=ON \ + -DWANT_MONO=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWITH_DBUS=OFF \ + -DWITH_OXYGEN=OFF \ + -DWITH_PHONON=OFF \ + -DWITH_WEBKIT=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + make + + # Client + cd "${srcdir}"/build-client + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DUSE_QT5=ON \ + -DWITH_KDE=ON \ + -DHAVE_SSL=TRUE \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=ON \ + -DWANT_MONO=OFF \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + make + + # Monolithic + cd "${srcdir}"/build-mono + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr/ \ + -DUSE_QT5=ON \ + -DWITH_KDE=ON \ + -DHAVE_SSL=TRUE \ + -DWANT_CORE=OFF \ + -DWANT_QTCLIENT=OFF \ + -DWANT_MONO=ON \ + -DCMAKE_BUILD_TYPE="Release" \ + ../quassel-${pkgver}/ \ + -Wno-dev + make +} + +package_quassel-core() { +pkgdesc="Next-generation distributed IRC client - core only" +depends=('icu' 'qca-qt5' 'qt5-script') +optdepends=('postgresql: PostgreSQL database support') +backup=(etc/conf.d/quassel) +install=$pkgbase.install + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + # Remove unneeded pixmap icons + rm -r "${pkgdir}"/usr/share + + install -Dm644 "${srcdir}"/$pkgbase.service \ + "${pkgdir}"/usr/lib/systemd/system/$pkgbase.service + install -Dm644 "${srcdir}"/$pkgbase.conf \ + "${pkgdir}"/etc/conf.d/$pkgbase +} + +package_quassel-client() { +pkgdesc="Next-generation distributed IRC client - client only" +depends=('qt5-base' 'qt5-webkit' 'knotifyconfig') +conflicts=('quassel-monolithic') + cd "${srcdir}"/build-client + + make DESTDIR="${pkgdir}" install +} + +package_quassel-monolithic() { +pkgdesc="Next-generation distributed IRC client - monolithic" +depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig') +optdepends=('postgresql: PostgreSQL database support') +conflicts=('quassel-client') + cd "${srcdir}"/build-mono + + make DESTDIR="${pkgdir}" install +} Deleted: community-x86_64/quassel-client.install =================================================================== --- community-x86_64/quassel-client.install 2016-05-04 22:07:36 UTC (rev 173770) +++ community-x86_64/quassel-client.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,9 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} -post_upgrade() { - post_install -} -post_remove() { - post_install -} Deleted: community-x86_64/quassel-monolithic.install =================================================================== --- community-x86_64/quassel-monolithic.install 2016-05-04 22:07:36 UTC (rev 173770) +++ community-x86_64/quassel-monolithic.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,9 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} -post_upgrade() { - post_install -} -post_remove() { - post_install -} Deleted: community-x86_64/quassel.conf =================================================================== --- community-x86_64/quassel.conf 2016-05-04 22:07:36 UTC (rev 173770) +++ community-x86_64/quassel.conf 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,2 +0,0 @@ -QUASSEL_USER=quassel -LISTEN=127.0.0.1 Copied: quassel/repos/community-x86_64/quassel.conf (from rev 173770, quassel/trunk/quassel.conf) =================================================================== --- community-x86_64/quassel.conf (rev 0) +++ community-x86_64/quassel.conf 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,2 @@ +QUASSEL_USER=quassel +LISTEN=127.0.0.1 Deleted: community-x86_64/quassel.install =================================================================== --- community-x86_64/quassel.install 2016-05-04 22:07:36 UTC (rev 173770) +++ community-x86_64/quassel.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,21 +0,0 @@ -post_install() { - useradd -r -s /bin/false -d /var/lib/quassel quassel - mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel -# xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - [ `vercmp $2 0.5.2-1` -le 0 ] && ( - cat <<EOF - -==> - quasselcore now runs as the quassel user -==> - quasselcore now listens to port 127.0.0.1 by default -==> - both of above are configurable: /etc/conf.d/quassel -EOF - post_install - ) || true -} - -post_remove() { - userdel quassel -} Copied: quassel/repos/community-x86_64/quassel.install (from rev 173770, quassel/trunk/quassel.install) =================================================================== --- community-x86_64/quassel.install (rev 0) +++ community-x86_64/quassel.install 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,20 @@ +post_install() { + useradd -r -s /bin/false -d /var/lib/quassel quassel + mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel +} + +post_upgrade() { + [ `vercmp $2 0.5.2-1` -le 0 ] && ( + cat <<EOF + +==> - quasselcore now runs as the quassel user +==> - quasselcore now listens to port 127.0.0.1 by default +==> - both of above are configurable: /etc/conf.d/quassel +EOF + post_install + ) || true +} + +post_remove() { + userdel quassel +} Deleted: community-x86_64/quassel.service =================================================================== --- community-x86_64/quassel.service 2016-05-04 22:07:36 UTC (rev 173770) +++ community-x86_64/quassel.service 2016-05-04 22:08:05 UTC (rev 173771) @@ -1,14 +0,0 @@ -[Unit] -Description=Quassel Core -After=network.target postgresql.service -Wants=postgresql.service - -[Service] -User=quassel -Group=quassel -PIDFile=/var/run/quassel.pid -EnvironmentFile=/etc/conf.d/quassel -ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel - -[Install] -WantedBy=multi-user.target Copied: quassel/repos/community-x86_64/quassel.service (from rev 173770, quassel/trunk/quassel.service) =================================================================== --- community-x86_64/quassel.service (rev 0) +++ community-x86_64/quassel.service 2016-05-04 22:08:05 UTC (rev 173771) @@ -0,0 +1,14 @@ +[Unit] +Description=Quassel Core +After=network.target postgresql.service +Wants=postgresql.service + +[Service] +User=quassel +Group=quassel +PIDFile=/var/run/quassel.pid +EnvironmentFile=/etc/conf.d/quassel +ExecStart=/usr/bin/quasselcore --configdir=/var/lib/quassel + +[Install] +WantedBy=multi-user.target