summaryrefslogtreecommitdiff
path: root/extra/cups
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-18 12:59:47 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-07-18 12:59:47 -0300
commit12c074375919d2de177eb9456352866902118a03 (patch)
tree3f6b2e5baadedbc7901bf3e614fd017ca8aaee52 /extra/cups
parent598db82f25ffe3557e395a11f379de65af9e1ac1 (diff)
parentddddf9c453076a407bfdbf3e030e606f31ee2b86 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/dopewars/PKGBUILD community/virtualbox/PKGBUILD core/lvm2/PKGBUILD extra/aspell/PKGBUILD extra/gnome-python-extras/PKGBUILD extra/libproxy/PKGBUILD extra/live-media/PKGBUILD extra/ocaml/PKGBUILD extra/putty/PKGBUILD extra/python/PKGBUILD extra/ruby/PKGBUILD kde-unstable/calligra/PKGBUILD multilib-testing/lib32-mesa/PKGBUILD testing/mesa/PKGBUILD
Diffstat (limited to 'extra/cups')
-rw-r--r--extra/cups/PKGBUILD6
-rw-r--r--extra/cups/cups.install5
2 files changed, 8 insertions, 3 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index f8b644fa8..55f39eaa8 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 129509 2011-06-28 15:26:54Z andyrtr $
+# $Id: PKGBUILD 131768 2011-07-14 19:06:35Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.4.7
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
@@ -104,7 +104,7 @@ optdepends=('php: for included phpcups.so module'
# kill the sysv stuff
rm -rf ${pkgdir}/etc/rc*.d
rm -rf ${pkgdir}/etc/init.d
- install -D -m755 ../cups ${pkgdir}/etc/rc.d/cups
+ install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
index c4307912b..0b7245aa7 100644
--- a/extra/cups/cups.install
+++ b/extra/cups/cups.install
@@ -12,6 +12,11 @@ post_upgrade() {
if [ -x usr/bin/xdg-icon-resource ]; then
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
+ if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
+ # important upgrade notice
+ echo "daemon srcript has been renamed to /etc/rc.d/cupsd"
+ echo "change your entry in /etc/rc.conf"
+ fi
}
post_remove() {