Merge pull request #2396 from phillc54/phillc54/glade

gladevcp: fix glade catalog paths for package installations

Author: hansu

debian/linuxcnc.install.in

@@ -116,7 +116,7 @@ usr/lib/python3
 usr/lib/tcltk
 
 usr/share/axis
-usr/share/glade3
+usr/share/glade
 usr/share/gmoccapy
 usr/share/gscreen
 usr/share/gtksourceview-2.0

lib/python/gladevcp/READ_ME

@@ -1,8 +1,8 @@
-To use gladevcp in a run in place environment just source scripts/rip-environment
+To use gladevcp in a run in place environment just source scripts/rip-environment 
 and it will set all paths.
 
-To install it system-wide you must link files from ./share/glade3/ 
-to /usr/share/glade3 system folder.
+For package installations the required files will be placed in the 
+/usr/share/glade system folder.
 
-When using gladevcp widgets in python programs you need to import
+When using gladevcp widgets in python programs you need to import 
 gladevcp.makepins.

lib/python/gladevcp/glade-icons/README

@@ -0,0 +1,8 @@
+Glade widget icons should be in this directory to ensure that the icons will 
+be installed to the correct location in a package installation.
+
+The directory for icons is /usr/share/glade/pixmaps/hicolor/22x22/actions/
+
+For run-in-place installations the icons will not appear in Glade.
+If you have run-in-place and you would like the icons to appear then you could 
+manually copy the icon files to the directory above.