← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/hp-check_debian.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/hp-check_debian.dpatch
5
5
## DP: Debian/ Ubuntu place hpaio in /etc/sane.d/dll.d/hplip, so lets check there too
6
6
 
7
7
@DPATCH@
8
 
diff -urNad hplip-2.8.12~/check.py hplip-2.8.12/check.py
9
 
--- hplip-2.8.12~/check.py      2008-12-18 07:41:18.000000000 +1100
10
 
+++ hplip-2.8.12/check.py       2009-01-22 14:01:40.000000000 +1100
11
 
@@ -693,6 +693,21 @@
12
 
                     if 'hpaio' in line:
 
8
Index: hplip-3.12.4/check.py
 
9
===================================================================
 
10
--- hplip-3.12.4.orig/check.py  2012-05-26 10:21:29.000000000 +1000
 
11
+++ hplip-3.12.4/check.py       2012-05-26 10:21:29.000000000 +1000
 
12
@@ -740,6 +740,21 @@
 
13
                     if hpaiomatched:
13
14
                         found = True
14
15
 
15
16
+               # Debian/ Ubuntu place hpaio in /etc/sane.d/dll.d/hplip, so lets check there too