← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring

« back to all changes in this revision

Viewing changes to debian/patches/simple-scan-as-default.dpatch

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-10-06 15:03:44 UTC
  • mfrom: (1.6.1) (20.1.16 quantal)
  • Revision ID: package-import@ubuntu.com-20121006150344-2p3xz26br0t3hu2q
Tags: 3.12.10-1
http://bugs.debian.org/683033
http://bugs.debian.org/687129
* New upstream release
  - Fixes "Network scanning fails (Closes: #683033)
* quilt refresh hplip-syslog-fix-debug-messages-to-error.dpatch
* Fix "error in clean build env" updated debian/rules (Closes: #687129)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/simple-scan-as-default.dpatch
5
5
## DP: No description.
6
6
 
7
7
@DPATCH@
8
 
diff -urNad hplip-3.10.2~/base/utils.py hplip-3.10.2/base/utils.py
9
 
--- hplip-3.10.2~/base/utils.py 2010-02-25 00:07:40.000000000 +0100
10
 
+++ hplip-3.10.2/base/utils.py  2010-03-24 09:05:57.660740026 +0100
11
 
@@ -450,18 +450,21 @@
 
8
--- a/base/utils.py
 
9
+++ b/base/utils.py
 
10
@@ -504,18 +504,21 @@
12
11
 
13
12
         # Scan
14
13
         self.cmd_scan = ''
37
36
 
38
37
         # Photo Card
39
38
         path = which('hp-unload')
40
 
diff -urNad hplip-3.10.2~/ui4/ui_utils.py hplip-3.10.2/ui4/ui_utils.py
41
 
--- hplip-3.10.2~/ui4/ui_utils.py       2010-02-25 00:07:15.000000000 +0100
42
 
+++ hplip-3.10.2/ui4/ui_utils.py        2010-03-24 09:07:08.200766557 +0100
43
 
@@ -136,7 +136,7 @@
 
39
--- a/ui4/ui_utils.py
 
40
+++ b/ui4/ui_utils.py
 
41
@@ -141,7 +141,7 @@
44
42
 
45
43
 
46
44
     def loadDefaults(self):