[arch-commits] Commit in apcupsd/repos (14 files)

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon May 13 10:17:50 EDT 2013


    Date: Monday, May 13, 2013 @ 16:17:50
  Author: spupykin
Revision: 90645

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

Added:
  apcupsd/repos/community-i686/PKGBUILD
    (from rev 90644, apcupsd/trunk/PKGBUILD)
  apcupsd/repos/community-i686/apcupsd-tmpfiles.conf
    (from rev 90644, apcupsd/trunk/apcupsd-tmpfiles.conf)
  apcupsd/repos/community-i686/apcupsd.service
    (from rev 90644, apcupsd/trunk/apcupsd.service)
  apcupsd/repos/community-x86_64/PKGBUILD
    (from rev 90644, apcupsd/trunk/PKGBUILD)
  apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf
    (from rev 90644, apcupsd/trunk/apcupsd-tmpfiles.conf)
  apcupsd/repos/community-x86_64/apcupsd.service
    (from rev 90644, apcupsd/trunk/apcupsd.service)
Deleted:
  apcupsd/repos/community-i686/PKGBUILD
  apcupsd/repos/community-i686/apcupsd
  apcupsd/repos/community-i686/apcupsd-tmpfiles.conf
  apcupsd/repos/community-i686/apcupsd.service
  apcupsd/repos/community-x86_64/PKGBUILD
  apcupsd/repos/community-x86_64/apcupsd
  apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf
  apcupsd/repos/community-x86_64/apcupsd.service

----------------------------------------+
 /PKGBUILD                              |   98 +++++++++++++++++++++++++++++++
 /apcupsd-tmpfiles.conf                 |    4 +
 /apcupsd.service                       |   16 +++++
 community-i686/PKGBUILD                |   48 ---------------
 community-i686/apcupsd                 |   39 ------------
 community-i686/apcupsd-tmpfiles.conf   |    2 
 community-i686/apcupsd.service         |    8 --
 community-x86_64/PKGBUILD              |   48 ---------------
 community-x86_64/apcupsd               |   39 ------------
 community-x86_64/apcupsd-tmpfiles.conf |    2 
 community-x86_64/apcupsd.service       |    8 --
 11 files changed, 118 insertions(+), 194 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-i686/PKGBUILD	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Todd Musall <tmusall at comcast.net>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=apcupsd
