diff -Nru rastertosag-gdi-0.1/debian/changelog rastertosag-gdi-0.1/debian/changelog --- rastertosag-gdi-0.1/debian/changelog 2015-04-09 00:30:53.000000000 +0000 +++ rastertosag-gdi-0.1/debian/changelog 2018-02-10 16:05:36.000000000 +0000 @@ -1,12 +1,17 @@ -rastertosag-gdi (0.1-4ubuntu1) vivid; urgency=medium +rastertosag-gdi (0.1-5) unstable; urgency=medium + * Bump Standards-Version to 4.1.3 without changes needed + * Update Vcs-* fields for the move to salsa.d.o + * Initialize git-dpm + + [ Till Kamppeter ] * debian/control: Depend on "${python3:Depends}" to not hardcode Python dependency and to switch to Python3 (LP: #1440554). * debian/control: Added "X-Python-Version: >= 3.0". * debian/patches/rastertosag-gdi-python3.patch: Convert Python script to Python3 (LP: #1440554). - -- Till Kamppeter Wed, 8 Apr 2015 23:31:00 -0300 + -- Didier Raboud Sat, 10 Feb 2018 17:05:36 +0100 rastertosag-gdi (0.1-4) unstable; urgency=medium diff -Nru rastertosag-gdi-0.1/debian/control rastertosag-gdi-0.1/debian/control --- rastertosag-gdi-0.1/debian/control 2015-04-09 00:20:06.000000000 +0000 +++ rastertosag-gdi-0.1/debian/control 2018-02-10 16:04:39.000000000 +0000 @@ -1,21 +1,24 @@ Source: rastertosag-gdi -Section: text -Priority: optional Maintainer: Debian Printing Team Uploaders: Didier Raboud +Section: text +Priority: optional Build-Depends: debhelper (>= 9~) +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/printing-team/rastertosag-gdi +Vcs-Git: https://salsa.debian.org/printing-team/rastertosag-gdi.git Homepage: http://www.openprinting.org/driver/rastertosag-gdi/ -Vcs-Git: https://alioth.debian.org/anonscm/git/printing/rastertosag-gdi.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=printing/rastertosag-gdi.git -Standards-Version: 3.9.2 X-Python-Version: >= 3.0 Package: printer-driver-sag-gdi Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, ghostscript -Breaks: cups (<< 1.5.0-3), rastertosag-gdi (<< 0.1-3) -Replaces: rastertosag-gdi (<< 0.1-3) +Depends: ${misc:Depends}, + ${python3:Depends}, + ghostscript Recommends: cups | foomatic-filters +Breaks: cups (<< 1.5.0-3), + rastertosag-gdi (<< 0.1-3) +Replaces: rastertosag-gdi (<< 0.1-3) Description: printer driver for Ricoh Aficio SP 1000s/SP 1100s The rastertosag-gdi driver is an open source Linux driver for the Ricoh Aficio SP 1000s/SP 1100s printers. These are some of the few Ricoh printers which do diff -Nru rastertosag-gdi-0.1/debian/.git-dpm rastertosag-gdi-0.1/debian/.git-dpm --- rastertosag-gdi-0.1/debian/.git-dpm 1970-01-01 00:00:00.000000000 +0000 +++ rastertosag-gdi-0.1/debian/.git-dpm 2018-02-10 16:03:12.000000000 +0000 @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +1a2f7443498a2826502d77e017ada2b31e0e8df3 +1a2f7443498a2826502d77e017ada2b31e0e8df3 +944f9616e6f42bbf40d130c5c865bd8a557ca756 +944f9616e6f42bbf40d130c5c865bd8a557ca756 +rastertosag-gdi_0.1.orig.tar.gz +2e103cf8460ef5955ee1ad1957ad9cec744969f4 +7573 diff -Nru rastertosag-gdi-0.1/debian/patches/0001-rastertosag-gdi-python3.patch rastertosag-gdi-0.1/debian/patches/0001-rastertosag-gdi-python3.patch --- rastertosag-gdi-0.1/debian/patches/0001-rastertosag-gdi-python3.patch 1970-01-01 00:00:00.000000000 +0000 +++ rastertosag-gdi-0.1/debian/patches/0001-rastertosag-gdi-python3.patch 2018-02-10 16:03:12.000000000 +0000 @@ -0,0 +1,100 @@ +From 1a2f7443498a2826502d77e017ada2b31e0e8df3 Mon Sep 17 00:00:00 2001 +From: Didier Raboud +Date: Sat, 10 Feb 2018 17:03:12 +0100 +Subject: rastertosag-gdi-python3 + +--- + rastertosag-gdi | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/rastertosag-gdi b/rastertosag-gdi +index 52b08d7..28f8606 100755 +--- a/rastertosag-gdi ++++ b/rastertosag-gdi +@@ -1,4 +1,4 @@ +-#!/usr/bin/python -u ++#!/usr/bin/python3 -u + #coding=utf8 + + # CUPS raster filter for Ricoh Aficio SP1000s +@@ -26,10 +26,10 @@ filename='-' + if len(sys.argv)>6: + filename=sys.argv[6] + if filename=='.' or filename=='-': +- input=sys.stdin ++ input=sys.stdin.buffer + else: +- input = open(sys.argv[6],'r') +-output = sys.stdout ++ input = open(sys.argv[6],'rb') ++output = sys.stdout.buffer + + def print_stderr(s,newline=True): + sys.stderr.write(str(s)+('\n' if newline else '')) +@@ -39,7 +39,7 @@ def print_stderr(s,newline=True): + cups = input.read() # Read all bytes from stdin + + sync_word=cups[0:4] # length of sync-word is 4 bytes: "3SaR" +-version=int(cups[0]) ++version=cups[0]-48 + cups=cups[4:] + + dtype={ +@@ -55,7 +55,7 @@ header_length={ # length of page header + } + + def make_unpack_format(format,begin,end,split_count=1): +- return '<'+(str((end-begin+1)/dtype[format]['size']/split_count)+dtype[format]['b'])*split_count ++ return '<'+(str((end-begin+1)//dtype[format]['size']//split_count)+dtype[format]['b'])*split_count + + hdr={ + 1: {}, # version 1 header +@@ -159,10 +159,10 @@ def get_cups_line(y): + line=unpack('<'+str(numbytes)+'B',page_data[y*numbytes:(y+1)*numbytes]) + ret=[] + extend=ret.extend +- for x in range(0,w/8): ++ for x in range(0,w//8): + extend(bytes[line[x]]) + if w%8: +- extend(bytes[line[w/8]][:w%8]) ++ extend(bytes[line[w//8]][:w%8]) + return ret + + FORMAT_WIDTH=0 +@@ -185,7 +185,7 @@ formats = { + def begin_document(): + output.write(pack( + '>76sbbHHI', +- ') SAG-GDI RL;0;0;Comment Copyright Sagem Communication 2005. Version 1.0.0.0', ++ b') SAG-GDI RL;0;0;Comment Copyright Sagem Communication 2005. Version 1.0.0.0', + 0x0D,0x0A, + 0x1000,0x0200, + 0 +@@ -217,7 +217,7 @@ current_block_data='' + current_line_length=0 + def begin_block(): + global current_block_data +- current_block_data='' ++ current_block_data=b'' + + def get_block_size(): + return len(current_block_data) +@@ -232,7 +232,7 @@ def write_px_data(col,length): + color = 1 if col else 0 + color_bit = color << 6 + first_byte = length%64 +- second_byte = length/64 ++ second_byte = length//64 + two_bytes_bit = 0b10000000 if second_byte else 0b00000000 + + px_data=pack('>B', two_bytes_bit | color_bit | first_byte) +@@ -257,7 +257,7 @@ def write_cups(): + w,h=min(hdr[1]['cupsWidth'],formats[format][FORMAT_WIDTH]),min(hdr[1]['cupsHeight'],formats[format][FORMAT_HEIGHT]) + t=time() + for y in range(h): +- if y%(h/15)==0: ++ if y%(h//15)==0: + print_stderr('%d%% '%(int(float(y)/h*100),),False) + + yline=get_cups_line(y) diff -Nru rastertosag-gdi-0.1/debian/patches/rastertosag-gdi-python3.patch rastertosag-gdi-0.1/debian/patches/rastertosag-gdi-python3.patch --- rastertosag-gdi-0.1/debian/patches/rastertosag-gdi-python3.patch 2015-04-09 00:22:01.000000000 +0000 +++ rastertosag-gdi-0.1/debian/patches/rastertosag-gdi-python3.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -Index: rastertosag-gdi-0.1/rastertosag-gdi -=================================================================== ---- rastertosag-gdi-0.1.orig/rastertosag-gdi -+++ rastertosag-gdi-0.1/rastertosag-gdi -@@ -1,4 +1,4 @@ --#!/usr/bin/python -u -+#!/usr/bin/python3 -u - #coding=utf8 - - # CUPS raster filter for Ricoh Aficio SP1000s -@@ -26,10 +26,10 @@ filename='-' - if len(sys.argv)>6: - filename=sys.argv[6] - if filename=='.' or filename=='-': -- input=sys.stdin -+ input=sys.stdin.buffer - else: -- input = open(sys.argv[6],'r') --output = sys.stdout -+ input = open(sys.argv[6],'rb') -+output = sys.stdout.buffer - - def print_stderr(s,newline=True): - sys.stderr.write(str(s)+('\n' if newline else '')) -@@ -39,7 +39,7 @@ def print_stderr(s,newline=True): - cups = input.read() # Read all bytes from stdin - - sync_word=cups[0:4] # length of sync-word is 4 bytes: "3SaR" --version=int(cups[0]) -+version=cups[0]-48 - cups=cups[4:] - - dtype={ -@@ -55,7 +55,7 @@ header_length={ # length of page header - } - - def make_unpack_format(format,begin,end,split_count=1): -- return '<'+(str((end-begin+1)/dtype[format]['size']/split_count)+dtype[format]['b'])*split_count -+ return '<'+(str((end-begin+1)//dtype[format]['size']//split_count)+dtype[format]['b'])*split_count - - hdr={ - 1: {}, # version 1 header -@@ -159,10 +159,10 @@ def get_cups_line(y): - line=unpack('<'+str(numbytes)+'B',page_data[y*numbytes:(y+1)*numbytes]) - ret=[] - extend=ret.extend -- for x in range(0,w/8): -+ for x in range(0,w//8): - extend(bytes[line[x]]) - if w%8: -- extend(bytes[line[w/8]][:w%8]) -+ extend(bytes[line[w//8]][:w%8]) - return ret - - FORMAT_WIDTH=0 -@@ -185,7 +185,7 @@ formats = { - def begin_document(): - output.write(pack( - '>76sbbHHI', -- ') SAG-GDI RL;0;0;Comment Copyright Sagem Communication 2005. Version 1.0.0.0', -+ b') SAG-GDI RL;0;0;Comment Copyright Sagem Communication 2005. Version 1.0.0.0', - 0x0D,0x0A, - 0x1000,0x0200, - 0 -@@ -217,7 +217,7 @@ current_block_data='' - current_line_length=0 - def begin_block(): - global current_block_data -- current_block_data='' -+ current_block_data=b'' - - def get_block_size(): - return len(current_block_data) -@@ -232,7 +232,7 @@ def write_px_data(col,length): - color = 1 if col else 0 - color_bit = color << 6 - first_byte = length%64 -- second_byte = length/64 -+ second_byte = length//64 - two_bytes_bit = 0b10000000 if second_byte else 0b00000000 - - px_data=pack('>B', two_bytes_bit | color_bit | first_byte) -@@ -257,7 +257,7 @@ def write_cups(): - w,h=min(hdr[1]['cupsWidth'],formats[format][FORMAT_WIDTH]),min(hdr[1]['cupsHeight'],formats[format][FORMAT_HEIGHT]) - t=time() - for y in range(h): -- if y%(h/15)==0: -+ if y%(h//15)==0: - print_stderr('%d%% '%(int(float(y)/h*100),),False) - - yline=get_cups_line(y) diff -Nru rastertosag-gdi-0.1/debian/patches/series rastertosag-gdi-0.1/debian/patches/series --- rastertosag-gdi-0.1/debian/patches/series 2015-04-09 00:21:22.000000000 +0000 +++ rastertosag-gdi-0.1/debian/patches/series 2018-02-10 16:04:39.000000000 +0000 @@ -1 +1 @@ -rastertosag-gdi-python3.patch +0001-rastertosag-gdi-python3.patch