Merge lp:~valavanisalex/ubuntu/precise/inkscape/fix-966221 into lp:ubuntu/precise/inkscape

Proposed by Alex Valavanis on 2012-03-27
Status: Merged
Merged at revision: 68
Proposed branch: lp:~valavanisalex/ubuntu/precise/inkscape/fix-966221
Merge into: lp:ubuntu/precise/inkscape
Diff against target: 485 lines (+235/-172)
10 files modified
debian/changelog (+47/-0)
debian/control (+1/-1)
debian/patches/00list (+0/-2)
debian/patches/01-fix-datamatrix-ui.dpatch (+147/-0)
debian/patches/01_add_unity_quicklist_support.patch (+19/-0)
debian/patches/01_add_unity_quicklist_support.patch.dpatch (+0/-20)
debian/patches/02-drop-pdf-ps.diff (+14/-0)
debian/patches/fix-datamatrix-ui.dpatch (+0/-147)
debian/patches/series (+3/-0)
debian/rules (+4/-2)
To merge this branch: bzr merge lp:~valavanisalex/ubuntu/precise/inkscape/fix-966221
Reviewer Review Type Date Requested Status
Didier Roche Approve on 2012-03-28
Ubuntu branches 2012-03-27 Pending
Review via email: mp+99633@code.launchpad.net

Description of the change

This merge finally brings us back a bit closer to the Debian package. It also switches to the quilt patch system instead of the now obsolete dpatch.

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Thanks a lot for your work here!
Everything looks good, just a nitpicky one please do not list again the already written bug report numbers from a previous merge (that would spam launchpad and close again the bugs). I removed it before merging.

