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

« back to all changes in this revision

Viewing changes to align.py

  • 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
* 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:
205
205
 
206
206
                elif align_type == ALIGN_TYPE_LIDIL_DJ_D1600:
207
207
                    maint.AlignType14(d, tui.load_paper_prompt, type10and11and14Align, invalidPen2)
208
 
                
 
208
 
209
209
                elif align_type == ALIGN_TYPE_LEDM:
210
210
                    maint.AlignType15(d, tui.load_paper_prompt, aioUI2)
211
211
 
212
212
                elif align_type == ALIGN_TYPE_LEDM_MANUAL:
213
213
                    maint.AlignType16(d, tui.load_paper_prompt, enterAlignmentNumber)
214
214
 
 
215
                elif align_type == ALIGN_TYPE_LEDM_FF_CC_0:
 
216
                    maint.AlignType17(d, tui.load_paper_prompt, aioUI2)
 
217
 
215
218
                else:
216
219
                    log.error("Invalid alignment type.")
217
220