Sun Jan 13 01:14:34 PST 2013

17 files changed, 224 insertions, 48 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 352da12ac..0c9b69a58 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171683 2012-11-21 11:19:58Z andrea $
+# $Id: PKGBUILD 175030 2013-01-12 08:15:19Z andyrtr $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -18,13 +18,13 @@ pkgname=('calligra-filters'
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.5.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg'
-             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
+             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt>=0.22.0' 'libkdcraw'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
@@ -135,8 +135,7 @@ package_calligra-plan() {
 
 package_calligra-stage() {
   pkgdesc="Write presentation documents"
-  depends=('calligra-libs' 'kdebase-runtime')
-  optdepends=('calligra-plugins: extra calligra plugins')
+  depends=('calligra-plugins' 'kdebase-runtime')
   conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
   install=calligra-stage.install
@@ -177,7 +176,7 @@ package_calligra-sheets() {
 
 package_calligra-words() {
   pkgdesc="Word Processor"
-  depends=('calligra-libs' 'kdegraphics-okular')
+  depends=('calligra-plugins' 'kdegraphics-okular')
   optdepends=('calligra-tools: extra calligra tools')
   conflicts=('koffice-kword')
   replaces=('koffice-kword')
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index c1b958e12..0c227f4dd 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 174826 2013-01-07 19:40:46Z ronald $
+# $Id: PKGBUILD 175032 2013-01-12 08:15:25Z andyrtr $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
 pkgver=1.7.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 9d30c8d72..2f38a9b85 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 173270 2012-12-18 01:27:21Z bisson $
+# $Id: PKGBUILD 175033 2013-01-12 08:15:28Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64')
 makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt'
          'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 3df07831f..c7d4da8b8 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173765 2012-12-22 16:44:33Z andyrtr $
+# $Id: PKGBUILD 175034 2013-01-12 08:15:36Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -26,13 +26,13 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=3.6.4.3
 pkgver=3.6.4
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
-             'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit'
+             'apache-ant' 'gperf' 'poppler>=0.22.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
              # the runtime dependencies
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index c0923b187..5b31c0514 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 170197 2012-11-04 18:02:05Z ibiru $
+# $Id: PKGBUILD 175075 2013-01-12 16:47:42Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.5
+pkgver=0.16.6
 pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64')
-license=('custom')
+license=('BSD')
 depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('dde29c7a51392d9098de23e2e69a993a5c380016')
+sha1sums=('baf95f53be99a90c4bb1488a72e9d625684bbbd2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index 6170cb7b6..1dc7e8fae 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 165115 2012-08-11 08:21:45Z andyrtr $
+# $Id: PKGBUILD 175074 2013-01-12 15:33:07Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=3.0.3.5
+pkgver=3.0.6
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64') # also "any" pkg?
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=3.0.3.5-2' 'gdb')
+depends=('monodevelop>=3.0.6' 'gdb')
 makedepends=('mono')
 options=('!makeflags')
 source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('c16da5cdbda46fb32e0dc730bb433203')
+md5sums=('9f3d08104d01e536342ffe15bdd5727c')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 2ba30d678..85c19338a 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165114 2012-08-11 08:21:42Z andyrtr $
+# $Id: PKGBUILD 175072 2013-01-12 15:31:21Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=3.0.3.5
-pkgrel=2
+pkgver=3.0.6
+pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 
 # should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH 
@@ -14,11 +14,12 @@ arch=('i686' 'x86_64')
 url="http://www.monodevelop.com"
 license=('GPL')
 depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('rsync')
 options=(!makeflags)
 install=monodevelop.install
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         monodevelop-core-addins.pc.in.patch)
-md5sums=('ca46b77b49266112b63a8f5c451c5565'
+md5sums=('748d0fb89c40c2cb5a9267c8635eb55d'
          '8466d032735130e37d4091a793a7966c')
 
 build() {
@@ -27,7 +28,7 @@ build() {
 
   cd $srcdir/$pkgname-$pkgver
   # fix location for MonoDevelop.Gettext.dll - breaks gdb build
-  patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
+  # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
   
   ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb
   LD_PRELOAD="" make
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index ecb84a61c..a0a4c1dd8 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169388 2012-10-20 09:31:48Z andyrtr $
+# $Id: PKGBUILD 175029 2013-01-12 08:15:09Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.20.5
+pkgver=0.22.0
 pkgrel=1
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('8a80ae83eb7a327b031808d09ee1d54d'
+md5sums=('c7038be37a7d446544e83a7df3c26196'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 build() {
@@ -36,7 +36,7 @@ check() {
   cd "${srcdir}"
   ln -sf test-${_testtag} test
   cd ${pkgbase}-${pkgver}
-  LANG=en_US.UTF8 make check || /bin/true
+  LANG=en_US.UTF8 make check
 }
 
 package_poppler() {
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index d1804969c..ed81cf84e 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -4,15 +4,15 @@
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 
 pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('LGPL')
 arch=('i686' 'x86_64')
 makedepends=('python2-distribute' 'python-distribute')
 url="http://excess.org/urwid/"
 source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('00542bbd15fae7ea60b02a7570edee2b')
+md5sums=('eca2e0413cf7216b01c84b99e0f2576d')
 
 build() {
   cp -r urwid-$pkgver python2-urwid-$pkgver
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index 6ba997c51..124697112 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 166374 2012-09-07 06:46:11Z andyrtr $
+# $Id: PKGBUILD 175036 2013-01-12 08:15:44Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Miguel Revilla <yo at miguelrevilla.com>
 # Contributor: David Sotelo <dvsotelo at gmail.com>
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=qpdf
-pkgver=3.0.2
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
 arch=('i686' 'x86_64')
@@ -15,12 +15,10 @@ depends=('pcre' 'perl')
 makedepends=('make')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('af6f6f964481295a6ca0766185bfa274')
+md5sums=('812ffc8c5b8fb5cf9310fcbd9a7d20d3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix rpath errors (from Fedora spec)
-  autoreconf -vfi
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index 9a3e23e20..31106382e 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 171095 2012-11-16 16:58:51Z andrea $
+# $Id: PKGBUILD 175068 2013-01-12 13:26:14Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
-depends=('qt' 'telepathy-glib')
-#depends=('qt' 'telepathy-farstream')
+depends=('qt' 'telepathy-farstream' 'farstream-0.1')
 makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 conflicts=('telepathy-qt4')
 replaces=('telepathy-qt4')
 provides=('telepathy-qt4')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('94ac93aedf5f6fff49837bc8368e5a37')
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc})
+md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
+         'e1b851b08b159fca39596ff8395ca53a')
 
 build() {
     cd "$srcdir"
@@ -26,6 +26,7 @@ build() {
     cmake ../${pkgname}-${pkgver} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
         -DENABLE_TESTS=OFF
     make
 }
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 3b20bf518..12d68b900 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 159727 2012-05-26 10:06:04Z daniel $
+# $Id: PKGBUILD 175070 2013-01-12 14:16:01Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
-pkgver=0.95.3
+pkgver=0.95.4
 pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=('GPL' 'custom')
 depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
 options=('!libtool')
 source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop)  
-md5sums=('305af9d862e853a5d7977e801cb66ca3'
+md5sums=('640b8ea5b1a875440aa48eaab09c5f00'
          '2fba97bebfd691836b92b8f0db79ff13')
 
 build() {
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
new file mode 100644
index 000000000..41394e64e
--- /dev/null
+++ b/extra/x2goclient/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 175060 2013-01-12 11:27:38Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Gerhard Brauer <gerbra@archlinux.de>
+# Contributor: Richard Murri <admin@richardmurri.com>
+
+pkgname=x2goclient
+pkgver=4.0.0.1
+pkgrel=1
+pkgdesc="x2go qt4 client"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.x2go.org"
+depends=('qt' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('man2html')
+install=x2goclient.install
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('e8786329cfe97652d337f71caa71f432')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i "s:qmake-qt4:qmake:g" Makefile
+  sed -i "s:-o root -g root ::" Makefile
+  make PREFIX=/usr
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+}
diff --git a/extra/x2goclient/x2goclient.install b/extra/x2goclient/x2goclient.install
new file mode 100644
index 000000000..51c21a337
--- /dev/null
+++ b/extra/x2goclient/x2goclient.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor
+}
+
+post_upgrade() {
+  xdg-icon-resource forceupdate --theme hicolor
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate --theme hicolor
+}
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
new file mode 100644
index 000000000..fa620c2cf
--- /dev/null
+++ b/extra/x2goserver/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id: PKGBUILD 175061 2013-01-12 11:27:40Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+# Contributor: Gerhard Brauer <gerbra@archlinux.de>
+# Contributor: Richard Murri <admin@richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <knizek@volny.cz>
+
+pkgname=x2goserver
+pkgver=4.0.0.0
+pkgrel=2
+pkgdesc="Open source terminal server"
+arch=('i686' 'x86_64')
+url="http://www.x2go.org/"
+license=('GPL')
+depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth')
+makedepends=('man2html')
+#optdepends=('cups-x2go: printing support')
+options=('emptydirs')
+install=x2goserver.install
+backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service)
+md5sums=('1fc38566832c30897c6583e7ffa1fda3'
+         'b09799f9203150dc1277a56058be48a8')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # -r option does not exist in Arch linux
+  # (However, html man pages do not get installed anyway...)
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
+    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
+  done
+
+  # fix some Makefile permission options
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i "s:-o root -g root ::g" $Makefile
+  done
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make PREFIX=/usr DESTDIR="$pkgdir" install
+
+  # systemd service file - only runs x2gocleansessions
+  install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  
+  # X2go homedir + printing spool dir
+  install -dm 755 $pkgdir/var/lib/x2go
+  install -dm 755 $pkgdir/var/spool/x2go
+  
+  # load fuse module at system start
+  install -dm755 $pkgdir/usr/lib/modprobe.d
+  echo "fuse" > $pkgdir/usr/lib/modprobe.d/x2goserver.conf
+
+  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
+  install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN"
+  
+  # cleanup unneded files/directories
+  rmdir $pkgdir/etc/X11/Xsession.d
+  rm -f $pkgdir/etc/x2go/Xresources
+}
diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install
new file mode 100644
index 000000000..0688960cc
--- /dev/null
+++ b/extra/x2goserver/x2goserver.install
@@ -0,0 +1,61 @@
+pre_install() {
+  cat << 'EOM'
+  ==> Use the following command to setup sqlite database:
+  ==> x2godbadmin --createdb
+EOM
+}
+
+
+post_install() {
+
+  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
+
+  # x2gouser
+  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
+    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
+  else
+    groupadd -g 111 x2gouser &> /dev/null
+  fi
+
+  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
+    usermod -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
+  else
+    useradd -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
+  fi 
+
+  # x2goprint
+  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
+    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
+  else
+    groupadd -g 112 x2goprint &> /dev/null
+  fi
+
+  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
+    usermod -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
+  else
+    useradd -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
+  fi
+  
+  # fix permissions - see INSTALL file
+  chown -R x2goprint:x2goprint /var/spool/x2go
+  chmod 0770 /var/spool/x2go
+  
+  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
+  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
+  
+  chown root:x2goprint /usr/bin/x2goprint
+  chmod 2755 /usr/bin/x2goprint
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+    userdel x2gouser &> /dev/null
+    userdel x2goprint &> /dev/null
+    groupdel x2gouser &> /dev/null || /bin/true
+    groupdel x2goprint &> /dev/null || /bin/true
+    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
+    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
+}
diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service
new file mode 100644
index 000000000..393d841c5
--- /dev/null
+++ b/extra/x2goserver/x2goserver.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=x2go - remote desktop server
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/x2gocleansessions
+PIDFile=/run/x2goserver.pid
+
+[Install]
+WantedBy=multi-user.target