-pkgver=3.14.10
-pkgrel=3
-pkgdesc="Power mangement and controlling most of APC's UPS models"
-arch=(i686 x86_64)
-url="http://www.apcupsd.org"
-license=('GPL')
-depends=('gcc-libs')
-optdepends=('gd: for CGI'
-            'gconf: for frontend'
-            'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
-backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
-        etc/apcupsd/multimon.conf)
-source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
-        apcupsd
-        apcupsd.service
-        apcupsd-tmpfiles.conf)
-sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
-            'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
-            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
-            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
-		--enable-cgi --enable-usb --enable-net \
-		--with-upstype=usb --with-upscable=usb \
-		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-		--enable-pthreads --enable-gapcmon
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd"
-	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
-	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
-	chmod 755 "$pkgdir"/sbin/*
-	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
-	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
-}
\ No newline at end of file

Copied: apcupsd/repos/community-i686/PKGBUILD (from rev 90644, apcupsd/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-13 14:17:50 UTC (rev 90645)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Todd Musall <tmusall at comcast.net>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=apcupsd
+pkgver=3.14.10
+pkgrel=4
+pkgdesc="Power mangement and controlling most of APC's UPS models"
+arch=(i686 x86_64)
+url="http://www.apcupsd.org"
+license=('GPL')
+depends=('gcc-libs')
+optdepends=('gd: for CGI'
+            'gconf: for frontend'
+            'gtk2: for frontend')
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat')
+backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
+        etc/apcupsd/multimon.conf)
+source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
+        apcupsd.service
+        apcupsd-tmpfiles.conf)
+sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
+            'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
+            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
+            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
+		--enable-cgi --enable-usb --enable-net \
+		--with-upstype=usb --with-upscable=usb \
+		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+		--enable-pthreads --enable-gapcmon
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
+	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
+	chmod 755 "$pkgdir"/sbin/*
+	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
+	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
+}
\ No newline at end of file

Deleted: community-i686/apcupsd
===================================================================
--- community-i686/apcupsd	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-i686/apcupsd	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/apcupsd`
-case "$1" in
-  start)
-    stat_busy "Starting APCUPSD Daemon"
-    [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping APCUPSD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  status)
-    /sbin/apcaccess status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-exit 0

Deleted: community-i686/apcupsd-tmpfiles.conf
===================================================================
--- community-i686/apcupsd-tmpfiles.conf	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-i686/apcupsd-tmpfiles.conf	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,2 +0,0 @@
-r /etc/apcupsd/powerfail
-r /etc/nologin
\ No newline at end of file

Copied: apcupsd/repos/community-i686/apcupsd-tmpfiles.conf (from rev 90644, apcupsd/trunk/apcupsd-tmpfiles.conf)
===================================================================
--- community-i686/apcupsd-tmpfiles.conf	                        (rev 0)
+++ community-i686/apcupsd-tmpfiles.conf	2013-05-13 14:17:50 UTC (rev 90645)
@@ -0,0 +1,2 @@
+r /etc/apcupsd/powerfail
+r /etc/nologin
\ No newline at end of file

Deleted: community-i686/apcupsd.service
===================================================================
--- community-i686/apcupsd.service	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-i686/apcupsd.service	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,8 +0,0 @@
-[Unit]
-Description=APC UPS Monitor
-
-[Service]
-ExecStart=/sbin/apcupsd -b
-
-[Install]
-WantedBy=multi-user.target

Copied: apcupsd/repos/community-i686/apcupsd.service (from rev 90644, apcupsd/trunk/apcupsd.service)
===================================================================
--- community-i686/apcupsd.service	                        (rev 0)
+++ community-i686/apcupsd.service	2013-05-13 14:17:50 UTC (rev 90645)
@@ -0,0 +1,8 @@
+[Unit]
+Description=APC UPS Monitor
+
+[Service]
+ExecStart=/sbin/apcupsd -b
+
+[Install]
+WantedBy=multi-user.target

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-x86_64/PKGBUILD	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer: Todd Musall <tmusall at comcast.net>
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-
-pkgname=apcupsd
-pkgver=3.14.10
-pkgrel=3
-pkgdesc="Power mangement and controlling most of APC's UPS models"
-arch=(i686 x86_64)
-url="http://www.apcupsd.org"
-license=('GPL')
-depends=('gcc-libs')
-optdepends=('gd: for CGI'
-            'gconf: for frontend'
-            'gtk2: for frontend')
-makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2')
-backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
-        etc/apcupsd/multimon.conf)
-source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
-        apcupsd
-        apcupsd.service
-        apcupsd-tmpfiles.conf)
-sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
-            'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
-            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
-            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
-		--enable-cgi --enable-usb --enable-net \
-		--with-upstype=usb --with-upscable=usb \
-		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
-		--enable-pthreads --enable-gapcmon
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd"
-	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
-	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
-	chmod 755 "$pkgdir"/sbin/*
-	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
-	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
-}
\ No newline at end of file

Copied: apcupsd/repos/community-x86_64/PKGBUILD (from rev 90644, apcupsd/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-13 14:17:50 UTC (rev 90645)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Todd Musall <tmusall at comcast.net>
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+
+pkgname=apcupsd
+pkgver=3.14.10
+pkgrel=4
+pkgdesc="Power mangement and controlling most of APC's UPS models"
+arch=(i686 x86_64)
+url="http://www.apcupsd.org"
+license=('GPL')
+depends=('gcc-libs')
+optdepends=('gd: for CGI'
+            'gconf: for frontend'
+            'gtk2: for frontend')
+makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat')
+backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf
+        etc/apcupsd/multimon.conf)
+source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz
+        apcupsd.service
+        apcupsd-tmpfiles.conf)
+sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
+            'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a'
+            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
+            'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d'
+            'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
+		--enable-cgi --enable-usb --enable-net \
+		--with-upstype=usb --with-upscable=usb \
+		--with-serial-dev=/dev/usb/hid/hiddev[0-9] \
+		--enable-pthreads --enable-gapcmon
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service"
+	install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf"
+	chmod 755 "$pkgdir"/sbin/*
+	install -dm755 "$pkgdir/usr/lib/$pkgname/cgi-bin"
+	mv "$pkgdir"/etc/apcupsd/*.cgi "$pkgdir/usr/lib/$pkgname/cgi-bin"
+}
\ No newline at end of file

Deleted: community-x86_64/apcupsd
===================================================================
--- community-x86_64/apcupsd	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-x86_64/apcupsd	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /sbin/apcupsd`
-case "$1" in
-  start)
-    stat_busy "Starting APCUPSD Daemon"
-    [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping APCUPSD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon apcupsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  status)
-    /sbin/apcaccess status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-exit 0

Deleted: community-x86_64/apcupsd-tmpfiles.conf
===================================================================
--- community-x86_64/apcupsd-tmpfiles.conf	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-x86_64/apcupsd-tmpfiles.conf	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,2 +0,0 @@
-r /etc/apcupsd/powerfail
-r /etc/nologin
\ No newline at end of file

Copied: apcupsd/repos/community-x86_64/apcupsd-tmpfiles.conf (from rev 90644, apcupsd/trunk/apcupsd-tmpfiles.conf)
===================================================================
--- community-x86_64/apcupsd-tmpfiles.conf	                        (rev 0)
+++ community-x86_64/apcupsd-tmpfiles.conf	2013-05-13 14:17:50 UTC (rev 90645)
@@ -0,0 +1,2 @@
+r /etc/apcupsd/powerfail
+r /etc/nologin
\ No newline at end of file

Deleted: community-x86_64/apcupsd.service
===================================================================
--- community-x86_64/apcupsd.service	2013-05-13 14:17:29 UTC (rev 90644)
+++ community-x86_64/apcupsd.service	2013-05-13 14:17:50 UTC (rev 90645)
@@ -1,8 +0,0 @@
-[Unit]
-Description=APC UPS Monitor
-
-[Service]
-ExecStart=/sbin/apcupsd -b
-
-[Install]
-WantedBy=multi-user.target

Copied: apcupsd/repos/community-x86_64/apcupsd.service (from rev 90644, apcupsd/trunk/apcupsd.service)
===================================================================
--- community-x86_64/apcupsd.service	                        (rev 0)
+++ community-x86_64/apcupsd.service	2013-05-13 14:17:50 UTC (rev 90645)
@@ -0,0 +1,8 @@
+[Unit]
+Description=APC UPS Monitor
+
+[Service]
+ExecStart=/sbin/apcupsd -b
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list