Ubuntu
ptouch-driver package

Merge lp:~philpem/ubuntu/utopic/ptouch-driver/fix-for-1342979 into lp:ubuntu/utopic/ptouch-driver

  1. Utopic (14.10)
  2. fix-for-1342979
  3. Merge into utopic
Proposed by Phil Pemberton
Status: Needs review
Proposed branch: lp:~philpem/ubuntu/utopic/ptouch-driver/fix-for-1342979
Merge into: lp:ubuntu/utopic/ptouch-driver
Diff against target: 40 lines (+9/-2)
3 files modified
debian/changelog (+7/-0)
debian/patches/send-esc-i-A-for-QL-only.patch (+1/-1)
rastertoptch.c (+1/-1)
To merge this branch: bzr merge lp:~philpem/ubuntu/utopic/ptouch-driver/fix-for-1342979
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Information
Till Kamppeter Pending
Review via email: mp+255170@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks for the work there, it seems that the change in vivid included more work that this merge request, is that still something that you would like to see SRUed as it is there? Or does it need to be updated?

review: Needs Information
Reply

Unmerged revisions

11. By Phil Pemberton

Fix the "ESC i A" (enable cutter) command patch to correctly send only on
printers which support it. (LP: #1342979)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-06 16:23:54 +0000
3+++ debian/changelog 2015-04-03 21:03:26 +0000
4@@ -1,3 +1,10 @@
5+ptouch-driver (1.3-8ubuntu1) unstable; urgency=medium
6+
7+ * Fix the "ESC i A" (enable cutter) command patch to correctly send only on
8+ printers which support it. (LP: #1342979)
9+
10+ -- Philip Pemberton <philpem@philpem.me.uk> Fri, 03 Apr 2015 09:49:33 +0100
11+
12 ptouch-driver (1.3-8) unstable; urgency=medium
13
14 [ Philip Pemberton ]
15
16=== modified file 'debian/patches/send-esc-i-A-for-QL-only.patch'
17--- debian/patches/send-esc-i-A-for-QL-only.patch 2014-03-06 16:23:54 +0000
18+++ debian/patches/send-esc-i-A-for-QL-only.patch 2015-04-03 21:03:26 +0000
19@@ -40,7 +40,7 @@
20 cut_media == CUPS_CUT_PAGE,
21 - mirror == CUPS_TRUE);
22 + mirror == CUPS_TRUE,
23-+ job_options->pixel_xfer == ULP);
24++ job_options->pixel_xfer);
25 /* Set media and quality if label preamble is requested */
26 unsigned page_size_y = new_page_options->page_size [1];
27 unsigned image_height_px = lrint (page_size_y * vres / 72.0);
28
29=== modified file 'rastertoptch.c'
30--- rastertoptch.c 2014-03-06 16:23:54 +0000
31+++ rastertoptch.c 2015-04-03 21:03:26 +0000
32@@ -816,7 +816,7 @@
33 emit_feed_cut_mirror (perform_feed == CUPS_ADVANCE_PAGE, feed,
34 cut_media == CUPS_CUT_PAGE,
35 mirror == CUPS_TRUE,
36- job_options->pixel_xfer == ULP);
37+ job_options->pixel_xfer);
38 /* Set media and quality if label preamble is requested */
39 unsigned page_size_y = new_page_options->page_size [1];
40 unsigned image_height_px = lrint (page_size_y * vres / 72.0);

Subscribers

People subscribed via source and target branches