[arch-commits] Commit in quassel/repos (16 files)

Jan Steffens heftig at archlinux.org
Thu Jul 28 21:33:54 UTC 2016


    Date: Thursday, July 28, 2016 @ 21:33:53
  Author: heftig
Revision: 184603

archrelease: copy trunk to community-i686, community-x86_64

Added:
  quassel/repos/community-i686/PKGBUILD
    (from rev 184601, quassel/trunk/PKGBUILD)
  quassel/repos/community-i686/quassel.conf
    (from rev 184601, quassel/trunk/quassel.conf)
  quassel/repos/community-i686/quassel.install
    (from rev 184601, quassel/trunk/quassel.install)
  quassel/repos/community-i686/quassel.service
    (from rev 184601, quassel/trunk/quassel.service)
  quassel/repos/community-x86_64/PKGBUILD
    (from rev 184601, quassel/trunk/PKGBUILD)
  quassel/repos/community-x86_64/quassel.conf
    (from rev 184601, quassel/trunk/quassel.conf)
  quassel/repos/community-x86_64/quassel.install
    (from rev 184601, quassel/trunk/quassel.install)
  quassel/repos/community-x86_64/quassel.service
    (from rev 184601, quassel/trunk/quassel.service)
Deleted:
  quassel/repos/community-i686/PKGBUILD
  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.conf
  quassel/repos/community-x86_64/quassel.install
  quassel/repos/community-x86_64/quassel.service

----------------------------------+
 /PKGBUILD                        |  226 +++++++++++++++++++++++++++++++++++++
 /quassel.conf                    |    4 
 /quassel.install                 |    8 +
 /quassel.service                 |   28 ++++
 community-i686/PKGBUILD          |  117 -------------------
 community-i686/quassel.conf      |    2 
 community-i686/quassel.install   |   20 ---
 community-i686/quassel.service   |   14 --
 community-x86_64/PKGBUILD        |  117 -------------------
 community-x86_64/quassel.conf    |    2 
 community-x86_64/quassel.install |   20 ---
 community-x86_64/quassel.service |   14 --
 12 files changed, 266 insertions(+), 306 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-i686/PKGBUILD	2016-07-28 21:33:53 UTC (rev 184603)
@@ -1,117 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai at 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
-}

Copied: quassel/repos/community-i686/PKGBUILD (from rev 184601, quassel/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2016-07-28 21:33:53 UTC (rev 184603)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgbase=quassel
+pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
+pkgver=0.12.4
+pkgrel=2
+pkgdesc="Next-generation distributed IRC client"
+arch=('i686' 'x86_64')
+url="http://quassel-irc.org/"
+license=('GPL')
+makedepends=('qt5-base' 'qt5-tools' 'qt5-webkit' 'qca-qt5' 'qt5-script'
+             'knotifyconfig' 'cmake' 'extra-cmake-modules' 'python'
+             'hicolor-icon-theme')
+source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+        $pkgbase.service
+        $pkgbase.conf)
+sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
+            '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+  cd "${srcdir}"
+  mkdir build-{core,client,client-small,mono}
+  cd quassel-${pkgver}
+}
+
+_build() (
+  cd build-$1
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DHAVE_SSL=ON \
+    -DUSE_QT5=ON \
+    "${@:2}" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+)
+
+build() {
+  _build core \
+    -DWANT_QTCLIENT=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_OXYGEN=OFF \
+    -DWITH_WEBKIT=OFF
+
+  _build client \
+    -DWANT_CORE=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_KDE=ON
+
+  _build client-small \
+    -DWANT_CORE=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_WEBKIT=OFF \
+    -DCMAKE_DISABLE_FIND_PACKAGE_dbusmenu-qt5=ON \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
+
+  _build mono \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWITH_KDE=ON
+}
+
+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-core
+
+  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' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client-small')
+  cd "${srcdir}"/build-client
+
+  make DESTDIR="${pkgdir}" install
+}
+
+package_quassel-client-small() {
+pkgdesc="Next-generation distributed IRC client - client only, reduced deps"
+depends=('qt5-base' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client')
+replaces=('quassel-remote')
+  cd "${srcdir}"/build-client-small
+
+  make DESTDIR="${pkgdir}" install
+}
+
+package_quassel-monolithic() {
+pkgdesc="Next-generation distributed IRC client - monolithic"
+depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig' 'hicolor-icon-theme')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client' 'quassel-client-small')
+  cd "${srcdir}"/build-mono
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/quassel.conf
===================================================================
--- community-i686/quassel.conf	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-i686/quassel.conf	2016-07-28 21:33:53 UTC (rev 184603)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1

Copied: quassel/repos/community-i686/quassel.conf (from rev 184601, quassel/trunk/quassel.conf)
===================================================================
--- community-i686/quassel.conf	                        (rev 0)
+++ community-i686/quassel.conf	2016-07-28 21:33:53 UTC (rev 184603)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1

Deleted: community-i686/quassel.install
===================================================================
--- community-i686/quassel.install	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-i686/quassel.install	2016-07-28 21:33:53 UTC (rev 184603)
@@ -1,20 +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
-}
-
-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 184601, quassel/trunk/quassel.install)
===================================================================
--- community-i686/quassel.install	                        (rev 0)
+++ community-i686/quassel.install	2016-07-28 21:33:53 UTC (rev 184603)
@@ -0,0 +1,4 @@
+post_install() {
+  getent passwd quassel >/dev/null || useradd -r -s /bin/false -d /var/lib/quassel quassel
+  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
+}

