summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiago Salem Herrmann <salem@mandriva.com.br>2008-03-17 16:33:21 +0000
committerTiago Salem Herrmann <salem@mandriva.com.br>2008-03-17 16:33:21 +0000
commit36bf560ca6aa998bc9bec69edc240908266d8c68 (patch)
tree1f9c67182a0e3a7c1af6ed6b9224d76b0dca76d6
parent107f25bb81746a4ee9ed13f5f6c1ba712a2e14b6 (diff)
downloaddrakx-36bf560ca6aa998bc9bec69edc240908266d8c68.tar
drakx-36bf560ca6aa998bc9bec69edc240908266d8c68.tar.gz
drakx-36bf560ca6aa998bc9bec69edc240908266d8c68.tar.bz2
drakx-36bf560ca6aa998bc9bec69edc240908266d8c68.tar.xz
drakx-36bf560ca6aa998bc9bec69edc240908266d8c68.zip
- reverting changes. gurpmi2 now can handle provides
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/scannerdrake3
2 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 99e8fd522..b9368b403 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,7 +6,6 @@
Version 10.15 - 14 March 2008
- fix changing UID on forking
-- scannerdrake: use package name instead of Provides.
- create Gtk2::Notify::Queue out of Gtk2::NotificationBubble::Queue
for libnotify support in net_applet (#37509)
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index bdc51d5dc..9b2b1f800 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -55,8 +55,7 @@ Do you want to install the SANE packages?"))) {
N("Aborting Scannerdrake."));
exit 0;
}
- # should be scanner-gui instead of xsane, but gurpmi2 does not handle provides
- if (!$in->do_pkgs->install('sane-backends', 'xsane')) {
+ if (!$in->do_pkgs->install('sane-backends', 'scanner-gui')) {
$in->ask_warn(N("Error"),
N("Could not install the packages needed to set up a scanner with Scannerdrake.") . " " .
N("Scannerdrake will not be started now."));