Merge from trunk (r12439).

(bzr r11608.1.108)

17 files changed, 20 insertions, 36 deletions

diff --git a/share/Makefile.am b/share/Makefile.am
index 27aaf0d28..fa778b031 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = attributes \
-          clipart \
+          branding \
           examples \
           extensions \
           filters \
diff --git a/share/branding/Makefile.am b/share/branding/Makefile.am
new file mode 100644
index 000000000..f992c8165
--- /dev/null
+++ b/share/branding/Makefile.am
@@ -0,0 +1,16 @@
+
+brandingdir = $(datadir)/inkscape/branding
+iconsdir = $(datadir)/inkscape/icons
+
+branding_DATA =  \
+	README \
+	inkscape.svg \
+	sodipodi.svg \
+	tux.svg \
+	draw-freely.svg \
+	draw-freely.ru.svg
+
+icons_DATA = \
+	inkscape.svg
+
+EXTRA_DIST = $(branding_DATA) $(icons_DATA)
diff --git a/share/branding/README b/share/branding/README
new file mode 100644
index 000000000..957c1baad
--- /dev/null
+++ b/share/branding/README
@@ -0,0 +1,3 @@
+This directory is for the official Inkscape-related branding:
+Inkscape logo, banners, promotional graphics, etc.
+
diff --git a/share/clipart/draw-freely.ru.svg b/share/branding/draw-freely.ru.svg
index 61e98a9f7..61e98a9f7 100644
--- a/share/clipart/draw-freely.ru.svg
+++ b/share/branding/draw-freely.ru.svg
diff --git a/share/clipart/draw-freely.svg b/share/branding/draw-freely.svg
index bcf2fb16e..bcf2fb16e 100644
--- a/share/clipart/draw-freely.svg
+++ b/share/branding/draw-freely.svg
diff --git a/share/clipart/inkscape.logo.svg b/share/branding/inkscape.logo.svg
index 4c1ef03ac..4c1ef03ac 100644
--- a/share/clipart/inkscape.logo.svg
+++ b/share/branding/inkscape.logo.svg
diff --git a/share/icons/inkscape.svg b/share/branding/inkscape.svg
index 121bc3aef..121bc3aef 100644
--- a/share/icons/inkscape.svg
+++ b/share/branding/inkscape.svg
diff --git a/share/clipart/orav.svg b/share/branding/sodipodi.svg
index 139cc6ee5..139cc6ee5 100644
--- a/share/clipart/orav.svg
+++ b/share/branding/sodipodi.svg
diff --git a/share/clipart/tux.svg b/share/branding/tux.svg
index e3155ebfd..e3155ebfd 100644
--- a/share/clipart/tux.svg
+++ b/share/branding/tux.svg
diff --git a/share/clipart/Makefile.am b/share/clipart/Makefile.am
deleted file mode 100644
index 8e9a88159..000000000
--- a/share/clipart/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-clipartdir = $(datadir)/inkscape/clipart
-
-clipart_DATA =  \
-	README \
-	inkscape.logo.svg \
-	orav.svg \
-	tux.svg \
-	draw-freely.svg \
-	draw-freely.ru.svg
-
-EXTRA_DIST = $(clipart_DATA)
diff --git a/share/clipart/README b/share/clipart/README
deleted file mode 100644
index 862b5503e..000000000
--- a/share/clipart/README
+++ /dev/null
@@ -1,17 +0,0 @@
-This directory is for the official Inkscape-related clipart:
-Inkscape logo, banners, promotional graphics, etc.
-
-This is not for general-purpose SVG clipart. For that, there are
-several excellent sources:
-
-http://openclipart.org has thousands of public domain clipart images
-in SVG
-
-http://commons.wikimedia.org/wiki/Category:SVG has thousands of free
-encyclopedic images in SVG, many of them usable as clipart (maps,
-flags, diagrams, coats of arms, etc.)
-
-
-
-
-
diff --git a/share/icons/Makefile.am b/share/icons/Makefile.am
index 0dfb1acd7..6053cd71c 100644
--- a/share/icons/Makefile.am
+++ b/share/icons/Makefile.am
@@ -43,7 +43,6 @@ pixmaps = \
 
 icons_DATA = \
 	$(pixmaps) \
-	inkscape.svg \
 	\
 	icons.svg \
 	tango_icons.svg \
diff --git a/share/keys/default.xml b/share/keys/default.xml
index cb1273013..52bbd486c 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -627,7 +627,6 @@ override) the bindings in the main default.xml.
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index cb1273013..52bbd486c 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -627,7 +627,6 @@ override) the bindings in the main default.xml.
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/macromedia-freehand-mx.xml b/share/keys/macromedia-freehand-mx.xml
index 9297f4d2b..60a9719b5 100644
--- a/share/keys/macromedia-freehand-mx.xml
+++ b/share/keys/macromedia-freehand-mx.xml
@@ -413,7 +413,6 @@ File, Edit, View, Modify, Text, Xtras, Window, Help.
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/right-handed-illustration.xml b/share/keys/right-handed-illustration.xml
index 28af163da..33125edba 100644
--- a/share/keys/right-handed-illustration.xml
+++ b/share/keys/right-handed-illustration.xml
@@ -530,7 +530,6 @@ Future improvements:
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />
 
diff --git a/share/keys/xara.xml b/share/keys/xara.xml
index 936ee1fd3..5229964ae 100644
--- a/share/keys/xara.xml
+++ b/share/keys/xara.xml
@@ -535,7 +535,6 @@ Hom/end keys-select minimum or maximum feather values
   <bind action="DialogMetadata" />
   <bind action="DialogClonetiler" />
   <bind action="DialogGridArrange" />
-  <bind action="DialogScript" />
   <bind action="DialogDebug" />
   <bind action="DialogInput" />