Deleted: community-i686/quassel.service
===================================================================
--- community-i686/quassel.service	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-i686/quassel.service	2016-07-28 21:33:53 UTC (rev 184603)
@@ -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 184601, quassel/trunk/quassel.service)
===================================================================
--- community-i686/quassel.service	                        (rev 0)
+++ community-i686/quassel.service	2016-07-28 21:33:53 UTC (rev 184603)
@@ -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-07-28 21:33:47 UTC (rev 184602)
+++ community-x86_64/PKGBUILD	2016-07-28 21:33:53 UTC (rev 184603)
@@ -1,117 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai at 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
-}

Copied: quassel/repos/community-x86_64/PKGBUILD (from rev 184601, quassel/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2016-07-28 21:33:53 UTC (rev 184603)
@@ -0,0 +1,113 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Vesa Kaihlavirta <vegai at iki.fi>
+
+pkgbase=quassel
+pkgname=('quassel-core' 'quassel-client' 'quassel-client-small' 'quassel-monolithic')
+pkgver=0.12.4
+pkgrel=2
+pkgdesc="Next-generation distributed IRC client"
+arch=('i686' 'x86_64')
+url="http://quassel-irc.org/"
+license=('GPL')
+makedepends=('qt5-base' 'qt5-tools' 'qt5-webkit' 'qca-qt5' 'qt5-script'
+             'knotifyconfig' 'cmake' 'extra-cmake-modules' 'python'
+             'hicolor-icon-theme')
+source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
+        $pkgbase.service
+        $pkgbase.conf)
+sha256sums=('93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d'
+            '5dbe20290f3361b9b7a74a52905137e76b656976febf2d31082a2276f9dcde7f'
+            'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
+
+prepare() {
+  cd "${srcdir}"
+  mkdir build-{core,client,client-small,mono}
+  cd quassel-${pkgver}
+}
+
+_build() (
+  cd build-$1
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr/ \
+    -DCMAKE_BUILD_TYPE="Release" \
+    -DHAVE_SSL=ON \
+    -DUSE_QT5=ON \
+    "${@:2}" \
+    ../quassel-${pkgver}/ \
+    -Wno-dev
+  make
+)
+
+build() {
+  _build core \
+    -DWANT_QTCLIENT=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_OXYGEN=OFF \
+    -DWITH_WEBKIT=OFF
+
+  _build client \
+    -DWANT_CORE=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_KDE=ON
+
+  _build client-small \
+    -DWANT_CORE=OFF \
+    -DWANT_MONO=OFF \
+    -DWITH_WEBKIT=OFF \
+    -DCMAKE_DISABLE_FIND_PACKAGE_dbusmenu-qt5=ON \
+    -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON
+
+  _build mono \
+    -DWANT_CORE=OFF \
+    -DWANT_QTCLIENT=OFF \
+    -DWITH_KDE=ON
+}
+
+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-core
+
+  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' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client-small')
+  cd "${srcdir}"/build-client
+
+  make DESTDIR="${pkgdir}" install
+}
+
+package_quassel-client-small() {
+pkgdesc="Next-generation distributed IRC client - client only, reduced deps"
+depends=('qt5-base' 'hicolor-icon-theme')
+conflicts=('quassel-monolithic' 'quassel-client')
+replaces=('quassel-remote')
+  cd "${srcdir}"/build-client-small
+
+  make DESTDIR="${pkgdir}" install
+}
+
+package_quassel-monolithic() {
+pkgdesc="Next-generation distributed IRC client - monolithic"
+depends=('qt5-base' 'qca-qt5' 'qt5-webkit' 'qt5-script' 'knotifyconfig' 'hicolor-icon-theme')
+optdepends=('postgresql: PostgreSQL database support')
+conflicts=('quassel-client' 'quassel-client-small')
+  cd "${srcdir}"/build-mono
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-x86_64/quassel.conf
===================================================================
--- community-x86_64/quassel.conf	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-x86_64/quassel.conf	2016-07-28 21:33:53 UTC (rev 184603)
@@ -1,2 +0,0 @@
-QUASSEL_USER=quassel
-LISTEN=127.0.0.1

Copied: quassel/repos/community-x86_64/quassel.conf (from rev 184601, quassel/trunk/quassel.conf)
===================================================================
--- community-x86_64/quassel.conf	                        (rev 0)
+++ community-x86_64/quassel.conf	2016-07-28 21:33:53 UTC (rev 184603)
@@ -0,0 +1,2 @@
+QUASSEL_USER=quassel
+LISTEN=127.0.0.1

Deleted: community-x86_64/quassel.install
===================================================================
--- community-x86_64/quassel.install	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-x86_64/quassel.install	2016-07-28 21:33:53 UTC (rev 184603)
@@ -1,20 +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
-}
-
-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 184601, quassel/trunk/quassel.install)
===================================================================
--- community-x86_64/quassel.install	                        (rev 0)
+++ community-x86_64/quassel.install	2016-07-28 21:33:53 UTC (rev 184603)
@@ -0,0 +1,4 @@
+post_install() {
+  getent passwd quassel >/dev/null || useradd -r -s /bin/false -d /var/lib/quassel quassel
+  mkdir -p /var/lib/quassel && chown -R quassel:quassel /var/lib/quassel
+}

Deleted: community-x86_64/quassel.service
===================================================================
--- community-x86_64/quassel.service	2016-07-28 21:33:47 UTC (rev 184602)
+++ community-x86_64/quassel.service	2016-07-28 21:33:53 UTC (rev 184603)
@@ -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 184601, quassel/trunk/quassel.service)
===================================================================
--- community-x86_64/quassel.service	                        (rev 0)
+++ community-x86_64/quassel.service	2016-07-28 21:33:53 UTC (rev 184603)
@@ -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



More information about the arch-commits mailing list