Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

6 files changed, 11 insertions, 45 deletions

diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 318ef9643..623ad33b4 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -15,7 +15,7 @@ license=('GPL2')
 pkgver=1.17.6
 url="http://packages.debian.org/source/sid/dpkg"
 
-pkgrel=1
+pkgrel=2
 options=('staticlibs')
 
 if ! type in_array &>/dev/null; then
@@ -109,7 +109,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
-		--sbindir=/sbin \
+		--sbindir=/usr/bin \
 		--localstatedir=/var \
 		--with-zlib \
 		--with-liblzma \
diff --git a/libre/lirc/PKGBUILD b/libre/lirc/PKGBUILD
index 4a0f5f8f6..275d6b312 100644
--- a/libre/lirc/PKGBUILD
+++ b/libre/lirc/PKGBUILD
@@ -72,7 +72,7 @@ source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar
         ${pkgbase}.tmpfiles)
 md5sums=('1f1fac162ed309dd50f307e96a292957'
          '9ec33169b3407f74264062d7679dd269'
-         'cd00acf480e82a0bf050032732d0d733'
+         '2d68e8b7423b4f4e2fcb37f2a7ca3caf'
          '3deb02604b37811d41816e9b4385fcc3'
          '32df3b9bc859565d6acf5f0e5b747083'
          'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc/lirc-0.9.1a-fix-segfaults.patch b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
index a1f657551..0912294cc 100644
--- a/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
+++ b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
@@ -17,8 +17,9 @@ index d8ddedd..11293e2 100644
  driver          = default
  device          = /dev/lirc0
 -output          = /var/run/lirc/lircd
-+lircdfile       = /var/run/lirc/lircd
- pidfile         = /var/run/lirc/lircd.pid
++lircdfile       = /run/lirc/lircd
+-pidfile         = /var/run/lirc/lircd.pid
++pidfile         = /run/lirc/lircd.pid
  plugindir       = /usr/lib/lirc/plugins
  allow-simulate  = No
 -- 
diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD
index 3727242e8..b6dd55def 100644
--- a/libre/mcomix/PKGBUILD
+++ b/libre/mcomix/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mcomix
 pkgver=1.00
-pkgrel=6.parabola1
+pkgrel=6.parabola2
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar support"
 arch=('any')
 url="http://sourceforge.net/projects/mcomix/"
diff --git a/libre/mcomix/mcomix.install b/libre/mcomix/mcomix.install
index 82047a202..982ff97fa 100644
--- a/libre/mcomix/mcomix.install
+++ b/libre/mcomix/mcomix.install
@@ -1,8 +1,8 @@
 pkgname=mcomix
 
 post_install() {
-  if [ -f usr/sbin/gconfpkg ]; then
-      usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
+  if [ -f usr/bin/gconfpkg ]; then
+      usr/bin/gconfpkg --install ${pkgname} &> /dev/null
   fi
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-desktop-database -q
@@ -19,8 +19,8 @@ post_upgrade() {
 }
 
 pre_remove() {
-  if [ -f usr/sbin/gconfpkg ]; then
-      usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
+  if [ -f usr/bin/gconfpkg ]; then
+      usr/bin/gconfpkg --uninstall ${pkgname} &> /dev/null
   fi
 }
 
diff --git a/libre/rp-pppoe/adsl b/libre/rp-pppoe/adsl
deleted file mode 100644
index 33bd91839..000000000
--- a/libre/rp-pppoe/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0