diff options
| author | root | 2006-06-15 22:35:05 -0500 |
|---|---|---|
| committer | root | 2006-06-15 22:35:05 -0500 |
| commit | af7991841cb49c439ef53ce4ce111052cfd1c44d (patch) | |
| tree | 1421e24c9cd553e67ab7f88ee19d00ed80f2ddac | |
| parent | d06e680a36e1d9aba9b7a2dc94486b9720f412d6 (diff) | |
printer/cups/: 2006/06/15 sync stable from p4
| -rw-r--r-- | printer/cups/HISTORY | 4 | ||||
| -rwxr-xr-x | printer/cups/PRE_BUILD | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY index ef9f456875..8f85b726d1 100644 --- a/printer/cups/HISTORY +++ b/printer/cups/HISTORY @@ -1,3 +1,7 @@ +2006-04-28 Arwed v. Merkatz <v.merkatz@gmx.net> + * PRE_BUILD: replaced 'gaze depends' call with + fast_up_depends, bug #10661 + 2005-09-26 Jason Flatt <jflatt@sourcemage.org> * BUILD, PRE_BUILD: Moved the Makefile patch code to PRE_BUILD. * DETAILS, cups-1.1.23-source.tar.bz2.sig: Converted from MD5 to GPG. diff --git a/printer/cups/PRE_BUILD b/printer/cups/PRE_BUILD index 7d7085a087..b69498cb87 100755 --- a/printer/cups/PRE_BUILD +++ b/printer/cups/PRE_BUILD @@ -2,11 +2,11 @@ if [ "`gaze installed | grep gnulpr | cut -d: -f1`" = "gnulpr" ]; echo "This spell conflicts with gnulpr and will cause it and any dependants to be dispelled." if query "Would you like to see a list of affected spells? " y; then - gaze depends gnulpr + fast_up_depends gnulpr echo "gnulpr" if query "Would you like to continue casting? " y; then - for CASTED_SPELL in `gaze depends gnulpr`; do + for CASTED_SPELL in `fast_up_depends gnulpr`; do if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`" = "$CASTED_SPELL" ]; then dispel $CASTED_SPELL fi @@ -18,7 +18,7 @@ if [ "`gaze installed | grep gnulpr | cut -d: -f1`" = "gnulpr" ]; fi else if query "Would you like to continue casting? " y; then - for CASTED_SPELL in `gaze depends gnulpr`; do + for CASTED_SPELL in `fast_up_depends gnulpr`; do if [ "`gaze installed | grep $CASTED_SPELL | cut -d: -f1`" = "$CASTED_SPELL" ]; then dispel $CASTED_SPELL fi |