Merge lp:~valavanisalex/ubuntu/precise/inkscape/fix-966221 into lp:ubuntu/precise/inkscape
- Precise (12.04)
- fix-966221
- Merge into precise
Proposed by
Alex Valavanis
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 | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Didier Roche-Tolomelli | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+99633@code.launchpad.net |
Commit message
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.
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 2012-03-06 19:01:58 +0000 | |||
3 | +++ debian/changelog 2012-03-27 22:04:50 +0000 | |||
4 | @@ -1,3 +1,50 @@ | |||
5 | 1 | inkscape (0.48.3.1-1ubuntu1) precise; urgency=low | ||
6 | 2 | |||
7 | 3 | * Merge from Debian Unstable (LP: #966221). Remaining changes: | ||
8 | 4 | - debian/control: | ||
9 | 5 | + Ubuntu maintainers | ||
10 | 6 | + Build against lcms2 (LP: #885324) | ||
11 | 7 | + Drop build-dependency on specific libwpd/libwpg version. | ||
12 | 8 | + promote libgnomevfs2-extra to recommends (lp: #496223) | ||
13 | 9 | + Demote pstoedit to Suggests (universe package). | ||
14 | 10 | + Suggest transfig to allow import of xfig files (LP: #668300) | ||
15 | 11 | + Drop unnecessary python and skencil suggestions (LP: #762541) | ||
16 | 12 | + Promote python-lxml, python-numpy, python-uniconvertor to Recommends. | ||
17 | 13 | - Handle translation tasks for Ubuntu main (LP: #726850): | ||
18 | 14 | + debian/rules: Add dh_translations to binary-arch rule | ||
19 | 15 | + debian/control: Build-Depends dh-translations | ||
20 | 16 | - debian/patches/01_add_unity_quicklist_support.patch: add "New Drawing" | ||
21 | 17 | to Unity quicklist (LP: #676886) | ||
22 | 18 | |||
23 | 19 | -- Alex Valavanis <valavanisalex@gmail.com> Tue, 27 Mar 2012 20:47:17 +0100 | ||
24 | 20 | |||
25 | 21 | inkscape (0.48.3.1-1) unstable; urgency=low | ||
26 | 22 | |||
27 | 23 | * [cb1a6e2] delete 01-libwpg0.2.dpatch since proper patch appied upstream | ||
28 | 24 | * [041bdd7] delete 02-add-shebangs-and-fix-permissions.dpatch (applied | ||
29 | 25 | upstream) | ||
30 | 26 | * [518e31b] delete 03-add-missing-mimetypes.dpatch (applied upstream) | ||
31 | 27 | * [df995c3] add datamatrix patch from ubuntu (closes: #618835) | ||
32 | 28 | * [169ca97] Imported Upstream version 0.48.3.1, this handles the following | ||
33 | 29 | debian bugs: | ||
34 | 30 | - closes: #665560: inkscape: Including individual glib headers no longer | ||
35 | 31 | supported | ||
36 | 32 | - closes: #627637: JessyInk: Embedded Javascript Broken | ||
37 | 33 | - closes: #559332: inkscape: Cairo rendering broken for "use" elements | ||
38 | 34 | with scaling or a viewBox | ||
39 | 35 | - closes: #596836: clipart search spews messages in console | ||
40 | 36 | - closes: #628035: inkscape: in the pdf export dialog a wrong pdf version | ||
41 | 37 | is reported | ||
42 | 38 | - closes: #651196: French manpage has accents replaced by some garbage | ||
43 | 39 | - closes: #633150: inkscape: New upstream version 0.48.3 is available | ||
44 | 40 | * [3f6e27a] use quilt instead of dpatch for patch handling | ||
45 | 41 | * [dd10775] Acknowledge NMU, inkscape doesn't register for handling of pdf | ||
46 | 42 | and ps anymore (closes: #613752) | ||
47 | 43 | * upload sponsored by Guido Guenther <agx@debian.org> | ||
48 | 44 | Thank you very much! | ||
49 | 45 | |||
50 | 46 | -- Wolfram Quester <wolfi@sigxcpu.org> Sun, 25 Mar 2012 13:51:37 +0200 | ||
51 | 47 | |||
52 | 1 | inkscape (0.48.3.1-0ubuntu2) precise; urgency=low | 48 | inkscape (0.48.3.1-0ubuntu2) precise; urgency=low |
53 | 2 | 49 | ||
54 | 3 | * promote libgnomevfs2-extra to recommends (lp: #496223) | 50 | * promote libgnomevfs2-extra to recommends (lp: #496223) |
55 | 4 | 51 | ||
56 | === modified file 'debian/control' | |||
57 | --- debian/control 2012-03-04 23:45:24 +0000 | |||
58 | +++ debian/control 2012-03-27 22:04:50 +0000 | |||
59 | @@ -10,7 +10,6 @@ | |||
60 | 10 | automake, | 10 | automake, |
61 | 11 | debhelper (>= 7.0.0), | 11 | debhelper (>= 7.0.0), |
62 | 12 | dh-translations, | 12 | dh-translations, |
63 | 13 | dpatch, | ||
64 | 14 | intltool, | 13 | intltool, |
65 | 15 | libart-2.0-dev (>= 2.3.10), | 14 | libart-2.0-dev (>= 2.3.10), |
66 | 16 | libaspell-dev, | 15 | libaspell-dev, |
67 | @@ -37,6 +36,7 @@ | |||
68 | 37 | libxslt1-dev, | 36 | libxslt1-dev, |
69 | 38 | pkg-config, | 37 | pkg-config, |
70 | 39 | python-dev, | 38 | python-dev, |
71 | 39 | quilt, | ||
72 | 40 | zlib1g-dev | 40 | zlib1g-dev |
73 | 41 | Standards-Version: 3.8.1 | 41 | Standards-Version: 3.8.1 |
74 | 42 | 42 | ||
75 | 43 | 43 | ||
76 | === removed file 'debian/patches/00list' | |||
77 | --- debian/patches/00list 2012-02-16 10:21:27 +0000 | |||
78 | +++ debian/patches/00list 1970-01-01 00:00:00 +0000 | |||
79 | @@ -1,2 +0,0 @@ | |||
80 | 1 | 01_add_unity_quicklist_support.patch | ||
81 | 2 | fix-datamatrix-ui.dpatch | ||
82 | 3 | 0 | ||
83 | === added file 'debian/patches/01-fix-datamatrix-ui.dpatch' | |||
84 | --- debian/patches/01-fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000 | |||
85 | +++ debian/patches/01-fix-datamatrix-ui.dpatch 2012-03-27 22:04:50 +0000 | |||
86 | @@ -0,0 +1,147 @@ | |||
87 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
88 | 2 | # From: JazzyNico <nicoduf@yahoo.fr> | ||
89 | 3 | # Description: Prevent invalid input in Datamatrix extension dialog | ||
90 | 4 | # Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127 | ||
91 | 5 | # Bug: https://launchpad.net/bugs/738108 | ||
92 | 6 | # Bug-Debian: http://bugs.debian.org/618835 | ||
93 | 7 | # Bug-Ubuntu: https://launchpad.net/bugs/738108 | ||
94 | 8 | # Last-Update: 2011-06-02 | ||
95 | 9 | |||
96 | 10 | @DPATCH@ | ||
97 | 11 | diff -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 | ||
98 | 12 | --- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100 | ||
99 | 13 | +++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100 | ||
100 | 14 | @@ -4,10 +4,40 @@ | ||
101 | 15 | <id>il.datamatrix</id> | ||
102 | 16 | <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency> | ||
103 | 17 | <dependency type="executable" location="extensions">inkex.py</dependency> | ||
104 | 18 | - <param name="text" type="string" _gui-text="Text">Inkscape</param> | ||
105 | 19 | - <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param> | ||
106 | 20 | - <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param> | ||
107 | 21 | - <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param> | ||
108 | 22 | + <param name="text" type="string" _gui-text="Text:">Inkscape</param> | ||
109 | 23 | + <param name="symbol" _gui-text="Size, in unit squares:" type="enum"> | ||
110 | 24 | + <item value="sq10">10x10</item> | ||
111 | 25 | + <item value="sq12">12x12</item> | ||
112 | 26 | + <item value="sq14">14x14</item> | ||
113 | 27 | + <item value="sq16">16x16</item> | ||
114 | 28 | + <item value="sq18">18x18</item> | ||
115 | 29 | + <item value="sq20">20x20</item> | ||
116 | 30 | + <item value="sq22">22x22</item> | ||
117 | 31 | + <item value="sq24">24x24</item> | ||
118 | 32 | + <item value="sq26">26x26</item> | ||
119 | 33 | + <item value="sq32">32x32</item> | ||
120 | 34 | + <item value="sq36">36x36</item> | ||
121 | 35 | + <item value="sq40">40x40</item> | ||
122 | 36 | + <item value="sq44">44x44</item> | ||
123 | 37 | + <item value="sq48">48x48</item> | ||
124 | 38 | + <item value="sq52">52x52</item> | ||
125 | 39 | + <item value="sq64">64x64</item> | ||
126 | 40 | + <item value="sq72">72x72</item> | ||
127 | 41 | + <item value="sq80">80x80</item> | ||
128 | 42 | + <item value="sq88">88x88</item> | ||
129 | 43 | + <item value="sq96">96x96</item> | ||
130 | 44 | + <item value="sq104">104x104</item> | ||
131 | 45 | + <item value="sq120">120x120</item> | ||
132 | 46 | + <item value="sq132">132x132</item> | ||
133 | 47 | + <item value="sq144">144x144</item> | ||
134 | 48 | + <item value="rect8x18">8x18</item> | ||
135 | 49 | + <item value="rect8x32">8x32</item> | ||
136 | 50 | + <item value="rect12x26">12x26</item> | ||
137 | 51 | + <item value="rect12x36">12x36</item> | ||
138 | 52 | + <item value="rect16x36">16x36</item> | ||
139 | 53 | + <item value="rect16x48">16x48</item> | ||
140 | 54 | + </param> | ||
141 | 55 | + <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param> | ||
142 | 56 | <effect> | ||
143 | 57 | <object-type>all</object-type> | ||
144 | 58 | <effects-menu> | ||
145 | 59 | diff -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 | ||
146 | 60 | --- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100 | ||
147 | 61 | +++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100 | ||
148 | 62 | @@ -57,6 +57,39 @@ | ||
149 | 63 | import gettext | ||
150 | 64 | _ = gettext.gettext | ||
151 | 65 | |||
152 | 66 | +symbols = { | ||
153 | 67 | + 'sq10': (10, 10), | ||
154 | 68 | + 'sq12': (12, 12), | ||
155 | 69 | + 'sq14': (14, 14), | ||
156 | 70 | + 'sq16': (16, 16), | ||
157 | 71 | + 'sq18': (18, 18), | ||
158 | 72 | + 'sq20': (20, 20), | ||
159 | 73 | + 'sq22': (22, 22), | ||
160 | 74 | + 'sq24': (24, 24), | ||
161 | 75 | + 'sq26': (26, 26), | ||
162 | 76 | + 'sq32': (32, 32), | ||
163 | 77 | + 'sq36': (36, 36), | ||
164 | 78 | + 'sq40': (40, 40), | ||
165 | 79 | + 'sq44': (44, 44), | ||
166 | 80 | + 'sq48': (48, 48), | ||
167 | 81 | + 'sq52': (52, 52), | ||
168 | 82 | + 'sq64': (64, 64), | ||
169 | 83 | + 'sq72': (72, 72), | ||
170 | 84 | + 'sq80': (80, 80), | ||
171 | 85 | + 'sq88': (88, 88), | ||
172 | 86 | + 'sq96': (96, 96), | ||
173 | 87 | + 'sq104': (104, 104), | ||
174 | 88 | + 'sq120': (120, 120), | ||
175 | 89 | + 'sq132': (132, 132), | ||
176 | 90 | + 'sq144': (144, 144), | ||
177 | 91 | + 'rect8x18': (8, 18), | ||
178 | 92 | + 'rect8x32': (8, 32), | ||
179 | 93 | + 'rect12x26': (12, 26), | ||
180 | 94 | + 'rect12x36': (12, 36), | ||
181 | 95 | + 'rect16x36': (16, 36), | ||
182 | 96 | + 'rect16x48': (16, 48), | ||
183 | 97 | +} | ||
184 | 98 | + | ||
185 | 99 | #ENCODING ROUTINES =================================================== | ||
186 | 100 | # Take an input string and convert it to a sequence (or sequences) | ||
187 | 101 | # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3) | ||
188 | 102 | @@ -167,6 +200,7 @@ | ||
189 | 103 | #RETURN ERROR | ||
190 | 104 | else: | ||
191 | 105 | inkex.errormsg(_('Unrecognised DataMatrix size')) | ||
192 | 106 | + exit(0) | ||
193 | 107 | |||
194 | 108 | return None | ||
195 | 109 | |||
196 | 110 | @@ -616,6 +650,9 @@ | ||
197 | 111 | self.OptionParser.add_option("--text", | ||
198 | 112 | action="store", type="string", | ||
199 | 113 | dest="TEXT", default='Inkscape') | ||
200 | 114 | + self.OptionParser.add_option("--symbol", | ||
201 | 115 | + action="store", type="string", | ||
202 | 116 | + dest="SYMBOL", default='') | ||
203 | 117 | self.OptionParser.add_option("--rows", | ||
204 | 118 | action="store", type="int", | ||
205 | 119 | dest="ROWS", default=10) | ||
206 | 120 | @@ -630,6 +667,12 @@ | ||
207 | 121 | |||
208 | 122 | so = self.options | ||
209 | 123 | |||
210 | 124 | + rows = so.ROWS | ||
211 | 125 | + cols = so.COLS | ||
212 | 126 | + if (so.SYMBOL != '' and (so.SYMBOL in symbols)): | ||
213 | 127 | + rows = symbols[so.SYMBOL][0] | ||
214 | 128 | + cols = symbols[so.SYMBOL][1] | ||
215 | 129 | + | ||
216 | 130 | if so.TEXT == '': #abort if converting blank text | ||
217 | 131 | inkex.errormsg(_('Please enter an input string')) | ||
218 | 132 | else: | ||
219 | 133 | @@ -644,11 +687,11 @@ | ||
220 | 134 | grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in | ||
221 | 135 | |||
222 | 136 | #GENERATE THE DATAMATRIX | ||
223 | 137 | - encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares | ||
224 | 138 | - render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements | ||
225 | 139 | + encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares | ||
226 | 140 | + render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements | ||
227 | 141 | |||
228 | 142 | if __name__ == '__main__': | ||
229 | 143 | e = DataMatrix() | ||
230 | 144 | e.affect() | ||
231 | 145 | |||
232 | 146 | -# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 | ||
233 | 147 | +# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 | ||
234 | 0 | 148 | ||
235 | === added file 'debian/patches/01_add_unity_quicklist_support.patch' | |||
236 | --- debian/patches/01_add_unity_quicklist_support.patch 1970-01-01 00:00:00 +0000 | |||
237 | +++ debian/patches/01_add_unity_quicklist_support.patch 2012-03-27 22:04:50 +0000 | |||
238 | @@ -0,0 +1,19 @@ | |||
239 | 1 | # Description: Add Unity static quicklist support to inkscape | ||
240 | 2 | # Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886 | ||
241 | 3 | # Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886 | ||
242 | 4 | # Author: Didier Roche <didrocks@ubuntu.com> | ||
243 | 5 | |||
244 | 6 | Index: fix-966221/inkscape.desktop.in | ||
245 | 7 | =================================================================== | ||
246 | 8 | --- fix-966221.orig/inkscape.desktop.in 2012-03-27 21:18:48.097841449 +0100 | ||
247 | 9 | +++ fix-966221/inkscape.desktop.in 2012-03-27 21:19:37.049839772 +0100 | ||
248 | 10 | @@ -12,3 +12,9 @@ | ||
249 | 11 | Terminal=false | ||
250 | 12 | StartupNotify=true | ||
251 | 13 | Icon=inkscape | ||
252 | 14 | +X-Ayatana-Desktop-Shortcuts=Drawing | ||
253 | 15 | + | ||
254 | 16 | +[Drawing Shortcut Group] | ||
255 | 17 | +_Name=New Drawing | ||
256 | 18 | +Exec=inkscape | ||
257 | 19 | +TargetEnvironment=Unity | ||
258 | 0 | 20 | ||
259 | === removed file 'debian/patches/01_add_unity_quicklist_support.patch.dpatch' | |||
260 | --- debian/patches/01_add_unity_quicklist_support.patch.dpatch 2011-06-01 18:05:51 +0000 | |||
261 | +++ debian/patches/01_add_unity_quicklist_support.patch.dpatch 1970-01-01 00:00:00 +0000 | |||
262 | @@ -1,20 +0,0 @@ | |||
263 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
264 | 2 | # Description: Add Unity static quicklist support to inkscape | ||
265 | 3 | # Forwarded: https://bugs.launchpad.net/inkscape/+bug/676886 | ||
266 | 4 | # Bug-Ubuntu: https://bugs.launchpad.net/bugs/676886 | ||
267 | 5 | # Author: Didier Roche <didrocks@ubuntu.com> | ||
268 | 6 | |||
269 | 7 | @DPATCH@ | ||
270 | 8 | diff -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 | ||
271 | 9 | --- inkscape-0.48.1~/inkscape.desktop.in 2010-07-13 05:48:40.000000000 +0200 | ||
272 | 10 | +++ inkscape-0.48.1/inkscape.desktop.in 2011-02-17 16:21:42.690388423 +0100 | ||
273 | 11 | @@ -12,3 +12,9 @@ | ||
274 | 12 | Terminal=false | ||
275 | 13 | StartupNotify=true | ||
276 | 14 | Icon=inkscape | ||
277 | 15 | +X-Ayatana-Desktop-Shortcuts=Drawing | ||
278 | 16 | + | ||
279 | 17 | +[Drawing Shortcut Group] | ||
280 | 18 | +_Name=New Drawing | ||
281 | 19 | +Exec=inkscape | ||
282 | 20 | +TargetEnvironment=Unity | ||
283 | 21 | 0 | ||
284 | === added file 'debian/patches/02-drop-pdf-ps.diff' | |||
285 | --- debian/patches/02-drop-pdf-ps.diff 1970-01-01 00:00:00 +0000 | |||
286 | +++ debian/patches/02-drop-pdf-ps.diff 2012-03-27 22:04:50 +0000 | |||
287 | @@ -0,0 +1,14 @@ | |||
288 | 1 | diff --git a/inkscape.desktop.in b/inkscape.desktop.in | ||
289 | 2 | index 5c0de64..62ce1e4 100644 | ||
290 | 3 | --- a/inkscape.desktop.in | ||
291 | 4 | +++ b/inkscape.desktop.in | ||
292 | 5 | @@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor | ||
293 | 6 | _Comment=Create and edit Scalable Vector Graphics images | ||
294 | 7 | Type=Application | ||
295 | 8 | Categories=Graphics;VectorGraphics;GTK; | ||
296 | 9 | -MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; | ||
297 | 10 | +MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-eps;application/illustrator; | ||
298 | 11 | Exec=inkscape %F | ||
299 | 12 | TryExec=inkscape | ||
300 | 13 | Terminal=false | ||
301 | 14 | |||
302 | 0 | 15 | ||
303 | === removed file 'debian/patches/fix-datamatrix-ui.dpatch' | |||
304 | --- debian/patches/fix-datamatrix-ui.dpatch 2011-07-10 11:35:30 +0000 | |||
305 | +++ debian/patches/fix-datamatrix-ui.dpatch 1970-01-01 00:00:00 +0000 | |||
306 | @@ -1,147 +0,0 @@ | |||
307 | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run | ||
308 | 2 | # From: JazzyNico <nicoduf@yahoo.fr> | ||
309 | 3 | # Description: Prevent invalid input in Datamatrix extension dialog | ||
310 | 4 | # Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/10127 | ||
311 | 5 | # Bug: https://launchpad.net/bugs/738108 | ||
312 | 6 | # Bug-Debian: http://bugs.debian.org/618835 | ||
313 | 7 | # Bug-Ubuntu: https://launchpad.net/bugs/738108 | ||
314 | 8 | # Last-Update: 2011-06-02 | ||
315 | 9 | |||
316 | 10 | @DPATCH@ | ||
317 | 11 | diff -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 | ||
318 | 12 | --- fix-791728~/share/extensions/render_barcode_datamatrix.inx 2011-06-02 09:40:37.000000000 +0100 | ||
319 | 13 | +++ fix-791728/share/extensions/render_barcode_datamatrix.inx 2011-06-02 18:05:57.251139168 +0100 | ||
320 | 14 | @@ -4,10 +4,40 @@ | ||
321 | 15 | <id>il.datamatrix</id> | ||
322 | 16 | <dependency type="executable" location="extensions">render_barcode_datamatrix.py</dependency> | ||
323 | 17 | <dependency type="executable" location="extensions">inkex.py</dependency> | ||
324 | 18 | - <param name="text" type="string" _gui-text="Text">Inkscape</param> | ||
325 | 19 | - <param name="rows" type="int" min="8" max="144" _gui-text="Rows">10</param> | ||
326 | 20 | - <param name="cols" type="int" min="10" max="144" _gui-text="Cols">10</param> | ||
327 | 21 | - <param name="size" type="int" min="1" max="1000" _gui-text="Square Size / px">4</param> | ||
328 | 22 | + <param name="text" type="string" _gui-text="Text:">Inkscape</param> | ||
329 | 23 | + <param name="symbol" _gui-text="Size, in unit squares:" type="enum"> | ||
330 | 24 | + <item value="sq10">10x10</item> | ||
331 | 25 | + <item value="sq12">12x12</item> | ||
332 | 26 | + <item value="sq14">14x14</item> | ||
333 | 27 | + <item value="sq16">16x16</item> | ||
334 | 28 | + <item value="sq18">18x18</item> | ||
335 | 29 | + <item value="sq20">20x20</item> | ||
336 | 30 | + <item value="sq22">22x22</item> | ||
337 | 31 | + <item value="sq24">24x24</item> | ||
338 | 32 | + <item value="sq26">26x26</item> | ||
339 | 33 | + <item value="sq32">32x32</item> | ||
340 | 34 | + <item value="sq36">36x36</item> | ||
341 | 35 | + <item value="sq40">40x40</item> | ||
342 | 36 | + <item value="sq44">44x44</item> | ||
343 | 37 | + <item value="sq48">48x48</item> | ||
344 | 38 | + <item value="sq52">52x52</item> | ||
345 | 39 | + <item value="sq64">64x64</item> | ||
346 | 40 | + <item value="sq72">72x72</item> | ||
347 | 41 | + <item value="sq80">80x80</item> | ||
348 | 42 | + <item value="sq88">88x88</item> | ||
349 | 43 | + <item value="sq96">96x96</item> | ||
350 | 44 | + <item value="sq104">104x104</item> | ||
351 | 45 | + <item value="sq120">120x120</item> | ||
352 | 46 | + <item value="sq132">132x132</item> | ||
353 | 47 | + <item value="sq144">144x144</item> | ||
354 | 48 | + <item value="rect8x18">8x18</item> | ||
355 | 49 | + <item value="rect8x32">8x32</item> | ||
356 | 50 | + <item value="rect12x26">12x26</item> | ||
357 | 51 | + <item value="rect12x36">12x36</item> | ||
358 | 52 | + <item value="rect16x36">16x36</item> | ||
359 | 53 | + <item value="rect16x48">16x48</item> | ||
360 | 54 | + </param> | ||
361 | 55 | + <param name="size" type="int" min="1" max="1000" _gui-text="Square Size (px):">4</param> | ||
362 | 56 | <effect> | ||
363 | 57 | <object-type>all</object-type> | ||
364 | 58 | <effects-menu> | ||
365 | 59 | diff -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 | ||
366 | 60 | --- fix-791728~/share/extensions/render_barcode_datamatrix.py 2011-06-02 09:40:37.000000000 +0100 | ||
367 | 61 | +++ fix-791728/share/extensions/render_barcode_datamatrix.py 2011-06-02 18:05:57.381139168 +0100 | ||
368 | 62 | @@ -57,6 +57,39 @@ | ||
369 | 63 | import gettext | ||
370 | 64 | _ = gettext.gettext | ||
371 | 65 | |||
372 | 66 | +symbols = { | ||
373 | 67 | + 'sq10': (10, 10), | ||
374 | 68 | + 'sq12': (12, 12), | ||
375 | 69 | + 'sq14': (14, 14), | ||
376 | 70 | + 'sq16': (16, 16), | ||
377 | 71 | + 'sq18': (18, 18), | ||
378 | 72 | + 'sq20': (20, 20), | ||
379 | 73 | + 'sq22': (22, 22), | ||
380 | 74 | + 'sq24': (24, 24), | ||
381 | 75 | + 'sq26': (26, 26), | ||
382 | 76 | + 'sq32': (32, 32), | ||
383 | 77 | + 'sq36': (36, 36), | ||
384 | 78 | + 'sq40': (40, 40), | ||
385 | 79 | + 'sq44': (44, 44), | ||
386 | 80 | + 'sq48': (48, 48), | ||
387 | 81 | + 'sq52': (52, 52), | ||
388 | 82 | + 'sq64': (64, 64), | ||
389 | 83 | + 'sq72': (72, 72), | ||
390 | 84 | + 'sq80': (80, 80), | ||
391 | 85 | + 'sq88': (88, 88), | ||
392 | 86 | + 'sq96': (96, 96), | ||
393 | 87 | + 'sq104': (104, 104), | ||
394 | 88 | + 'sq120': (120, 120), | ||
395 | 89 | + 'sq132': (132, 132), | ||
396 | 90 | + 'sq144': (144, 144), | ||
397 | 91 | + 'rect8x18': (8, 18), | ||
398 | 92 | + 'rect8x32': (8, 32), | ||
399 | 93 | + 'rect12x26': (12, 26), | ||
400 | 94 | + 'rect12x36': (12, 36), | ||
401 | 95 | + 'rect16x36': (16, 36), | ||
402 | 96 | + 'rect16x48': (16, 48), | ||
403 | 97 | +} | ||
404 | 98 | + | ||
405 | 99 | #ENCODING ROUTINES =================================================== | ||
406 | 100 | # Take an input string and convert it to a sequence (or sequences) | ||
407 | 101 | # of codewords as specified in ISO/IEC 16022:2006 (section 5.2.3) | ||
408 | 102 | @@ -167,6 +200,7 @@ | ||
409 | 103 | #RETURN ERROR | ||
410 | 104 | else: | ||
411 | 105 | inkex.errormsg(_('Unrecognised DataMatrix size')) | ||
412 | 106 | + exit(0) | ||
413 | 107 | |||
414 | 108 | return None | ||
415 | 109 | |||
416 | 110 | @@ -616,6 +650,9 @@ | ||
417 | 111 | self.OptionParser.add_option("--text", | ||
418 | 112 | action="store", type="string", | ||
419 | 113 | dest="TEXT", default='Inkscape') | ||
420 | 114 | + self.OptionParser.add_option("--symbol", | ||
421 | 115 | + action="store", type="string", | ||
422 | 116 | + dest="SYMBOL", default='') | ||
423 | 117 | self.OptionParser.add_option("--rows", | ||
424 | 118 | action="store", type="int", | ||
425 | 119 | dest="ROWS", default=10) | ||
426 | 120 | @@ -630,6 +667,12 @@ | ||
427 | 121 | |||
428 | 122 | so = self.options | ||
429 | 123 | |||
430 | 124 | + rows = so.ROWS | ||
431 | 125 | + cols = so.COLS | ||
432 | 126 | + if (so.SYMBOL != '' and (so.SYMBOL in symbols)): | ||
433 | 127 | + rows = symbols[so.SYMBOL][0] | ||
434 | 128 | + cols = symbols[so.SYMBOL][1] | ||
435 | 129 | + | ||
436 | 130 | if so.TEXT == '': #abort if converting blank text | ||
437 | 131 | inkex.errormsg(_('Please enter an input string')) | ||
438 | 132 | else: | ||
439 | 133 | @@ -644,11 +687,11 @@ | ||
440 | 134 | grp = inkex.etree.SubElement(self.current_layer, 'g', grp_attribs)#the group to put everything in | ||
441 | 135 | |||
442 | 136 | #GENERATE THE DATAMATRIX | ||
443 | 137 | - encoded = encode( so.TEXT, (so.ROWS, so.COLS) ) #get the pattern of squares | ||
444 | 138 | - render_data_matrix( encoded, so.SIZE, so.COLS*so.SIZE*1.5, grp ) # generate the SVG elements | ||
445 | 139 | + encoded = encode( so.TEXT, (rows, cols) ) #get the pattern of squares | ||
446 | 140 | + render_data_matrix( encoded, so.SIZE, cols*so.SIZE*1.5, grp ) # generate the SVG elements | ||
447 | 141 | |||
448 | 142 | if __name__ == '__main__': | ||
449 | 143 | e = DataMatrix() | ||
450 | 144 | e.affect() | ||
451 | 145 | |||
452 | 146 | -# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 encoding=utf-8 textwidth=99 | ||
453 | 147 | +# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 | ||
454 | 148 | 0 | ||
455 | === added file 'debian/patches/series' | |||
456 | --- debian/patches/series 1970-01-01 00:00:00 +0000 | |||
457 | +++ debian/patches/series 2012-03-27 22:04:50 +0000 | |||
458 | @@ -0,0 +1,3 @@ | |||
459 | 1 | 01-fix-datamatrix-ui.dpatch | ||
460 | 2 | 02-drop-pdf-ps.diff | ||
461 | 3 | 01_add_unity_quicklist_support.patch | ||
462 | 0 | 4 | ||
463 | === modified file 'debian/rules' | |||
464 | --- debian/rules 2011-05-30 17:02:03 +0000 | |||
465 | +++ debian/rules 2012-03-27 22:04:50 +0000 | |||
466 | @@ -6,8 +6,8 @@ | |||
467 | 6 | # Uncomment this to turn on verbose mode. | 6 | # Uncomment this to turn on verbose mode. |
468 | 7 | #export DH_VERBOSE=1 | 7 | #export DH_VERBOSE=1 |
469 | 8 | 8 | ||
472 | 9 | # use dpatch: | 9 | # use quilt for patches: |
473 | 10 | include /usr/share/dpatch/dpatch.make | 10 | include /usr/share/quilt/quilt.make |
474 | 11 | 11 | ||
475 | 12 | # These are used for cross-compiling and for saving the configure script | 12 | # These are used for cross-compiling and for saving the configure script |
476 | 13 | # from having to guess our platform (since we know it already) | 13 | # from having to guess our platform (since we know it already) |
477 | @@ -99,6 +99,8 @@ | |||
478 | 99 | install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape | 99 | install -D -o root -g root -m 644 $(CURDIR)/debian/inkscape.bash $(CURDIR)/debian/inkscape/etc/bash_completion.d/inkscape |
479 | 100 | chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/ | 100 | chmod a+x $(CURDIR)/debian/inkscape/usr/share/inkscape/extensions/xaml2svg/ |
480 | 101 | 101 | ||
481 | 102 | |||
482 | 103 | |||
483 | 102 | # Build architecture-independent files here. | 104 | # Build architecture-independent files here. |
484 | 103 | binary-indep: build install | 105 | binary-indep: build install |
485 | 104 | # We have nothing to do by default. | 106 | # We have nothing to do by default. |
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 ;)