~ubuntu-branches/ubuntu/utopic/hplip/utopic-proposed

« back to all changes in this revision

Viewing changes to debian/local/scripts/hp-plugin-ubuntu

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-01-08 20:10:45 UTC
  • mfrom: (2.1.182 precise)
  • Revision ID: package-import@ubuntu.com-20120108201045-qbh9qngh29dziyot
Tags: 3.11.12-1
* New Upstream Release 
* Fix "Please rename the hplip packages to the printer-driver-
  convention" odyx patch - thks (Closes: #649991)
* Fix "debian/control uses hardcoded list of non-Linux architectures"
  Update Build-Depends: libudev-dev [linux-any] (Closes: #634488)
* Fix "hp-scan scans entire job and then reports inability to produce
  PDFs without reportlab" Added Depends: python-reportlab (Closes: #651240)
* Fix "hplip bug report" python handling correct (Closes: #609680)

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
Password: " \
13
13
    hp-plugin -i
14
14
else
15
 
    if python -c 'import PyQt4.QtGui' 2>/dev/null; then
16
 
        gksu -D 'HP Printer Driver Plug-in Installation' -- hp-plugin -u >/dev/null 2>&1
 
15
    if python -c 'import PyQt4.QtGui' 2>/dev/null && which hp-toolbox 2>/dev/null; then
 
16
        # Do nothing if the full HPLIP GUI is installed, then HPLIP is able to
 
17
        # do the automatic plug-in installation on its own.
 
18
        #gksu -D 'HP Printer Driver Plug-in Installation' -- hp-plugin -u >/dev/null 2>&1
 
19
        exit 0
17
20
    else
18
21
        gksu -D 'HP Printer Driver Plug-in Installation' -- xterm -T 'HP Printer Driver Plug-in Installation' -sb -rightbar -hold -e hp-plugin -i >/dev/null 2>&1 &
19
22
    fi