Merge branch 'testing'

1 files changed, 15 insertions, 6 deletions

diff --git a/abs/extra/cups/cups.install b/abs/extra/cups/cups.install
index 47c3d9b..121eeb0 100644
--- a/abs/extra/cups/cups.install
+++ b/abs/extra/cups/cups.install
@@ -1,6 +1,6 @@
 post_install() {
     if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
     fi
  echo ">> If you use an HTTPS connection to CUPS, the first time you access"
  echo ">> the interface it may take a very long time before the site comes up."
@@ -10,17 +10,26 @@ post_install() {
 
 post_upgrade() {
     if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
     fi
-  if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
+  
+  if [ "`vercmp $2 1.6.0`" -lt 0 ]; then
     # important upgrade notice
-    echo "daemon script has been renamed to /etc/rc.d/cupsd"
-    echo "change your entry in  /etc/rc.conf"
+    echo "* avahi-daemon should now run before you start cupsd for"
+    echo "  printer Browsing support"
+    echo "* check your config with cupsd -t"
+    echo "  and fix all Browsing related settings"
+  fi
+
+  if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
+    # important upgrade notice
+    echo "> It's now safe to load usblp kernel module."
+    echo "> There's no more need to blacklist it."
   fi
 }
 
 post_remove() {
     if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+      xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
     fi
 }