Other than that, excellent work ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-06 19:01:58 +0000
+++ debian/changelog 2012-03-27 22:04:50 +0000
@@ -1,3 +1,50 @@
1inkscape (0.48.3.1-1ubuntu1) precise; urgency=low
2
3 * Merge from Debian Unstable (LP: #966221). Remaining changes:
4 - debian/control:
5 + Ubuntu maintainers
6 + Build against lcms2 (LP: #885324)
7 + Drop build-dependency on specific libwpd/libwpg version.
8 + promote libgnomevfs2-extra to recommends (lp: #496223)
9 + Demote pstoedit to Suggests (universe package).
10 + Suggest transfig to allow import of xfig files (LP: #668300)
11 + Drop unnecessary python and skencil suggestions (LP: #762541)
12 + Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
13 - Handle translation tasks for Ubuntu main (LP: #726850):
14 + debian/rules: Add dh_translations to binary-arch rule
15 + debian/control: Build-Depends dh-translations
16 - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing"
17 to Unity quicklist (LP: #676886)
18
19 -- Alex Valavanis <valavanisalex@gmail.com> Tue, 27 Mar 2012 20:47:17 +0100
20
21inkscape (0.48.3.1-1) unstable; urgency=low
22
23 * [cb1a6e2] delete 01-libwpg0.2.dpatch since proper patch appied upstream
24 * [041bdd7] delete 02-add-shebangs-and-fix-permissions.dpatch (applied
25 upstream)
26 * [518e31b] delete 03-add-missing-mimetypes.dpatch (applied upstream)
27 * [df995c3] add datamatrix patch from ubuntu (closes: #618835)
28 * [169ca97] Imported Upstream version 0.48.3.1, this handles the following
29 debian bugs:
30 - closes: #665560: inkscape: Including individual glib headers no longer
31 supported
32 - closes: #627637: JessyInk: Embedded Javascript Broken
33 - closes: #559332: inkscape: Cairo rendering broken for "use" elements
34 with scaling or a viewBox
35 - closes: #596836: clipart search spews messages in console
36 - closes: #628035: inkscape: in the pdf export dialog a wrong pdf version
37 is reported
38 - closes: #651196: French manpage has accents replaced by some garbage
39 - closes: #633150: inkscape: New upstream version 0.48.3 is available
40 * [3f6e27a] use quilt instead of dpatch for patch handling
41 * [dd10775] Acknowledge NMU, inkscape doesn't register for handling of pdf
42 and ps anymore (closes: #613752)
43 * upload sponsored by Guido Guenther <agx@debian.org>
44 Thank you very much!
45
46 -- Wolfram Quester <wolfi@sigxcpu.org> Sun, 25 Mar 2012 13:51:37 +0200
47
1inkscape (0.48.3.1-0ubuntu2) precise; urgency=low48inkscape (0.48.3.1-0ubuntu2) precise; urgency=low
249
3 * promote libgnomevfs2-extra to recommends (lp: #496223)50 * promote libgnomevfs2-extra to recommends (lp: #496223)
451
=== modified file 'debian/control'
--- debian/control 2012-03-04 23:45:24 +0000
+++ debian/control 2012-03-27 22:04:50 +0000
@@ -10,7 +10,6 @@
10 automake,10 automake,
11 debhelper (>= 7.0.0),11 debhelper (>= 7.0.0),
12 dh-translations,12 dh-translations,
13 dpatch,
14 intltool,13 intltool,
15 libart-2.0-dev (>= 2.3.10),14 libart-2.0-dev (>= 2.3.10),
16 libaspell-dev,15 libaspell-dev,
@@ -37,6 +36,7 @@
37 libxslt1-dev,36 libxslt1-dev,
38 pkg-config,37 pkg-config,
39 python-dev,38 python-dev,
39 quilt,
40 zlib1g-dev40 zlib1g-dev
41Standards-Version: 3.8.141Standards-Version: 3.8.1
4242
4343
=== removed file 'debian/patches/00list'
--- debian/patches/00list 2012-02-16 10:21:27 +0000
+++ debian/patches/00list 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
101_add_unity_quicklist_support.patch
2fix-datamatrix-ui.dpatch
30
=== added file 'debian/patches/01-fix-datamatrix-ui.dpatch'
--- debian/patches/01-fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000
+++ debian/patches/01-fix-datamatrix-ui.dpatch 2012-03-27 22:04:50 +0000
@@ -0,0 +1,147 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2# From: JazzyNico <nicoduf@yahoo.fr>
3# Description: Prevent invalid input in Datamatrix extension dialog
4# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127
5# Bug: https://launchpad.net/bugs/738108
6# Bug-Debian: http://bugs.debian.org/618835
7# Bug-Ubuntu: https://launchpad.net/bugs/738108
8# Last-Update: 2011-06-02
9
10@DPATCH@
11diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.inx fix-791728/share/extensions/render_barcode_datamatrix.inx
12--- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100
13+++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100
14@@ -4,10 +4,40 @@
15 <id>il.datamatrix</id>
16 <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency>
17 <dependency type="executable" location="extensions">inkex.py</dependency>
18- <param name="text" type="string" _gui-text="Text">Inkscape</param>
19- <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param>
20- <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param>
21- <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param>
22+ <param name="text" type="string" _gui-text="Text:">Inkscape</param>
23+ <param name="symbol" _gui-text="Size, in unit squares:" type="enum">
24+ <item value="sq10">10x10</item>
25+ <item value="sq12">12x12</item>
26+ <item value="sq14">14x14</item>
27+ <item value="sq16">16x16</item>
28+ <item value="sq18">18x18</item>
29+ <item value="sq20">20x20</item>
30+ <item value="sq22">22x22</item>
31+ <item value="sq24">24x24</item>
32+ <item value="sq26">26x26</item>
33+ <item value="sq32">32x32</item>
34+ <item value="sq36">36x36</item>
35+ <item value="sq40">40x40</item>
36+ <item value="sq44">44x44</item>
37+ <item value="sq48">48x48</item>
38+ <item value="sq52">52x52</item>
39+ <item value="sq64">64x64</item>
40+ <item value="sq72">72x72</item>
41+ <item value="sq80">80x80</item>
42+ <item value="sq88">88x88</item>
43+ <item value="sq96">96x96</item>
44+ <item value="sq104">104x104</item>
45+ <item value="sq120">120x120</item>
46+ <item value="sq132">132x132</item>
47+ <item value="sq144">144x144</item>
48+ <item value="rect8x18">8x18</item>
49+ <item value="rect8x32">8x32</item>
50+ <item value="rect12x26">12x26</item>
51+ <item value="rect12x36">12x36</item>
52+ <item value="rect16x36">16x36</item>
53+ <item value="rect16x48">16x48</item>
54+ </param>
55+ <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param>
56 <effect>
57 <object-type>all</object-type>
58 <effects-menu>
59diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.py fix-791728/share/extensions/render_barcode_datamatrix.py
60--- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100
61+++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100
62@@ -57,6 +57,39 @@
63 import gettext
64 _ = gettext.gettext
65
66+symbols = {
67+ 'sq10': (10, 10),
68+ 'sq12': (12, 12),
69+ 'sq14': (14, 14),
70+ 'sq16': (16, 16),
71+ 'sq18': (18, 18),
72+ 'sq20': (20, 20),
73+ 'sq22': (22, 22),
74+ 'sq24': (24, 24),
75+ 'sq26': (26, 26),
76+ 'sq32': (32, 32),
77+ 'sq36': (36, 36),
78+ 'sq40': (40, 40),
79+ 'sq44': (44, 44),
80+ 'sq48': (48, 48),
81+ 'sq52': (52, 52),
82+ 'sq64': (64, 64),
83+ 'sq72': (72, 72),
84+ 'sq80': (80, 80),
85+ 'sq88': (88, 88),
86+ 'sq96': (96, 96),
87+ 'sq104': (104, 104),
88+ 'sq120': (120, 120),
89+ 'sq132': (132, 132),
90+ 'sq144': (144, 144),
91+ 'rect8x18': (8, 18),
92+ 'rect8x32': (8, 32),
93+ 'rect12x26': (12, 26),
94+ 'rect12x36': (12, 36),
95+ 'rect16x36': (16, 36),
96+ 'rect16x48': (16, 48),
97+}
98+
99 #ENCODING ROUTINES ===================================================
100 # Take an input string and convert it to a sequence (or sequences)
101 # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3)
102@@ -167,6 +200,7 @@
103 #RETURN ERROR
104 else:
105 inkex.errormsg(_('Unrecognised DataMatrix size'))
106+ exit(0)
107
108 return None
109
110@@ -616,6 +650,9 @@
111 self.OptionParser.add_option("--text",
112 action="store", type="string",
113 dest="TEXT", default='Inkscape')
114+ self.OptionParser.add_option("--symbol",
115+ action="store", type="string",
116+ dest="SYMBOL", default='')
117 self.OptionParser.add_option("--rows",
118 action="store", type="int",
119 dest="ROWS", default=10)
120@@ -630,6 +667,12 @@
121
122 so = self.options
123
124+ rows = so.ROWS
125+ cols = so.COLS
126+ if (so.SYMBOL != '' and (so.SYMBOL in symbols)):
127+ rows = symbols[so.SYMBOL][0]
128+ cols = symbols[so.SYMBOL][1]
129+
130 if so.TEXT == '': #abort if converting blank text
131 inkex.errormsg(_('Please enter an input string'))
132 else:
133@@ -644,11 +687,11 @@
134 grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in
135
136 #GENERATE THE DATAMATRIX
137- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares
138- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements
139+ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares
140+ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements
141
142 if __name__ == '__main__':
143 e = DataMatrix()
144 e.affect()
145
146-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
147+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
0148
=== added file 'debian/patches/01_add_unity_quicklist_support.patch'
--- debian/patches/01_add_unity_quicklist_support.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/01_add_unity_quicklist_support.patch 2012-03-27 22:04:50 +0000
@@ -0,0 +1,19 @@
1# Description: Add Unity static quicklist support to inkscape
2# Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886
3# Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886
4# Author: Didier Roche <didrocks@ubuntu.com>
5
6Index: fix-966221/inkscape.desktop.in
7===================================================================
8--- fix-966221.orig/inkscape.desktop.in 2012-03-27 21:18:48.097841449 +0100
9+++ fix-966221/inkscape.desktop.in 2012-03-27 21:19:37.049839772 +0100
10@@ -12,3 +12,9 @@
11 Terminal=false
12 StartupNotify=true
13 Icon=inkscape
14+X-Ayatana-Desktop-Shortcuts=Drawing
15+
16+[Drawing Shortcut Group]
17+_Name=New Drawing
18+Exec=inkscape
19+TargetEnvironment=Unity
020
=== removed file 'debian/patches/01_add_unity_quicklist_support.patch.dpatch'
--- debian/patches/01_add_unity_quicklist_support.patch.dpatch 2011-06-01 18:05:51 +0000
+++ debian/patches/01_add_unity_quicklist_support.patch.dpatch 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2# Description: Add Unity static quicklist support to inkscape
3# Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886
4# Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886
5# Author: Didier Roche <didrocks@ubuntu.com>
6
7@DPATCH@
8diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/inkscape.desktop.in inkscape-0.48.1/inkscape.desktop.in
9--- inkscape-0.48.1~/inkscape.desktop.in 2010-07-13 05:48:40.000000000 +0200
10+++ inkscape-0.48.1/inkscape.desktop.in 2011-02-17 16:21:42.690388423 +0100
11@@ -12,3 +12,9 @@
12 Terminal=false
13 StartupNotify=true
14 Icon=inkscape
15+X-Ayatana-Desktop-Shortcuts=Drawing
16+
17+[Drawing Shortcut Group]
18+_Name=New Drawing
19+Exec=inkscape
20+TargetEnvironment=Unity
210
=== added file 'debian/patches/02-drop-pdf-ps.diff'
--- debian/patches/02-drop-pdf-ps.diff 1970-01-01 00:00:00 +0000
+++ debian/patches/02-drop-pdf-ps.diff 2012-03-27 22:04:50 +0000
@@ -0,0 +1,14 @@
1diff --git a/inkscape.desktop.in b/inkscape.desktop.in
2index 5c0de64..62ce1e4 100644
3--- a/inkscape.desktop.in
4+++ b/inkscape.desktop.in
5@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor
6 _Comment=Create and edit Scalable Vector Graphics images
7 Type=Application
8 Categories=Graphics;VectorGraphics;GTK;
9-MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
10+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-eps;application/illustrator;
11 Exec=inkscape %F
12 TryExec=inkscape
13 Terminal=false
14
015
=== removed file 'debian/patches/fix-datamatrix-ui.dpatch'
--- debian/patches/fix-datamatrix-ui.dpatch 2011-07-10 11:35:30 +0000
+++ debian/patches/fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2# From: JazzyNico <nicoduf@yahoo.fr>
3# Description: Prevent invalid input in Datamatrix extension dialog
4# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127
5# Bug: https://launchpad.net/bugs/738108
6# Bug-Debian: http://bugs.debian.org/618835
7# Bug-Ubuntu: https://launchpad.net/bugs/738108
8# Last-Update: 2011-06-02
9
10@DPATCH@
11diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.inx fix-791728/share/extensions/render_barcode_datamatrix.inx
12--- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100
13+++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100
14@@ -4,10 +4,40 @@
15 <id>il.datamatrix</id>
16 <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency>
17 <dependency type="executable" location="extensions">inkex.py</dependency>
18- <param name="text" type="string" _gui-text="Text">Inkscape</param>
19- <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param>
20- <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param>
21- <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param>
22+ <param name="text" type="string" _gui-text="Text:">Inkscape</param>
23+ <param name="symbol" _gui-text="Size, in unit squares:" type="enum">
24+ <item value="sq10">10x10</item>
25+ <item value="sq12">12x12</item>
26+ <item value="sq14">14x14</item>
27+ <item value="sq16">16x16</item>
28+ <item value="sq18">18x18</item>
29+ <item value="sq20">20x20</item>
30+ <item value="sq22">22x22</item>
31+ <item value="sq24">24x24</item>
32+ <item value="sq26">26x26</item>
33+ <item value="sq32">32x32</item>
34+ <item value="sq36">36x36</item>
35+ <item value="sq40">40x40</item>
36+ <item value="sq44">44x44</item>
37+ <item value="sq48">48x48</item>
38+ <item value="sq52">52x52</item>
39+ <item value="sq64">64x64</item>
40+ <item value="sq72">72x72</item>
41+ <item value="sq80">80x80</item>
42+ <item value="sq88">88x88</item>
43+ <item value="sq96">96x96</item>
44+ <item value="sq104">104x104</item>
45+ <item value="sq120">120x120</item>
46+ <item value="sq132">132x132</item>
47+ <item value="sq144">144x144</item>
48+ <item value="rect8x18">8x18</item>
49+ <item value="rect8x32">8x32</item>
50+ <item value="rect12x26">12x26</item>
51+ <item value="rect12x36">12x36</item>
52+ <item value="rect16x36">16x36</item>
53+ <item value="rect16x48">16x48</item>
54+ </param>
55+ <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param>
56 <effect>
57 <object-type>all</object-type>
58 <effects-menu>
59diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fix-791728~/share/extensions/render_barcode_datamatrix.py fix-791728/share/extensions/render_barcode_datamatrix.py
60--- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100
61+++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100
62@@ -57,6 +57,39 @@
63 import gettext
64 _ = gettext.gettext
65
66+symbols = {
67+ 'sq10': (10, 10),
68+ 'sq12': (12, 12),
69+ 'sq14': (14, 14),
70+ 'sq16': (16, 16),
71+ 'sq18': (18, 18),
72+ 'sq20': (20, 20),
73+ 'sq22': (22, 22),
74+ 'sq24': (24, 24),
75+ 'sq26': (26, 26),
76+ 'sq32': (32, 32),
77+ 'sq36': (36, 36),
78+ 'sq40': (40, 40),
79+ 'sq44': (44, 44),
80+ 'sq48': (48, 48),
81+ 'sq52': (52, 52),
82+ 'sq64': (64, 64),
83+ 'sq72': (72, 72),
84+ 'sq80': (80, 80),
85+ 'sq88': (88, 88),
86+ 'sq96': (96, 96),
87+ 'sq104': (104, 104),
88+ 'sq120': (120, 120),
89+ 'sq132': (132, 132),
90+ 'sq144': (144, 144),
91+ 'rect8x18': (8, 18),
92+ 'rect8x32': (8, 32),
93+ 'rect12x26': (12, 26),
94+ 'rect12x36': (12, 36),
95+ 'rect16x36': (16, 36),
96+ 'rect16x48': (16, 48),
97+}
98+
99 #ENCODING ROUTINES ===================================================
100 # Take an input string and convert it to a sequence (or sequences)
101 # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3)
102@@ -167,6 +200,7 @@
103 #RETURN ERROR
104 else:
105 inkex.errormsg(_('Unrecognised DataMatrix size'))
106+ exit(0)
107
108 return None
109
110@@ -616,6 +650,9 @@
111 self.OptionParser.add_option("--text",
112 action="store", type="string",
113 dest="TEXT", default='Inkscape')
114+ self.OptionParser.add_option("--symbol",
115+ action="store", type="string",
116+ dest="SYMBOL", default='')
117 self.OptionParser.add_option("--rows",
118 action="store", type="int",
119 dest="ROWS", default=10)
120@@ -630,6 +667,12 @@
121
122 so = self.options
123
124+ rows = so.ROWS
125+ cols = so.COLS
126+ if (so.SYMBOL != '' and (so.SYMBOL in symbols)):
127+ rows = symbols[so.SYMBOL][0]
128+ cols = symbols[so.SYMBOL][1]
129+
130 if so.TEXT == '': #abort if converting blank text
131 inkex.errormsg(_('Please enter an input string'))
132 else:
133@@ -644,11 +687,11 @@
134 grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in
135
136 #GENERATE THE DATAMATRIX
137- encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares
138- render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements
139+ encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares
140+ render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements
141
142 if __name__ == '__main__':
143 e = DataMatrix()
144 e.affect()
145
146-# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99
147+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
1480
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2012-03-27 22:04:50 +0000
@@ -0,0 +1,3 @@
101-fix-datamatrix-ui.dpatch
202-drop-pdf-ps.diff
301_add_unity_quicklist_support.patch
04
=== modified file 'debian/rules'
--- debian/rules 2011-05-30 17:02:03 +0000
+++ debian/rules 2012-03-27 22:04:50 +0000
@@ -6,8 +6,8 @@
6# Uncomment this to turn on verbose mode.6# Uncomment this to turn on verbose mode.
7#export DH_VERBOSE=17#export DH_VERBOSE=1
88
9# use dpatch:9# use quilt for patches:
10include /usr/share/dpatch/dpatch.make10include /usr/share/quilt/quilt.make
1111
12# These are used for cross-compiling and for saving the configure script12# These are used for cross-compiling and for saving the configure script
13# from having to guess our platform (since we know it already)13# from having to guess our platform (since we know it already)
@@ -99,6 +99,8 @@
99 install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape99 install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape
100 chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/100 chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/
101101
102
103
102# Build architecture-independent files here.104# Build architecture-independent files here.
103binary-indep: build install105binary-indep: build install
104# We have nothing to do by default.106# We have nothing to do by default.

Subscribers

People subscribed via source and target branches