Merge changes from trunk

(bzr r14949.1.64)

8 files changed, 2 insertions, 266 deletions

diff --git a/share/extensions/Barcode/Makefile.am b/share/extensions/Barcode/Makefile.am
deleted file mode 100644
index 08e2f58b4..000000000
--- a/share/extensions/Barcode/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-barcodedir = $(datadir)/inkscape/extensions/Barcode
-
-barcode_DATA = \
-	Base.py \
-    BaseEan.py \
-	Code128.py \
-	Code39Ext.py \
-	Code39.py \
-    Code25i.py \
-	Code93.py \
-	Ean13.py \
-	Ean8.py \
-	Ean5.py \
-	Ean2.py \
-	__init__.py \
-	Rm4scc.py \
-	Upca.py \
-	Upce.py
-
-EXTRA_DIST = \
-	$(barcode_DATA)
-
diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am
deleted file mode 100644
index f247cd8bb..000000000
--- a/share/extensions/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-
-SUBDIRS = \
-	alphabet_soup \
-	Barcode \
-	ink2canvas \
-	Poly3DObjects \
-	test \
-	xaml2svg
-
-extensiondir = $(datadir)/inkscape/extensions
-
-otherstuffdir = $(datadir)/inkscape/extensions
-
-moduledir = $(datadir)/inkscape/extensions
-
-extension_SCRIPTS = \
-	$(wildcard $(srcdir)/*.py) \
-	$(wildcard $(srcdir)/*.pl) \
-	$(wildcard $(srcdir)/*.sh) \
-	$(wildcard $(srcdir)/*.rb)
-
-otherstuff_DATA = \
-	fontfix.conf \
-	inkweb.js \
-	jessyInk.js \
-	jessyInk_core_mouseHandler_noclick.js \
-	jessyInk_core_mouseHandler_zoomControl.js \
-	aisvg.xslt \
-	colors.xml \
-	jessyInk_video.svg \
-	seamless_pattern.svg \
-	svg2fxg.xsl \
-	svg2xaml.xsl \
-	xaml2svg.xsl \
-	inkscape.extension.rng
-
-module_DATA = $(wildcard $(srcdir)/*.inx)
-
-EXTRA_DIST = \
-	$(extension_SCRIPTS) $(otherstuff_DATA) $(module_DATA)
-
-
diff --git a/share/extensions/Poly3DObjects/Makefile.am b/share/extensions/Poly3DObjects/Makefile.am
deleted file mode 100644
index 82a81af42..000000000
--- a/share/extensions/Poly3DObjects/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Poly3DObjectsdir = $(datadir)/inkscape/extensions/Poly3DObjects
-
-Poly3DObjects_DATA = \
-	cube.obj \
-	cuboct.obj \
-	dodec.obj \
-	great_dodec.obj \
-	great_rhombicosidodec.obj \
-	great_rhombicuboct.obj \
-	great_stel_dodec.obj \
-	icos.obj \
-	icosidodec.obj \
-	jessens_orthog_icos.obj \
-	methane.obj \
-	oct.obj \
-	rhomb_dodec.obj \
-	rhomb_triacont.obj \
-	rh_axes.obj \
-	small_rhombicosidodec.obj \
-	small_rhombicuboct.obj \
-	small_triam_icos.obj \
-	snub_cube.obj \
-	snub_dodec.obj \
-	szilassi.obj \
-	tet.obj \
-	trunc_cube.obj \
-	trunc_dodec.obj \
-	trunc_icos.obj \
-	trunc_oct.obj \
-	trunc_tet.obj
-
-EXTRA_DIST = $(Poly3DObjects_DATA)
diff --git a/share/extensions/alphabet_soup/Makefile.am b/share/extensions/alphabet_soup/Makefile.am
deleted file mode 100644
index 004da4e8c..000000000
--- a/share/extensions/alphabet_soup/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-
-alphabet_soupdir = $(datadir)/inkscape/extensions/alphabet_soup
-
-alphabet_soup_DATA = \
-	2.svg \
-	3.svg \
-	6.svg \
-	7.svg \
-	abase.svg \
-	a.svg \
-	acap.svg \
-	bar2.svg \
-	barcap.svg \
-	bar.svg \
-	b.svg \
-	Cblob.svg \
-	Chook.svg \
-	cross.svg \
-	cserif.svg \
-	c.svg \
-	Ctail.svg \
-	Delta.svg \
-	Eb.svg \
-	epsilon.svg \
-	Eserif.svg \
-	e.svg \
-	Et.svg \
-	f.svg \
-	gamma.svg \
-	G.svg \
-	h2.svg \
-	hcap.svg \
-	h.svg \
-	IBSerif.svg \
-	idot.svg \
-	ITSerif.svg \
-	j.svg \
-	k.svg \
-	Lb.svg \
-	lserif.svg \
-	l.svg \
-	Lt.svg \
-	mcap.svg \
-	m.svg \
-	n.svg \
-	ocap.svg \
-	Ocross.svg \
-	o.svg \
-	Oterm.svg \
-	P.svg \
-	Q.svg \
-	question.svg \
-	Rblock.svg \
-	rcap.svg \
-	r.svg \
-	serif.svg \
-	s.svg \
-	Tb.svg \
-	tserif.svg \
-	t.svg \
-	Tt.svg \
-	U.svg \
-	vcap.svg \
-	vserl.svg \
-	vserr.svg \
-	Vser.svg \
-	v.svg \
-	Xh.svg \
-	Xne.svg \
-	Xnw.svg \
-	x.svg \
-	Xvb.svg \
-	Xvt.svg \
-	yogh.svg \
-	y.svg \
-	z.svg
-
-EXTRA_DIST = $(alphabet_soup_DATA)	
diff --git a/share/extensions/ink2canvas/Makefile.am b/share/extensions/ink2canvas/Makefile.am
deleted file mode 100644
index ab6e7661d..000000000
--- a/share/extensions/ink2canvas/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-ink2canvasdir = $(datadir)/inkscape/extensions/ink2canvas
-
-ink2canvas_DATA = \
-  __init__.py \
-	canvas.py \
-  svg.py
-
-EXTRA_DIST = $(ink2canvas_DATA)
diff --git a/share/extensions/restack.inx b/share/extensions/restack.inx
index e14d2d5d5..4f5f577cb 100644
--- a/share/extensions/restack.inx
+++ b/share/extensions/restack.inx
@@ -9,7 +9,7 @@
             <_param name="desc_dir" type="description" appearance="header">Restack Direction</_param>
             <param name="nb_direction" type="notebook">
                 <page name="presets" _gui-text="Presets">
-                    <param name="direction" type="enum" gui-text="">
+                    <param name="direction" type="enum" _gui-text="">
                         <_item value="lr">Left to Right (0)</_item>
                         <_item value="bt">Bottom to Top (90)</_item>
                         <_item value="rl">Right to Left (180)</_item>
@@ -36,7 +36,7 @@
         </page>
         <page name="z_order" _gui-text="Based on Z-Order">
             <_param name="desc_zsort" type="description" appearance="header">Restack Mode</_param>
-            <param name="zsort" type="enum" gui-text="">
+            <param name="zsort" type="enum" _gui-text="">
                 <_item value="rev">Reverse Z-Order</_item>
                 <_item value="rand">Shuffle Z-Order</_item>
             </param>
diff --git a/share/extensions/test/Makefile.am b/share/extensions/test/Makefile.am
deleted file mode 100644
index cd1929a7f..000000000
--- a/share/extensions/test/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-
-# List of all tests to be run.
-#TESTS = svgcalendar.test.py
-# that is not working :-/
-
-EXTRA_DIST = \
-		addnodes.test.py \
-		chardataeffect.test.py \
-		color_randomize_test.py \
-		coloreffect.test.py \
-		create_test_from_template.sh \
-		dots.test.py \
-		draw_from_triangle.test.py \
-		dxf_outlines.test.py \
-		edge3d.test.py \
-		embedimage.test.py \
-		eqtexsvg.test.py \
-		extractimage.test.py \
-		extrude.test.py \
-		flatten.test.py \
-		foldablebox.test.py \
-		fractalize.test.py \
-		funcplot.test.py \
-		gimp_xcf.test.py \
-		grid_cartesian.test.py \
-		grid_polar.test.py \
-		guides_creator.test.py \
-		handles.test.py \
-		hpgl_output.test.py \
-		inkweb-debug.js \
-		inkwebeffect.test.py \
-		inkwebjs-move.test.svg \
-		interp_att_g.test.py \
-		interp.test.py \
-		lindenmayer.test.py \
-		lorem_ipsum.test.py \
-		markers_strokepaint.test.py \
-		measure.test.py \
-		minimal-blank.svg \
-		motion.test.py \
-		pathmodifier.test.py \
-		perfectboundcover.test.py \
-		perspective.test.py \
-		polyhedron_3d.test.py \
-		radiusrand.test.py \
-		render_alphabetsoup.test.py \
-		render_barcode.test.py \
-		render_barcode.data \
-		render_gears.test.py \
-		restack.test.py \
-		rtree.test.py \
-		run-all-extension-tests \
-		spirograph.test.py \
-		straightseg.test.py \
-		summersnight.test.py \
-		svg_and_media_zip_output.test.py \
-		svgcalendar.test.py \
-		test_template.py.txt \
-		triangle.test.py \
-		whirl.test.py
diff --git a/share/extensions/xaml2svg/Makefile.am b/share/extensions/xaml2svg/Makefile.am
deleted file mode 100644
index 89a901fde..000000000
--- a/share/extensions/xaml2svg/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-xaml2svg_otherstuffdir = $(datadir)/inkscape/extensions/xaml2svg
-
-xaml2svg_otherstuff = \
-	animation.xsl \
-	brushes.xsl \
-	canvas.xsl \
-	geometry.xsl \
-	Makefile.am \
-	properties.xsl \
-	shapes.xsl \
-	transform.xsl
-
-xaml2svg_otherstuff_DATA = \
-	$(xaml2svg_otherstuff)
-
-EXTRA_DIST = \
-	$(xaml2svg_otherstuff_DATA)
-