Merge lp:~ajuanpi/inkscape/jitternodes into lp:~inkscape.dev/inkscape/trunk

Proposed by jazzynico on 2016-05-24
Status: Merged
Merged at revision: 14912
Proposed branch: lp:~ajuanpi/inkscape/jitternodes
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 374 lines (+346/-0) (has conflicts)
1 file modified
share/extensions/Makefile.am (+346/-0)
Text conflict in share/extensions/Makefile.am
To merge this branch: bzr merge lp:~ajuanpi/inkscape/jitternodes
Reviewer Review Type Date Requested Status
jazzynico Pending
Review via email: mp+295579@code.launchpad.net
To post a comment you must log in.
jazzynico (jazzynico) wrote :

Branch merged with the patch attached to bug #1071833 (to resolve conflicts and update the translations).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/extensions/Makefile.am'
2--- share/extensions/Makefile.am 2016-01-13 18:39:25 +0000
3+++ share/extensions/Makefile.am 2016-05-24 13:25:29 +0000
4@@ -13,11 +13,179 @@
5
6 moduledir = $(datadir)/inkscape/extensions
7
8+<<<<<<< TREE
9 extension_SCRIPTS = \
10 $(wildcard $(srcdir)/*.py) \
11 $(wildcard $(srcdir)/*.pl) \
12 $(wildcard $(srcdir)/*.sh) \
13 $(wildcard $(srcdir)/*.rb)
14+=======
15+# If you remove an extension from here, either add it to EXTRA_DIST
16+# below, or remove all mention of it from po/inkscape.pot as well.
17+extensions = \
18+ addnodes.py \
19+ bezmisc.py \
20+ chardataeffect.py\
21+ color_blackandwhite.py\
22+ color_brighter.py\
23+ color_custom.py\
24+ color_darker.py\
25+ color_desaturate.py\
26+ coloreffect.py\
27+ color_grayscale.py\
28+ color_HSL_adjust.py\
29+ color_lesshue.py\
30+ color_lesslight.py\
31+ color_lesssaturation.py\
32+ color_morehue.py\
33+ color_morelight.py\
34+ color_moresaturation.py\
35+ color_negative.py\
36+ color_randomize.py\
37+ color_removeblue.py\
38+ color_removegreen.py\
39+ color_removered.py\
40+ color_rgbbarrel.py\
41+ color_replace.py\
42+ convert2dashes.py\
43+ cspsubdiv.py \
44+ cubicsuperpath.py \
45+ dia2svg.sh \
46+ dimension.py \
47+ dm2svg.py \
48+ dots.py \
49+ draw_from_triangle.py \
50+ dxf_input.py \
51+ dxf_outlines.py \
52+ dxf_templates.py \
53+ edge3d.py \
54+ embedimage.py \
55+ embed_raster_in_svg.pl \
56+ eqtexsvg.py \
57+ export_gimp_palette.py \
58+ extractimage.py \
59+ extrude.py \
60+ ffgeom.py\
61+ fig2dev-ext.py \
62+ flatten.py \
63+ foldablebox.py \
64+ fractalize.py \
65+ funcplot.py \
66+ gears.py\
67+ gcodetools.py\
68+ generate_voronoi.py \
69+ gimp_xcf.py \
70+ grid_cartesian.py \
71+ grid_isometric.py \
72+ grid_polar.py \
73+ guides_creator.py \
74+ guillotine.py \
75+ handles.py \
76+ hpgl_output.py \
77+ ill2svg.pl \
78+ ink2canvas.py \
79+ inkex.py \
80+ Inkscape.pm \
81+ inkscape_follow_link.py \
82+ inkwebeffect.py \
83+ interp.py \
84+ interp_att_g.py \
85+ jessyInk_autoTexts.py \
86+ jessyInk_effects.py \
87+ jessyInk_export.py \
88+ jessyInk_install.py \
89+ jessyInk_keyBindings.py \
90+ jessyInk_masterSlide.py \
91+ jessyInk_mouseHandler.py \
92+ jessyInk_summary.py \
93+ jessyInk_transitions.py \
94+ jessyInk_uninstall.py \
95+ jessyInk_video.py \
96+ jessyInk_view.py \
97+ jitternodes.py \
98+ launch_webbrowser.py \
99+ layers2svgfont.py \
100+ svgfont2layers.py \
101+ layout_nup.py \
102+ layout_nup_pageframe.py \
103+ lindenmayer.py \
104+ lorem_ipsum.py \
105+ markers_strokepaint.py \
106+ measure.py \
107+ motion.py \
108+ new_glyph_layer.py \
109+ next_glyph_layer.py \
110+ previous_glyph_layer.py \
111+ outline2svg.pl \
112+ param_curves.py \
113+ pathalongpath.py\
114+ pathscatter.py\
115+ pathmodifier.py\
116+ perfectboundcover.py \
117+ perspective.py \
118+ pixelsnap.py \
119+ plt_output.py \
120+ polyhedron_3d.py \
121+ printing_marks.py \
122+ ps2dxf.sh \
123+ ps2pdf-ext.py \
124+ pturtle.py \
125+ replace_font.py \
126+ restack.py \
127+ render_barcode.py \
128+ render_barcode_datamatrix.py \
129+ render_barcode_qrcode.py \
130+ render_alphabetsoup.py \
131+ render_alphabetsoup_config.py \
132+ rtree.py \
133+ rubberstretch.py\
134+ run_command.py \
135+ scour.py \
136+ scour.inkscape.py \
137+ setup_typography_canvas.py \
138+ simplepath.py \
139+ simplepath.rb \
140+ simplestyle.py \
141+ simpletransform.py \
142+ sk1_output.py \
143+ sk2svg.sh \
144+ SpSVG.pm \
145+ spirograph.py\
146+ split.py \
147+ straightseg.py \
148+ summersnight.py \
149+ svgcalendar.py \
150+ svg_regex.py \
151+ svg_and_media_zip_output.py \
152+ synfig_fileformat.py \
153+ synfig_output.py \
154+ synfig_prepare.py \
155+ text_extract.py \
156+ svg_transform.py \
157+ text_uppercase.py \
158+ text_lowercase.py \
159+ text_sentencecase.py \
160+ text_titlecase.py \
161+ text_flipcase.py \
162+ text_randomcase.py \
163+ text_braille.py \
164+ triangle.py \
165+ txt2svg.pl \
166+ uniconv-ext.py \
167+ uniconv_output.py \
168+ voronoi.py \
169+ voronoi2svg.py \
170+ webslicer_create_group.py \
171+ webslicer_create_rect.py \
172+ webslicer_effect.py \
173+ webslicer_export.py \
174+ web-set-att.py \
175+ web-transmit-att.py \
176+ whirl.py \
177+ wireframe_sphere.py \
178+ wmf_output.py \
179+ yocto_css.py
180+>>>>>>> MERGE-SOURCE
181
182 otherstuff_DATA = \
183 fontfix.conf \
184@@ -31,10 +199,188 @@
185 seamless_pattern.svg \
186 svg2fxg.xsl \
187 svg2xaml.xsl \
188+<<<<<<< TREE
189 xaml2svg.xsl \
190 inkscape.extension.rng
191
192 module_DATA = $(wildcard $(srcdir)/*.inx)
193+=======
194+ xaml2svg.xsl
195+
196+modules = \
197+ addnodes.inx \
198+ ai_input.inx \
199+ aisvg.inx \
200+ ccx_input.inx \
201+ cdr_input.inx\
202+ cdt_input.inx \
203+ cgm_input.inx \
204+ cmx_input.inx \
205+ color_blackandwhite.inx\
206+ color_brighter.inx\
207+ color_custom.inx \
208+ color_darker.inx\
209+ color_desaturate.inx\
210+ color_grayscale.inx\
211+ color_HSL_adjust.inx\
212+ color_lesshue.inx\
213+ color_lesslight.inx\
214+ color_lesssaturation.inx\
215+ color_morehue.inx\
216+ color_morelight.inx\
217+ color_moresaturation.inx\
218+ color_negative.inx\
219+ color_randomize.inx\
220+ color_removeblue.inx\
221+ color_removegreen.inx\
222+ color_removered.inx\
223+ color_rgbbarrel.inx\
224+ color_replace.inx\
225+ convert2dashes.inx\
226+ dhw_input.inx \
227+ dia.inx \
228+ dimension.inx \
229+ dots.inx \
230+ draw_from_triangle.inx \
231+ dxf_input.inx \
232+ dxf_outlines.inx \
233+ dxf_output.inx \
234+ edge3d.inx \
235+ embedimage.inx \
236+ embedselectedimages.inx \
237+ eps_input.inx \
238+ eqtexsvg.inx \
239+ export_gimp_palette.inx \
240+ extractimage.inx \
241+ extrude.inx \
242+ fig_input.inx \
243+ flatten.inx \
244+ foldablebox.inx \
245+ fractalize.inx \
246+ funcplot.inx \
247+ gears.inx\
248+ gcodetools_about.inx\
249+ gcodetools_area.inx\
250+ gcodetools_check_for_updates.inx\
251+ gcodetools_dxf_points.inx\
252+ gcodetools_engraving.inx\
253+ gcodetools_graffiti.inx\
254+ gcodetools_lathe.inx\
255+ gcodetools_orientation_points.inx\
256+ gcodetools_path_to_gcode.inx\
257+ gcodetools_prepare_path_for_plasma.inx\
258+ gcodetools_tools_library.inx\
259+ generate_voronoi.inx \
260+ gimp_xcf.inx \
261+ grid_cartesian.inx \
262+ grid_isometric.inx \
263+ grid_polar.inx \
264+ guides_creator.inx \
265+ guillotine.inx \
266+ handles.inx \
267+ hpgl_output.inx \
268+ ink2canvas.inx \
269+ inkscape_follow_link.inx \
270+ inkscape_help_askaquestion.inx \
271+ inkscape_help_commandline.inx \
272+ inkscape_help_faq.inx\
273+ inkscape_help_manual.inx \
274+ inkscape_help_relnotes.inx \
275+ inkscape_help_reportabug.inx \
276+ inkscape_help_svgspec.inx \
277+ inkscape_help_keys.inx \
278+ interp.inx \
279+ interp_att_g.inx \
280+ jessyInk_autoTexts.inx \
281+ jessyInk_effects.inx \
282+ jessyInk_export.inx \
283+ jessyInk_install.inx \
284+ jessyInk_keyBindings.inx \
285+ jessyInk_masterSlide.inx \
286+ jessyInk_mouseHandler.inx \
287+ jessyInk_summary.inx \
288+ jessyInk_transitions.inx \
289+ jessyInk_uninstall.inx \
290+ jessyInk_video.inx \
291+ jessyInk_view.inx \
292+ jitternodes.inx \
293+ layers2svgfont.inx \
294+ svgfont2layers.inx \
295+ layout_nup.inx \
296+ lindenmayer.inx \
297+ lorem_ipsum.inx \
298+ markers_strokepaint.inx \
299+ measure.inx \
300+ motion.inx \
301+ new_glyph_layer.inx \
302+ next_glyph_layer.inx \
303+ previous_glyph_layer.inx \
304+ outline2svg.inx \
305+ param_curves.inx \
306+ pathalongpath.inx\
307+ pathscatter.inx\
308+ perfectboundcover.inx \
309+ perspective.inx \
310+ pixelsnap.inx \
311+ plt_input.inx \
312+ plt_output.inx \
313+ polyhedron_3d.inx \
314+ printing_marks.inx \
315+ ps_input.inx \
316+ render_barcode.inx \
317+ render_barcode_datamatrix.inx \
318+ render_barcode_qrcode.inx \
319+ render_alphabetsoup.inx \
320+ replace_font.inx \
321+ restack.inx \
322+ rubberstretch.inx \
323+ rtree.inx \
324+ scour.inx \
325+ setup_typography_canvas.inx \
326+ sk_input.inx \
327+ sk1_input.inx \
328+ sk1_output.inx \
329+ spirograph.inx \
330+ split.inx \
331+ straightseg.inx \
332+ summersnight.inx \
333+ svg2fxg.inx \
334+ svg2xaml.inx \
335+ svg_and_media_zip_output.inx \
336+ svgcalendar.inx \
337+ synfig_output.inx \
338+ text_extract.inx \
339+ text_uppercase.inx\
340+ text_lowercase.inx \
341+ text_sentencecase.inx \
342+ text_titlecase.inx \
343+ text_flipcase.inx \
344+ text_randomcase.inx \
345+ text_braille.inx \
346+ triangle.inx \
347+ txt2svg.inx \
348+ voronoi2svg.inx \
349+ webslicer_create_group.inx \
350+ webslicer_create_rect.inx \
351+ webslicer_export.inx \
352+ web-set-att.inx \
353+ web-transmit-att.inx \
354+ whirl.inx \
355+ wireframe_sphere.inx \
356+ wmf_input.inx \
357+ wmf_output.inx \
358+ xaml2svg.inx
359+
360+
361+extension_SCRIPTS = \
362+ $(extensions)
363+
364+otherstuff_DATA = \
365+ $(otherstuff)
366+
367+module_DATA = \
368+ $(modules)
369+>>>>>>> MERGE-SOURCE
370
371 EXTRA_DIST = \
372 $(extension_SCRIPTS) $(otherstuff_DATA) $(module_DATA)
373
374=== modified file 'share/extensions/jitternodes.py'