← Back to branch summary

~ubuntu-branches/ubuntu/saucy/hplip/saucy-proposed

« 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-05-26 11:20:39 UTC
  • mfrom: (1.5.6) (31.1.3 precise)
  • Revision ID: package-import@ubuntu.com-20120526112039-bevxczegxnbyr5m7
Tags: 3.12.4-1
http://bugs.debian.org/667828
http://bugs.debian.org/583273
http://bugs.debian.org/666544
* New upstream release
* Switch to source/format 3.0 (quilt) - drop dpatch
* Refreshed debian/patches
* dh_autoreconf debian/autogen.sh & set local-options single-debian-patch
* Update to debian/compat -> 9
* Fix "hardened build flags" patch from Moritz - thanks (Closes: #667828)
* Fix "duplex descriptor uninitialized" patch from Matej (Closes: #583273)
* Fix "please migrate to kde-runtime" patch from Pino (Closes: #666544)

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
Index: hplip-3.12.4/base/utils.py
 
9
===================================================================
 
10
--- hplip-3.12.4.orig/base/utils.py     2012-05-26 10:21:29.000000000 +1000
 
11
+++ hplip-3.12.4/base/utils.py  2012-05-26 10:23:49.000000000 +1000
 
12
@@ -480,18 +480,21 @@
12
13
 
13
14
         # Scan
14
15
         self.cmd_scan = ''
37
38
 
38
39
         # Photo Card
39
40
         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 @@
 
41
Index: hplip-3.12.4/ui4/ui_utils.py
 
42
===================================================================
 
43
--- hplip-3.12.4.orig/ui4/ui_utils.py   2012-04-10 18:33:09.000000000 +1000
 
44
+++ hplip-3.12.4/ui4/ui_utils.py        2012-05-26 10:21:29.000000000 +1000
 
45
@@ -141,7 +141,7 @@
44
46
 
45
47
 
46
48
     def loadDefaults(self):