Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

2 files changed, 36 insertions, 4 deletions

diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 0502b75a8..c6c9576f6 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166869 2012-09-20 09:33:33Z tpowa $
+# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64' 'mips64el')
 install='hylafax.install'
@@ -18,7 +18,8 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz
         hylafax.cron.daily 
         config.local
         faxq.service
-        hfaxd.service)
+        hfaxd.service
+        faxgetty@.service)
 
 build () {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -42,7 +43,7 @@ package () {
   # add systemd files
   install -D -m644 $srcdir/hfaxd.service $pkgdir/usr/lib/systemd/system/hfaxd.service
   install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service
-
+  install -D -m644 $srcdir/faxgetty@.service $pkgdir/usr/lib/systemd/system/faxgetty@.service
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
@@ -51,3 +52,10 @@ md5sums=('d063d45049c8fcbabefe09d662313067'
          '60f2a7e62c256ead4e9238cb31b35b90'
          '832c8e8098e2dfa56040c975b554590c'
          '38a00db6d9d765d130b2d8d3a98e5c24')
+md5sums=('d063d45049c8fcbabefe09d662313067'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '60f2a7e62c256ead4e9238cb31b35b90'
+         '832c8e8098e2dfa56040c975b554590c'
+         '38a00db6d9d765d130b2d8d3a98e5c24'
+         'fe10ea597e786fe8c09e4104fbdf16de')
diff --git a/extra/hylafax/faxgetty@.service b/extra/hylafax/faxgetty@.service
new file mode 100644
index 000000000..476715c19
--- /dev/null
+++ b/extra/hylafax/faxgetty@.service
@@ -0,0 +1,24 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=faxgetty on %I
+Documentation=man:faxgetty(8)
+After=faxq.service hfaxd.service
+
+[Service]
+ExecStart=/usr/lib/fax/faxgetty %I
+Type=simple
+Restart=always
+RestartSec=0
+KillMode=process
+
+KillSignal=SIGTERM
+
+[Install]
+WantedBy=multi-user.target
+