Update to 0.94. This represents work by adamw, mezz, and

Tom McLaughlin <tmclaugh@sdf.lonestar.org>.

Submitted by:	Tom McLaughlin <tmclaugh@sdf.lonestar.org>

5 files changed, 420 insertions, 231 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 3d19b047baaf..f014adb72186 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.93
-PORTREVISION=	1
+PORTVERSION=	0.94
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.93
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.94
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
@@ -22,7 +21,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2
+USE_GNOME=	gtk20 gnomehack gnomeprefix libxslt libartlgpl2 intlhack
 WANT_GNOME=	yes
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -33,8 +32,7 @@ MAN1=		dia.1
 
 .if !defined(WITHOUT_PYTHON)
 USE_PYTHON=	yes
-BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
+USE_GNOME+=	pygtk2
 CONFIGURE_ARGS=	--with-python
 PLIST_SUB=	PYTHON:=""
 .else
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 5e829946e74b..9aa1b59e7eb6 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/dia-0.93.tar.bz2) = 6c8e5e20a60fc03d5a811ccc8f84d360
-SIZE (gnome2/dia-0.93.tar.bz2) = 3075945
+MD5 (gnome2/dia-0.94.tar.bz2) = 63584224912dab49fed8d2cf87ea2d85
+SIZE (gnome2/dia-0.94.tar.bz2) = 3348869
diff --git a/graphics/dia/files/patch-ad b/graphics/dia/files/patch-ad
index cff83090b34a..c4029e041f68 100644
--- a/graphics/dia/files/patch-ad
+++ b/graphics/dia/files/patch-ad
@@ -1,6 +1,6 @@
---- configure.orig	Thu Apr 29 13:14:25 2004
-+++ configure	Sat May  1 14:31:21 2004
-@@ -20496,7 +20497,7 @@
+--- configure.orig	Thu Aug 19 23:59:15 2004
++++ configure	Fri Aug 20 00:02:09 2004
+@@ -21542,7 +21542,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
@@ -9,12 +9,30 @@
  _ACEOF
  
      have_gnome=true
-@@ -23717,7 +23718,7 @@
+@@ -25231,7 +25231,7 @@
  
-   PYTHON_PREFIX=${prefix}
+   fi
  
--  PYTHON_EXEC_PREFIX=${exec_prefix}
+-
 +  PYTHON_EXEC_PREFIX=${LOCALBASE}
  
- 
+   PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"`
+ 
+@@ -25293,12 +25293,12 @@
+ except:
+         sys.exit(0)
+ sys.exit(0)"
+-if $PYTHON -c "$prog" 1>&5 2>&5
+-  then
++#if $PYTHON -c "$prog" 1>&5 2>&5
++#  then
+     eval "py_cv_mod_$py_mod_var=yes"
+-  else
+-    eval "py_cv_mod_$py_mod_var=no"
+-  fi
++#  else
++#    eval "py_cv_mod_$py_mod_var=no"
++#  fi
+ 
+ fi
  
diff --git a/graphics/dia/files/patch-doc_Makefile.in b/graphics/dia/files/patch-doc_Makefile.in
index ef2e295163bf..7fa6b84a5358 100644
--- a/graphics/dia/files/patch-doc_Makefile.in
+++ b/graphics/dia/files/patch-doc_Makefile.in
@@ -1,12 +1,12 @@
---- doc/Makefile.in.orig	Tue May 11 22:13:46 2004
-+++ doc/Makefile.in	Tue May 11 22:14:03 2004
-@@ -231,8 +231,7 @@
+--- doc/Makefile.in.orig	Thu Aug 19 23:46:25 2004
++++ doc/Makefile.in	Thu Aug 19 23:48:00 2004
+@@ -257,8 +257,7 @@
+ 	shape.dtd \
  	sheet.dtd
  
- 
--@HAVE_GNOME_TRUE@helpdir = $(datadir)/help/dia
 -@HAVE_GNOME_FALSE@helpdir = $(pkgdatadir)/help
+-@HAVE_GNOME_TRUE@helpdir = $(datadir)/help/dia
 +helpdir = $(datadir)/help/dia
- subdir = doc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index fbba0348d82c..ed82de0e3e97 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,5 +1,6 @@
 bin/dia
 lib/dia/libbondgraph_objects.so
+lib/dia/libcairo_filter.so
 lib/dia/libcgm_filter.so
 lib/dia/libchronogram_objects.so
 lib/dia/libcustom_objects.so
@@ -10,6 +11,9 @@ lib/dia/libflowchart_objects.so
 lib/dia/libfs_objects.so
 lib/dia/libgrafcet_objects.so
 lib/dia/libhpgl_filter.so
+lib/dia/libistar_objects.so
+lib/dia/libjackson_objects.so
+lib/dia/libkaos_objects.so
 lib/dia/libmetapost_filter.so
 lib/dia/libmisc_objects.so
 lib/dia/libnetwork_objects.so
@@ -21,6 +25,7 @@ lib/dia/libshape_filter.so
 lib/dia/libstandard_objects.so
 lib/dia/libsvg_filter.so
 lib/dia/libuml_objects.so
+lib/dia/libwmf_filter.so
 lib/dia/libwpg_filter.so
 lib/dia/libxfig_filter.so
 lib/dia/libxslt_filter.so
@@ -28,13 +33,24 @@ share/gnome/applications/dia.desktop
 share/gnome/dia/dia.xpm
 share/gnome/dia/dia_logo.png
 share/gnome/dia/images/broken-chain.xpm
+share/gnome/dia/images/connectable-empty.png
+share/gnome/dia/images/connectable.png
+share/gnome/dia/images/off-grid.png
+share/gnome/dia/images/on-grid.png
+share/gnome/dia/images/selectable-empty.png
+share/gnome/dia/images/selectable.png
 share/gnome/dia/images/unbroken-chain.xpm
+share/gnome/dia/images/visible-empty.png
+share/gnome/dia/images/visible.png
 %%PYTHON:%%share/gnome/dia/python-startup.py
 %%PYTHON:%%share/gnome/dia/python/diasvg.py
+%%PYTHON:%%share/gnome/dia/python/diasvg_import.py
 %%PYTHON:%%share/gnome/dia/python/group_props.py
 %%PYTHON:%%share/gnome/dia/python/gtkcons.py
 %%PYTHON:%%share/gnome/dia/python/otypes.py
 %%PYTHON:%%share/gnome/dia/python/pydiadoc.py
+%%PYTHON:%%share/gnome/dia/python/scascale.py
+%%PYTHON:%%share/gnome/dia/python/select_by.py
 share/gnome/dia/shapes/Assorted/arrow-chevron.png
 share/gnome/dia/shapes/Assorted/arrow-chevron.shape
 share/gnome/dia/shapes/Assorted/arrow-down.png
@@ -117,66 +133,170 @@ share/gnome/dia/shapes/Assorted/triangle-isoceles.png
 share/gnome/dia/shapes/Assorted/triangle-isoceles.shape
 share/gnome/dia/shapes/Assorted/triangle-rightangle.png
 share/gnome/dia/shapes/Assorted/triangle-rightangle.shape
+share/gnome/dia/shapes/ChemEng/ACgen.png
+share/gnome/dia/shapes/ChemEng/ACgen.shape
+share/gnome/dia/shapes/ChemEng/SaT-fixedtube.png
+share/gnome/dia/shapes/ChemEng/SaT-fixedtube.shape
+share/gnome/dia/shapes/ChemEng/SaT-floatinghead.png
+share/gnome/dia/shapes/ChemEng/SaT-floatinghead.shape
+share/gnome/dia/shapes/ChemEng/aircooler.png
+share/gnome/dia/shapes/ChemEng/aircooler.shape
+share/gnome/dia/shapes/ChemEng/airforced.png
+share/gnome/dia/shapes/ChemEng/airforced.shape
+share/gnome/dia/shapes/ChemEng/airinduced.png
+share/gnome/dia/shapes/ChemEng/airinduced.shape
+share/gnome/dia/shapes/ChemEng/autoclave.png
+share/gnome/dia/shapes/ChemEng/autoclave.shape
+share/gnome/dia/shapes/ChemEng/bigtraycol.png
+share/gnome/dia/shapes/ChemEng/bigtraycol.shape
+share/gnome/dia/shapes/ChemEng/centrifuge.png
+share/gnome/dia/shapes/ChemEng/centrifuge.shape
+share/gnome/dia/shapes/ChemEng/coil.png
+share/gnome/dia/shapes/ChemEng/coil.shape
+share/gnome/dia/shapes/ChemEng/coilv.png
+share/gnome/dia/shapes/ChemEng/coilv.shape
+share/gnome/dia/shapes/ChemEng/compr.png
+share/gnome/dia/shapes/ChemEng/compr.shape
+share/gnome/dia/shapes/ChemEng/coveredtank.png
+share/gnome/dia/shapes/ChemEng/coveredtank.shape
+share/gnome/dia/shapes/ChemEng/cyclone.png
+share/gnome/dia/shapes/ChemEng/cyclone.shape
+share/gnome/dia/shapes/ChemEng/displa.png
+share/gnome/dia/shapes/ChemEng/displa.shape
+share/gnome/dia/shapes/ChemEng/doublepipe.png
+share/gnome/dia/shapes/ChemEng/doublepipe.shape
+share/gnome/dia/shapes/ChemEng/ejector.png
+share/gnome/dia/shapes/ChemEng/ejector.shape
+share/gnome/dia/shapes/ChemEng/fan.png
+share/gnome/dia/shapes/ChemEng/fan.shape
+share/gnome/dia/shapes/ChemEng/filter.png
+share/gnome/dia/shapes/ChemEng/filter.shape
+share/gnome/dia/shapes/ChemEng/fixedroof.png
+share/gnome/dia/shapes/ChemEng/fixedroof.shape
+share/gnome/dia/shapes/ChemEng/floatingroof.png
+share/gnome/dia/shapes/ChemEng/floatingroof.shape
+share/gnome/dia/shapes/ChemEng/flowfan.png
+share/gnome/dia/shapes/ChemEng/flowfan.shape
+share/gnome/dia/shapes/ChemEng/fluidcont.png
+share/gnome/dia/shapes/ChemEng/fluidcont.shape
+share/gnome/dia/shapes/ChemEng/furnace.png
+share/gnome/dia/shapes/ChemEng/furnace.shape
+share/gnome/dia/shapes/ChemEng/gasholder.png
+share/gnome/dia/shapes/ChemEng/gasholder.shape
+share/gnome/dia/shapes/ChemEng/hx.png
+share/gnome/dia/shapes/ChemEng/hx.shape
+share/gnome/dia/shapes/ChemEng/hxv.png
+share/gnome/dia/shapes/ChemEng/hxv.shape
+share/gnome/dia/shapes/ChemEng/kettle.png
+share/gnome/dia/shapes/ChemEng/kettle.shape
+share/gnome/dia/shapes/ChemEng/knockout.png
+share/gnome/dia/shapes/ChemEng/knockout.shape
+share/gnome/dia/shapes/ChemEng/measure.png
+share/gnome/dia/shapes/ChemEng/measure.shape
+share/gnome/dia/shapes/ChemEng/mixer.png
+share/gnome/dia/shapes/ChemEng/mixer.shape
+share/gnome/dia/shapes/ChemEng/plate.png
+share/gnome/dia/shapes/ChemEng/plate.shape
+share/gnome/dia/shapes/ChemEng/pneum.png
+share/gnome/dia/shapes/ChemEng/pneum.shape
+share/gnome/dia/shapes/ChemEng/pneumv.png
+share/gnome/dia/shapes/ChemEng/pneumv.shape
+share/gnome/dia/shapes/ChemEng/pnuemv.png
+share/gnome/dia/shapes/ChemEng/pnuemv.shape
+share/gnome/dia/shapes/ChemEng/pump.png
+share/gnome/dia/shapes/ChemEng/pump.shape
+share/gnome/dia/shapes/ChemEng/reactor.png
+share/gnome/dia/shapes/ChemEng/reactor.shape
+share/gnome/dia/shapes/ChemEng/recipr.png
+share/gnome/dia/shapes/ChemEng/recipr.shape
+share/gnome/dia/shapes/ChemEng/regval.png
+share/gnome/dia/shapes/ChemEng/regval.shape
+share/gnome/dia/shapes/ChemEng/regvalv.png
+share/gnome/dia/shapes/ChemEng/regvalv.shape
+share/gnome/dia/shapes/ChemEng/sealedtank.png
+share/gnome/dia/shapes/ChemEng/sealedtank.shape
+share/gnome/dia/shapes/ChemEng/settling.png
+share/gnome/dia/shapes/ChemEng/settling.shape
+share/gnome/dia/shapes/ChemEng/spray.png
+share/gnome/dia/shapes/ChemEng/spray.shape
+share/gnome/dia/shapes/ChemEng/spraydrier.png
+share/gnome/dia/shapes/ChemEng/spraydrier.shape
+share/gnome/dia/shapes/ChemEng/storagesphere.png
+share/gnome/dia/shapes/ChemEng/storagesphere.shape
+share/gnome/dia/shapes/ChemEng/tank.png
+share/gnome/dia/shapes/ChemEng/tank.shape
+share/gnome/dia/shapes/ChemEng/traycol.png
+share/gnome/dia/shapes/ChemEng/traycol.shape
+share/gnome/dia/shapes/ChemEng/val.png
+share/gnome/dia/shapes/ChemEng/val.shape
+share/gnome/dia/shapes/ChemEng/valv.png
+share/gnome/dia/shapes/ChemEng/valv.shape
+share/gnome/dia/shapes/ChemEng/vessel.png
+share/gnome/dia/shapes/ChemEng/vessel.shape
+share/gnome/dia/shapes/ChemEng/wcool.png
+share/gnome/dia/shapes/ChemEng/wcool.shape
+share/gnome/dia/shapes/ChemEng/wcoolv.png
+share/gnome/dia/shapes/ChemEng/wcoolv.shape
+share/gnome/dia/shapes/Circuit/ground.png
 share/gnome/dia/shapes/Circuit/ground.shape
-share/gnome/dia/shapes/Circuit/ground.xpm
+share/gnome/dia/shapes/Circuit/hcapacitor.png
 share/gnome/dia/shapes/Circuit/hcapacitor.shape
-share/gnome/dia/shapes/Circuit/hcapacitor.xpm
+share/gnome/dia/shapes/Circuit/hdiode.png
 share/gnome/dia/shapes/Circuit/hdiode.shape
-share/gnome/dia/shapes/Circuit/hdiode.xpm
+share/gnome/dia/shapes/Circuit/hfuse_de.png
 share/gnome/dia/shapes/Circuit/hfuse_de.shape
-share/gnome/dia/shapes/Circuit/hfuse_de.xpm
+share/gnome/dia/shapes/Circuit/hinductor.png
 share/gnome/dia/shapes/Circuit/hinductor.shape
-share/gnome/dia/shapes/Circuit/hinductor.xpm
+share/gnome/dia/shapes/Circuit/hinductor_de.png
 share/gnome/dia/shapes/Circuit/hinductor_de.shape
-share/gnome/dia/shapes/Circuit/hinductor_de.xpm
 share/gnome/dia/shapes/Circuit/hjumper.png
 share/gnome/dia/shapes/Circuit/hjumper.shape
+share/gnome/dia/shapes/Circuit/hled_de.png
 share/gnome/dia/shapes/Circuit/hled_de.shape
-share/gnome/dia/shapes/Circuit/hled_de.xpm
+share/gnome/dia/shapes/Circuit/hpowersource_de.png
 share/gnome/dia/shapes/Circuit/hpowersource_de.shape
-share/gnome/dia/shapes/Circuit/hpowersource_de.xpm
+share/gnome/dia/shapes/Circuit/hresistor.png
 share/gnome/dia/shapes/Circuit/hresistor.shape
-share/gnome/dia/shapes/Circuit/hresistor.xpm
+share/gnome/dia/shapes/Circuit/hresistor_de.png
 share/gnome/dia/shapes/Circuit/hresistor_de.shape
-share/gnome/dia/shapes/Circuit/hresistor_de.xpm
+share/gnome/dia/shapes/Circuit/hzener.png
 share/gnome/dia/shapes/Circuit/hzener.shape
-share/gnome/dia/shapes/Circuit/hzener.xpm
+share/gnome/dia/shapes/Circuit/lamp_de.png
 share/gnome/dia/shapes/Circuit/lamp_de.shape
-share/gnome/dia/shapes/Circuit/lamp_de.xpm
+share/gnome/dia/shapes/Circuit/microphone_de.png
 share/gnome/dia/shapes/Circuit/microphone_de.shape
-share/gnome/dia/shapes/Circuit/microphone_de.xpm
+share/gnome/dia/shapes/Circuit/nmos_de.png
 share/gnome/dia/shapes/Circuit/nmos_de.shape
-share/gnome/dia/shapes/Circuit/nmos_de.xpm
+share/gnome/dia/shapes/Circuit/npn.png
 share/gnome/dia/shapes/Circuit/npn.shape
-share/gnome/dia/shapes/Circuit/npn.xpm
+share/gnome/dia/shapes/Circuit/opamp.png
 share/gnome/dia/shapes/Circuit/opamp.shape
-share/gnome/dia/shapes/Circuit/opamp.xpm
+share/gnome/dia/shapes/Circuit/pmos_de.png
 share/gnome/dia/shapes/Circuit/pmos_de.shape
-share/gnome/dia/shapes/Circuit/pmos_de.xpm
+share/gnome/dia/shapes/Circuit/pnp.png
 share/gnome/dia/shapes/Circuit/pnp.shape
-share/gnome/dia/shapes/Circuit/pnp.xpm
+share/gnome/dia/shapes/Circuit/speaker_de.png
 share/gnome/dia/shapes/Circuit/speaker_de.shape
-share/gnome/dia/shapes/Circuit/speaker_de.xpm
+share/gnome/dia/shapes/Circuit/vcapacitor.png
 share/gnome/dia/shapes/Circuit/vcapacitor.shape
-share/gnome/dia/shapes/Circuit/vcapacitor.xpm
+share/gnome/dia/shapes/Circuit/vdiode.png
 share/gnome/dia/shapes/Circuit/vdiode.shape
-share/gnome/dia/shapes/Circuit/vdiode.xpm
+share/gnome/dia/shapes/Circuit/vfuse_de.png
 share/gnome/dia/shapes/Circuit/vfuse_de.shape
-share/gnome/dia/shapes/Circuit/vfuse_de.xpm
+share/gnome/dia/shapes/Circuit/vinductor.png
 share/gnome/dia/shapes/Circuit/vinductor.shape
-share/gnome/dia/shapes/Circuit/vinductor.xpm
+share/gnome/dia/shapes/Circuit/vinductor_de.png
 share/gnome/dia/shapes/Circuit/vinductor_de.shape
-share/gnome/dia/shapes/Circuit/vinductor_de.xpm
+share/gnome/dia/shapes/Circuit/vled_de.png
 share/gnome/dia/shapes/Circuit/vled_de.shape
-share/gnome/dia/shapes/Circuit/vled_de.xpm
+share/gnome/dia/shapes/Circuit/vpowersource_de.png
 share/gnome/dia/shapes/Circuit/vpowersource_de.shape
-share/gnome/dia/shapes/Circuit/vpowersource_de.xpm
+share/gnome/dia/shapes/Circuit/vresistor.png
 share/gnome/dia/shapes/Circuit/vresistor.shape
-share/gnome/dia/shapes/Circuit/vresistor.xpm
+share/gnome/dia/shapes/Circuit/vresistor_de.png
 share/gnome/dia/shapes/Circuit/vresistor_de.shape
-share/gnome/dia/shapes/Circuit/vresistor_de.xpm
+share/gnome/dia/shapes/Circuit/vzener.png
 share/gnome/dia/shapes/Circuit/vzener.shape
-share/gnome/dia/shapes/Circuit/vzener.xpm
 share/gnome/dia/shapes/Cisco/1000.png
 share/gnome/dia/shapes/Cisco/1000.shape
 share/gnome/dia/shapes/Cisco/100baset_hub.png
@@ -619,90 +739,90 @@ share/gnome/dia/shapes/Cisco/workstation.png
 share/gnome/dia/shapes/Cisco/workstation.shape
 share/gnome/dia/shapes/Cisco/www_server.png
 share/gnome/dia/shapes/Cisco/www_server.shape
+share/gnome/dia/shapes/Civil/bvrest.png
 share/gnome/dia/shapes/Civil/bvrest.shape
-share/gnome/dia/shapes/Civil/bvrest.xpm
+share/gnome/dia/shapes/Civil/civil_aerator.png
 share/gnome/dia/shapes/Civil/civil_aerator.shape
-share/gnome/dia/shapes/Civil/civil_aerator.xpm
+share/gnome/dia/shapes/Civil/civil_arrow_right.png
 share/gnome/dia/shapes/Civil/civil_arrow_right.shape
-share/gnome/dia/shapes/Civil/civil_arrow_right.xpm
+share/gnome/dia/shapes/Civil/civil_arrow_up.png
 share/gnome/dia/shapes/Civil/civil_arrow_up.shape
-share/gnome/dia/shapes/Civil/civil_arrow_up.xpm
+share/gnome/dia/shapes/Civil/civil_backflow_preventer.png
 share/gnome/dia/shapes/Civil/civil_backflow_preventer.shape
-share/gnome/dia/shapes/Civil/civil_backflow_preventer.xpm
+share/gnome/dia/shapes/Civil/civil_basin.png
 share/gnome/dia/shapes/Civil/civil_basin.shape
-share/gnome/dia/shapes/Civil/civil_basin.xpm
+share/gnome/dia/shapes/Civil/civil_container.png
 share/gnome/dia/shapes/Civil/civil_container.shape
-share/gnome/dia/shapes/Civil/civil_container.xpm
+share/gnome/dia/shapes/Civil/civil_final-settling_basin.png
 share/gnome/dia/shapes/Civil/civil_final-settling_basin.shape
-share/gnome/dia/shapes/Civil/civil_final-settling_basin.xpm
+share/gnome/dia/shapes/Civil/civil_frequency_converter.png
 share/gnome/dia/shapes/Civil/civil_frequency_converter.shape
-share/gnome/dia/shapes/Civil/civil_frequency_converter.xpm
+share/gnome/dia/shapes/Civil/civil_gas_bottle.png
 share/gnome/dia/shapes/Civil/civil_gas_bottle.shape
-share/gnome/dia/shapes/Civil/civil_gas_bottle.xpm
+share/gnome/dia/shapes/Civil/civil_horizontal_limiting_line.png
 share/gnome/dia/shapes/Civil/civil_horizontal_limiting_line.shape
-share/gnome/dia/shapes/Civil/civil_horizontal_limiting_line.xpm
+share/gnome/dia/shapes/Civil/civil_horizontal_valve.png
 share/gnome/dia/shapes/Civil/civil_horizontal_valve.shape
-share/gnome/dia/shapes/Civil/civil_horizontal_valve.xpm
+share/gnome/dia/shapes/Civil/civil_motor.png
 share/gnome/dia/shapes/Civil/civil_motor.shape
-share/gnome/dia/shapes/Civil/civil_motor.xpm
+share/gnome/dia/shapes/Civil/civil_preliminary_clarification_tank.png
 share/gnome/dia/shapes/Civil/civil_preliminary_clarification_tank.shape
-share/gnome/dia/shapes/Civil/civil_preliminary_clarification_tank.xpm
+share/gnome/dia/shapes/Civil/civil_rotor.png
 share/gnome/dia/shapes/Civil/civil_rotor.shape
-share/gnome/dia/shapes/Civil/civil_rotor.xpm
+share/gnome/dia/shapes/Civil/civil_soil.png
 share/gnome/dia/shapes/Civil/civil_soil.shape
-share/gnome/dia/shapes/Civil/civil_soil.xpm
+share/gnome/dia/shapes/Civil/civil_vertical_limiting_line.png
 share/gnome/dia/shapes/Civil/civil_vertical_limiting_line.shape
-share/gnome/dia/shapes/Civil/civil_vertical_limiting_line.xpm
+share/gnome/dia/shapes/Civil/civil_vertical_propeller.png
 share/gnome/dia/shapes/Civil/civil_vertical_propeller.shape
-share/gnome/dia/shapes/Civil/civil_vertical_propeller.xpm
+share/gnome/dia/shapes/Civil/hcompressor.png
 share/gnome/dia/shapes/Civil/hcompressor.shape
-share/gnome/dia/shapes/Civil/hcompressor.xpm
+share/gnome/dia/shapes/Civil/hpump.png
 share/gnome/dia/shapes/Civil/hpump.shape
-share/gnome/dia/shapes/Civil/hpump.xpm
+share/gnome/dia/shapes/Civil/hrest.png
 share/gnome/dia/shapes/Civil/hrest.shape
-share/gnome/dia/shapes/Civil/hrest.xpm
+share/gnome/dia/shapes/Civil/line.png
 share/gnome/dia/shapes/Civil/line.shape
-share/gnome/dia/shapes/Civil/line.xpm
+share/gnome/dia/shapes/Civil/vcompressor.png
 share/gnome/dia/shapes/Civil/vcompressor.shape
-share/gnome/dia/shapes/Civil/vcompressor.xpm
+share/gnome/dia/shapes/Civil/vpump.png
 share/gnome/dia/shapes/Civil/vpump.shape
-share/gnome/dia/shapes/Civil/vpump.xpm
+share/gnome/dia/shapes/Civil/vrest.png
 share/gnome/dia/shapes/Civil/vrest.shape
-share/gnome/dia/shapes/Civil/vrest.xpm
+share/gnome/dia/shapes/Civil/water_level.png
 share/gnome/dia/shapes/Civil/water_level.shape
-share/gnome/dia/shapes/Civil/water_level.xpm
+share/gnome/dia/shapes/Contact/c_if.png
 share/gnome/dia/shapes/Contact/c_if.shape
-share/gnome/dia/shapes/Contact/c_if.xpm
+share/gnome/dia/shapes/Contact/c_ifnot.png
 share/gnome/dia/shapes/Contact/c_ifnot.shape
-share/gnome/dia/shapes/Contact/c_ifnot.xpm
+share/gnome/dia/shapes/Contact/c_lamp.png
 share/gnome/dia/shapes/Contact/c_lamp.shape
-share/gnome/dia/shapes/Contact/c_lamp.xpm
+share/gnome/dia/shapes/Contact/c_relay.png
 share/gnome/dia/shapes/Contact/c_relay.shape
-share/gnome/dia/shapes/Contact/c_relay.xpm
+share/gnome/dia/shapes/Contact/l_if.png
 share/gnome/dia/shapes/Contact/l_if.shape
-share/gnome/dia/shapes/Contact/l_if.xpm
+share/gnome/dia/shapes/Contact/l_ifnot.png
 share/gnome/dia/shapes/Contact/l_ifnot.shape
-share/gnome/dia/shapes/Contact/l_ifnot.xpm
+share/gnome/dia/shapes/Contact/l_out.png
 share/gnome/dia/shapes/Contact/l_out.shape
-share/gnome/dia/shapes/Contact/l_out.xpm
+share/gnome/dia/shapes/Contact/l_outj.png
 share/gnome/dia/shapes/Contact/l_outj.shape
-share/gnome/dia/shapes/Contact/l_outj.xpm
+share/gnome/dia/shapes/Contact/l_outnot.png
 share/gnome/dia/shapes/Contact/l_outnot.shape
-share/gnome/dia/shapes/Contact/l_outnot.xpm
+share/gnome/dia/shapes/Contact/l_outr.png
 share/gnome/dia/shapes/Contact/l_outr.shape
-share/gnome/dia/shapes/Contact/l_outr.xpm
+share/gnome/dia/shapes/Contact/l_outrcep.png
 share/gnome/dia/shapes/Contact/l_outrcep.shape
-share/gnome/dia/shapes/Contact/l_outrcep.xpm
+share/gnome/dia/shapes/Contact/l_outs.png
 share/gnome/dia/shapes/Contact/l_outs.shape
-share/gnome/dia/shapes/Contact/l_outs.xpm
+share/gnome/dia/shapes/Contact/l_sout.png
 share/gnome/dia/shapes/Contact/l_sout.shape
-share/gnome/dia/shapes/Contact/l_sout.xpm
+share/gnome/dia/shapes/Contact/l_soutnot.png
 share/gnome/dia/shapes/Contact/l_soutnot.shape
-share/gnome/dia/shapes/Contact/l_soutnot.xpm
+share/gnome/dia/shapes/Contact/l_soutr.png
 share/gnome/dia/shapes/Contact/l_soutr.shape
-share/gnome/dia/shapes/Contact/l_soutr.xpm
+share/gnome/dia/shapes/Contact/l_souts.png
 share/gnome/dia/shapes/Contact/l_souts.shape
-share/gnome/dia/shapes/Contact/l_souts.xpm
 share/gnome/dia/shapes/Cybernetics/b-integrator.png
 share/gnome/dia/shapes/Cybernetics/b-integrator.shape
 share/gnome/dia/shapes/Cybernetics/b-minus.png
@@ -763,84 +883,84 @@ share/gnome/dia/shapes/Cybernetics/t-minus.png
 share/gnome/dia/shapes/Cybernetics/t-minus.shape
 share/gnome/dia/shapes/Cybernetics/t-sens.png
 share/gnome/dia/shapes/Cybernetics/t-sens.shape
+share/gnome/dia/shapes/Electric/cnx.png
 share/gnome/dia/shapes/Electric/cnx.shape
-share/gnome/dia/shapes/Electric/cnx.xpm
+share/gnome/dia/shapes/Electric/command.png
 share/gnome/dia/shapes/Electric/command.shape
-share/gnome/dia/shapes/Electric/command.xpm
+share/gnome/dia/shapes/Electric/contact_f.png
 share/gnome/dia/shapes/Electric/contact_f.shape
-share/gnome/dia/shapes/Electric/contact_f.xpm
+share/gnome/dia/shapes/Electric/contact_o.png
 share/gnome/dia/shapes/Electric/contact_o.shape
-share/gnome/dia/shapes/Electric/contact_o.xpm
+share/gnome/dia/shapes/Electric/intpos_f.png
 share/gnome/dia/shapes/Electric/intpos_f.shape
-share/gnome/dia/shapes/Electric/intpos_f.xpm
+share/gnome/dia/shapes/Electric/intpos_o.png
 share/gnome/dia/shapes/Electric/intpos_o.shape
-share/gnome/dia/shapes/Electric/intpos_o.xpm
+share/gnome/dia/shapes/Electric/lamp.png
 share/gnome/dia/shapes/Electric/lamp.shape
-share/gnome/dia/shapes/Electric/lamp.xpm
+share/gnome/dia/shapes/Electric/relay.png
 share/gnome/dia/shapes/Electric/relay.shape
-share/gnome/dia/shapes/Electric/relay.xpm
+share/gnome/dia/shapes/Electric/vcommand.png
 share/gnome/dia/shapes/Electric/vcommand.shape
-share/gnome/dia/shapes/Electric/vcommand.xpm
+share/gnome/dia/shapes/Electric/vcontact_f.png
 share/gnome/dia/shapes/Electric/vcontact_f.shape
-share/gnome/dia/shapes/Electric/vcontact_f.xpm
+share/gnome/dia/shapes/Electric/vcontact_o.png
 share/gnome/dia/shapes/Electric/vcontact_o.shape
-share/gnome/dia/shapes/Electric/vcontact_o.xpm
+share/gnome/dia/shapes/Electric/vintpos_f.png
 share/gnome/dia/shapes/Electric/vintpos_f.shape
-share/gnome/dia/shapes/Electric/vintpos_f.xpm
+share/gnome/dia/shapes/Electric/vintpos_o.png
 share/gnome/dia/shapes/Electric/vintpos_o.shape
-share/gnome/dia/shapes/Electric/vintpos_o.xpm
+share/gnome/dia/shapes/Electric/vlamp.png
 share/gnome/dia/shapes/Electric/vlamp.shape
-share/gnome/dia/shapes/Electric/vlamp.xpm
+share/gnome/dia/shapes/Electric/vrelay.png
 share/gnome/dia/shapes/Electric/vrelay.shape
-share/gnome/dia/shapes/Electric/vrelay.xpm
+share/gnome/dia/shapes/Flowchart/collate.png
 share/gnome/dia/shapes/Flowchart/collate.shape
-share/gnome/dia/shapes/Flowchart/collate.xpm
+share/gnome/dia/shapes/Flowchart/delay.png
 share/gnome/dia/shapes/Flowchart/delay.shape
-share/gnome/dia/shapes/Flowchart/delay.xpm
+share/gnome/dia/shapes/Flowchart/display.png
 share/gnome/dia/shapes/Flowchart/display.shape
-share/gnome/dia/shapes/Flowchart/display.xpm
+share/gnome/dia/shapes/Flowchart/document.png
 share/gnome/dia/shapes/Flowchart/document.shape
-share/gnome/dia/shapes/Flowchart/document.xpm
+share/gnome/dia/shapes/Flowchart/extract.png
 share/gnome/dia/shapes/Flowchart/extract.shape
-share/gnome/dia/shapes/Flowchart/extract.xpm
+share/gnome/dia/shapes/Flowchart/intstorage.png
 share/gnome/dia/shapes/Flowchart/intstorage.shape
-share/gnome/dia/shapes/Flowchart/intstorage.xpm
+share/gnome/dia/shapes/Flowchart/magdisk.png
 share/gnome/dia/shapes/Flowchart/magdisk.shape
-share/gnome/dia/shapes/Flowchart/magdisk.xpm
+share/gnome/dia/shapes/Flowchart/magdrum.png
 share/gnome/dia/shapes/Flowchart/magdrum.shape
-share/gnome/dia/shapes/Flowchart/magdrum.xpm
+share/gnome/dia/shapes/Flowchart/magtape.png
 share/gnome/dia/shapes/Flowchart/magtape.shape
-share/gnome/dia/shapes/Flowchart/magtape.xpm
+share/gnome/dia/shapes/Flowchart/manualinput.png
 share/gnome/dia/shapes/Flowchart/manualinput.shape
-share/gnome/dia/shapes/Flowchart/manualinput.xpm
+share/gnome/dia/shapes/Flowchart/manualop.png
 share/gnome/dia/shapes/Flowchart/manualop.shape
-share/gnome/dia/shapes/Flowchart/manualop.xpm
+share/gnome/dia/shapes/Flowchart/merge.png
 share/gnome/dia/shapes/Flowchart/merge.shape
-share/gnome/dia/shapes/Flowchart/merge.xpm
+share/gnome/dia/shapes/Flowchart/offlinestore.png
 share/gnome/dia/shapes/Flowchart/offlinestore.shape
-share/gnome/dia/shapes/Flowchart/offlinestore.xpm
+share/gnome/dia/shapes/Flowchart/offpageconn.png
 share/gnome/dia/shapes/Flowchart/offpageconn.shape
-share/gnome/dia/shapes/Flowchart/offpageconn.xpm
+share/gnome/dia/shapes/Flowchart/or.png
 share/gnome/dia/shapes/Flowchart/or.shape
-share/gnome/dia/shapes/Flowchart/or.xpm
+share/gnome/dia/shapes/Flowchart/predefdproc.png
 share/gnome/dia/shapes/Flowchart/predefdproc.shape
-share/gnome/dia/shapes/Flowchart/predefdproc.xpm
+share/gnome/dia/shapes/Flowchart/preparation.png
 share/gnome/dia/shapes/Flowchart/preparation.shape
-share/gnome/dia/shapes/Flowchart/preparation.xpm
+share/gnome/dia/shapes/Flowchart/punchedcard.png
 share/gnome/dia/shapes/Flowchart/punchedcard.shape
-share/gnome/dia/shapes/Flowchart/punchedcard.xpm
+share/gnome/dia/shapes/Flowchart/punchedtape.png
 share/gnome/dia/shapes/Flowchart/punchedtape.shape
-share/gnome/dia/shapes/Flowchart/punchedtape.xpm
+share/gnome/dia/shapes/Flowchart/sort.png
 share/gnome/dia/shapes/Flowchart/sort.shape
-share/gnome/dia/shapes/Flowchart/sort.xpm
+share/gnome/dia/shapes/Flowchart/sumjunction.png
 share/gnome/dia/shapes/Flowchart/sumjunction.shape
-share/gnome/dia/shapes/Flowchart/sumjunction.xpm
+share/gnome/dia/shapes/Flowchart/terminal.png
 share/gnome/dia/shapes/Flowchart/terminal.shape
-share/gnome/dia/shapes/Flowchart/terminal.xpm
+share/gnome/dia/shapes/Flowchart/transaction.png
 share/gnome/dia/shapes/Flowchart/transaction.shape
-share/gnome/dia/shapes/Flowchart/transaction.xpm
+share/gnome/dia/shapes/Flowchart/transmittape.png
 share/gnome/dia/shapes/Flowchart/transmittape.shape
-share/gnome/dia/shapes/Flowchart/transmittape.xpm
 share/gnome/dia/shapes/Logic/and.png
 share/gnome/dia/shapes/Logic/and.shape
 share/gnome/dia/shapes/Logic/buffer.png
@@ -859,18 +979,18 @@ share/gnome/dia/shapes/Logic/or.png
 share/gnome/dia/shapes/Logic/or.shape
 share/gnome/dia/shapes/Logic/xor.png
 share/gnome/dia/shapes/Logic/xor.shape
+share/gnome/dia/shapes/MSE/demultiplexer.png
 share/gnome/dia/shapes/MSE/demultiplexer.shape
-share/gnome/dia/shapes/MSE/demultiplexer.xpm
+share/gnome/dia/shapes/MSE/large_extension_node.png
 share/gnome/dia/shapes/MSE/large_extension_node.shape
-share/gnome/dia/shapes/MSE/large_extension_node.xpm
+share/gnome/dia/shapes/MSE/multiplexer.png
 share/gnome/dia/shapes/MSE/multiplexer.shape
-share/gnome/dia/shapes/MSE/multiplexer.xpm
+share/gnome/dia/shapes/MSE/node_center.png
 share/gnome/dia/shapes/MSE/node_center.shape
-share/gnome/dia/shapes/MSE/node_center.xpm
+share/gnome/dia/shapes/MSE/small_extension_node.png
 share/gnome/dia/shapes/MSE/small_extension_node.shape
-share/gnome/dia/shapes/MSE/small_extension_node.xpm
+share/gnome/dia/shapes/MSE/tacsat.png
 share/gnome/dia/shapes/MSE/tacsat.shape
-share/gnome/dia/shapes/MSE/tacsat.xpm
 share/gnome/dia/shapes/Map/Isometric/Block1.png
 share/gnome/dia/shapes/Map/Isometric/Block1.shape
 share/gnome/dia/shapes/Map/Isometric/Block2.png
@@ -925,187 +1045,200 @@ share/gnome/dia/shapes/Misc/file.png
 share/gnome/dia/shapes/Misc/file.shape
 share/gnome/dia/shapes/Misc/folder.png
 share/gnome/dia/shapes/Misc/folder.shape
+share/gnome/dia/shapes/Network/antenna.png
 share/gnome/dia/shapes/Network/antenna.shape
-share/gnome/dia/shapes/Network/antenna.xpm
+share/gnome/dia/shapes/Network/computer.png
 share/gnome/dia/shapes/Network/computer.shape
-share/gnome/dia/shapes/Network/computer.xpm
+share/gnome/dia/shapes/Network/dat_external.png
 share/gnome/dia/shapes/Network/dat_external.shape
-share/gnome/dia/shapes/Network/dat_external.xpm
 share/gnome/dia/shapes/Network/digitizing_board.png
 share/gnome/dia/shapes/Network/digitizing_board.shape
+share/gnome/dia/shapes/Network/disc.png
 share/gnome/dia/shapes/Network/disc.shape
-share/gnome/dia/shapes/Network/disc.xpm
+share/gnome/dia/shapes/Network/diskette.png
 share/gnome/dia/shapes/Network/diskette.shape
-share/gnome/dia/shapes/Network/diskette.xpm
+share/gnome/dia/shapes/Network/firewall.png
 share/gnome/dia/shapes/Network/firewall.shape
-share/gnome/dia/shapes/Network/firewall.xpm
+share/gnome/dia/shapes/Network/flash.png
 share/gnome/dia/shapes/Network/flash.shape
-share/gnome/dia/shapes/Network/flash.xpm
+share/gnome/dia/shapes/Network/genmonitor.png
 share/gnome/dia/shapes/Network/genmonitor.shape
-share/gnome/dia/shapes/Network/genmonitor.xpm
+share/gnome/dia/shapes/Network/hub.png
 share/gnome/dia/shapes/Network/hub.shape
-share/gnome/dia/shapes/Network/hub.xpm
+share/gnome/dia/shapes/Network/mobile_phone.png
 share/gnome/dia/shapes/Network/mobile_phone.shape
-share/gnome/dia/shapes/Network/mobile_phone.xpm
+share/gnome/dia/shapes/Network/modem.png
 share/gnome/dia/shapes/Network/modem.shape
-share/gnome/dia/shapes/Network/modem.xpm
+share/gnome/dia/shapes/Network/modularswitch.png
 share/gnome/dia/shapes/Network/modularswitch.shape
-share/gnome/dia/shapes/Network/modularswitch.xpm
+share/gnome/dia/shapes/Network/monitor.png
 share/gnome/dia/shapes/Network/monitor.shape
-share/gnome/dia/shapes/Network/monitor.xpm
+share/gnome/dia/shapes/Network/nwcloud.png
 share/gnome/dia/shapes/Network/nwcloud.shape
-share/gnome/dia/shapes/Network/nwcloud.xpm
+share/gnome/dia/shapes/Network/patch-panel.png
+share/gnome/dia/shapes/Network/patch-panel.shape
+share/gnome/dia/shapes/Network/pc_bigtower.png
 share/gnome/dia/shapes/Network/pc_bigtower.shape
-share/gnome/dia/shapes/Network/pc_bigtower.xpm
+share/gnome/dia/shapes/Network/pc_desktop.png
 share/gnome/dia/shapes/Network/pc_desktop.shape
-share/gnome/dia/shapes/Network/pc_desktop.xpm
+share/gnome/dia/shapes/Network/pc_miditower.png
 share/gnome/dia/shapes/Network/pc_miditower.shape
-share/gnome/dia/shapes/Network/pc_miditower.xpm
+share/gnome/dia/shapes/Network/pc_minitower.png
 share/gnome/dia/shapes/Network/pc_minitower.shape
-share/gnome/dia/shapes/Network/pc_minitower.xpm
 share/gnome/dia/shapes/Network/plotter.png
 share/gnome/dia/shapes/Network/plotter.shape
+share/gnome/dia/shapes/Network/printer.png
 share/gnome/dia/shapes/Network/printer.shape
-share/gnome/dia/shapes/Network/printer.xpm
+share/gnome/dia/shapes/Network/rj45plug.png
 share/gnome/dia/shapes/Network/rj45plug.shape
-share/gnome/dia/shapes/Network/rj45plug.xpm
+share/gnome/dia/shapes/Network/router-symbol.png
 share/gnome/dia/shapes/Network/router-symbol.shape
-share/gnome/dia/shapes/Network/router-symbol.xpm
+share/gnome/dia/shapes/Network/sceadplug.png
 share/gnome/dia/shapes/Network/sceadplug.shape
-share/gnome/dia/shapes/Network/sceadplug.xpm
+share/gnome/dia/shapes/Network/speaker.png
 share/gnome/dia/shapes/Network/speaker.shape
-share/gnome/dia/shapes/Network/speaker.xpm
+share/gnome/dia/shapes/Network/speaker_amp.png
 share/gnome/dia/shapes/Network/speaker_amp.shape
-share/gnome/dia/shapes/Network/speaker_amp.xpm
+share/gnome/dia/shapes/Network/switch-atm-symbol.png
 share/gnome/dia/shapes/Network/switch-atm-symbol.shape
-share/gnome/dia/shapes/Network/switch-atm-symbol.xpm
+share/gnome/dia/shapes/Network/switch-symbol.png
 share/gnome/dia/shapes/Network/switch-symbol.shape
-share/gnome/dia/shapes/Network/switch-symbol.xpm
 share/gnome/dia/shapes/Network/telephone.png
 share/gnome/dia/shapes/Network/telephone.shape
+share/gnome/dia/shapes/Network/workstation.png
 share/gnome/dia/shapes/Network/workstation.shape
-share/gnome/dia/shapes/Network/workstation.xpm
+share/gnome/dia/shapes/Network/zip-disk.png
 share/gnome/dia/shapes/Network/zip-disk.shape
-share/gnome/dia/shapes/Network/zip-disk.xpm
+share/gnome/dia/shapes/Pneumatic/cnx.png
 share/gnome/dia/shapes/Pneumatic/cnx.shape
-share/gnome/dia/shapes/Pneumatic/cnx.xpm
+share/gnome/dia/shapes/Pneumatic/comelec1.png
 share/gnome/dia/shapes/Pneumatic/comelec1.shape
-share/gnome/dia/shapes/Pneumatic/comelec1.xpm
+share/gnome/dia/shapes/Pneumatic/comelec2.png
 share/gnome/dia/shapes/Pneumatic/comelec2.shape
-share/gnome/dia/shapes/Pneumatic/comelec2.xpm
+share/gnome/dia/shapes/Pneumatic/commusc.png
 share/gnome/dia/shapes/Pneumatic/commusc.shape
-share/gnome/dia/shapes/Pneumatic/commusc.xpm
+share/gnome/dia/shapes/Pneumatic/compb.png
 share/gnome/dia/shapes/Pneumatic/compb.shape
-share/gnome/dia/shapes/Pneumatic/compb.xpm
+share/gnome/dia/shapes/Pneumatic/compilh.png
 share/gnome/dia/shapes/Pneumatic/compilh.shape
-share/gnome/dia/shapes/Pneumatic/compilh.xpm
+share/gnome/dia/shapes/Pneumatic/compilp.png
 share/gnome/dia/shapes/Pneumatic/compilp.shape
-share/gnome/dia/shapes/Pneumatic/compilp.xpm
+share/gnome/dia/shapes/Pneumatic/compush.png
 share/gnome/dia/shapes/Pneumatic/compush.shape
-share/gnome/dia/shapes/Pneumatic/compush.xpm
+share/gnome/dia/shapes/Pneumatic/comspr.png
 share/gnome/dia/shapes/Pneumatic/comspr.shape
-share/gnome/dia/shapes/Pneumatic/comspr.xpm
+share/gnome/dia/shapes/Pneumatic/dejack.png
 share/gnome/dia/shapes/Pneumatic/dejack.shape
-share/gnome/dia/shapes/Pneumatic/dejack.xpm
+share/gnome/dia/shapes/Pneumatic/dist22.png
 share/gnome/dia/shapes/Pneumatic/dist22.shape
-share/gnome/dia/shapes/Pneumatic/dist22.xpm
+share/gnome/dia/shapes/Pneumatic/dist32.png
 share/gnome/dia/shapes/Pneumatic/dist32.shape
-share/gnome/dia/shapes/Pneumatic/dist32.xpm
+share/gnome/dia/shapes/Pneumatic/dist42.png
 share/gnome/dia/shapes/Pneumatic/dist42.shape
-share/gnome/dia/shapes/Pneumatic/dist42.xpm
+share/gnome/dia/shapes/Pneumatic/dist52.png
 share/gnome/dia/shapes/Pneumatic/dist52.shape
-share/gnome/dia/shapes/Pneumatic/dist52.xpm
+share/gnome/dia/shapes/Pneumatic/drain.png
 share/gnome/dia/shapes/Pneumatic/drain.shape
-share/gnome/dia/shapes/Pneumatic/drain.xpm
+share/gnome/dia/shapes/Pneumatic/press.png
 share/gnome/dia/shapes/Pneumatic/press.shape
-share/gnome/dia/shapes/Pneumatic/press.xpm
+share/gnome/dia/shapes/Pneumatic/presshy.png
 share/gnome/dia/shapes/Pneumatic/presshy.shape
-share/gnome/dia/shapes/Pneumatic/presshy.xpm
+share/gnome/dia/shapes/Pneumatic/presspn.png
 share/gnome/dia/shapes/Pneumatic/presspn.shape
-share/gnome/dia/shapes/Pneumatic/presspn.xpm
+share/gnome/dia/shapes/Pneumatic/seijack.png
 share/gnome/dia/shapes/Pneumatic/seijack.shape
-share/gnome/dia/shapes/Pneumatic/seijack.xpm
+share/gnome/dia/shapes/Pneumatic/seojack.png
 share/gnome/dia/shapes/Pneumatic/seojack.shape
-share/gnome/dia/shapes/Pneumatic/seojack.xpm
+share/gnome/dia/shapes/RDP/arc.png
+share/gnome/dia/shapes/RDP/arc_inhibiteur.png
+share/gnome/dia/shapes/RDP/place.png
+share/gnome/dia/shapes/RDP/place.shape
+share/gnome/dia/shapes/RDP/place_marquee.png
+share/gnome/dia/shapes/RDP/place_marquee.shape
+share/gnome/dia/shapes/RDP/t_transition.png
+share/gnome/dia/shapes/RDP/t_transition.shape
+share/gnome/dia/shapes/RDP/transition.png
+share/gnome/dia/shapes/RDP/transition.shape
+share/gnome/dia/shapes/SDL/block.png
 share/gnome/dia/shapes/SDL/block.shape
-share/gnome/dia/shapes/SDL/block.xpm
+share/gnome/dia/shapes/SDL/comment.png
 share/gnome/dia/shapes/SDL/comment.shape
-share/gnome/dia/shapes/SDL/comment.xpm
+share/gnome/dia/shapes/SDL/decision.png
 share/gnome/dia/shapes/SDL/decision.shape
-share/gnome/dia/shapes/SDL/decision.xpm
+share/gnome/dia/shapes/SDL/function.png
 share/gnome/dia/shapes/SDL/function.shape
-share/gnome/dia/shapes/SDL/function.xpm
+share/gnome/dia/shapes/SDL/header.png
 share/gnome/dia/shapes/SDL/header.shape
-share/gnome/dia/shapes/SDL/header.xpm
+share/gnome/dia/shapes/SDL/inout.png
 share/gnome/dia/shapes/SDL/inout.shape
-share/gnome/dia/shapes/SDL/inout.xpm
+share/gnome/dia/shapes/SDL/macro.png
 share/gnome/dia/shapes/SDL/macro.shape
-share/gnome/dia/shapes/SDL/macro.xpm
+share/gnome/dia/shapes/SDL/note.png
 share/gnome/dia/shapes/SDL/note.shape
-share/gnome/dia/shapes/SDL/note.xpm
+share/gnome/dia/shapes/SDL/process.png
 share/gnome/dia/shapes/SDL/process.shape
-share/gnome/dia/shapes/SDL/process.xpm
+share/gnome/dia/shapes/SDL/receive.png
 share/gnome/dia/shapes/SDL/receive.shape
-share/gnome/dia/shapes/SDL/receive.xpm
+share/gnome/dia/shapes/SDL/return.png
 share/gnome/dia/shapes/SDL/return.shape
-share/gnome/dia/shapes/SDL/return.xpm
+share/gnome/dia/shapes/SDL/save.png
 share/gnome/dia/shapes/SDL/save.shape
-share/gnome/dia/shapes/SDL/save.xpm
+share/gnome/dia/shapes/SDL/send.png
 share/gnome/dia/shapes/SDL/send.shape
-share/gnome/dia/shapes/SDL/send.xpm
+share/gnome/dia/shapes/SDL/service.png
 share/gnome/dia/shapes/SDL/service.shape
-share/gnome/dia/shapes/SDL/service.xpm
+share/gnome/dia/shapes/SDL/state.png
 share/gnome/dia/shapes/SDL/state.shape
-share/gnome/dia/shapes/SDL/state.xpm
+share/gnome/dia/shapes/SDL/stop.png
 share/gnome/dia/shapes/SDL/stop.shape
-share/gnome/dia/shapes/SDL/stop.xpm
+share/gnome/dia/shapes/SDL/task.png
 share/gnome/dia/shapes/SDL/task.shape
-share/gnome/dia/shapes/SDL/task.xpm
+share/gnome/dia/shapes/jigsaw/part_iiii.png
 share/gnome/dia/shapes/jigsaw/part_iiii.shape
-share/gnome/dia/shapes/jigsaw/part_iiii.xpm
+share/gnome/dia/shapes/jigsaw/part_iiio.png
 share/gnome/dia/shapes/jigsaw/part_iiio.shape
-share/gnome/dia/shapes/jigsaw/part_iiio.xpm
+share/gnome/dia/shapes/jigsaw/part_iioi.png
 share/gnome/dia/shapes/jigsaw/part_iioi.shape
-share/gnome/dia/shapes/jigsaw/part_iioi.xpm
+share/gnome/dia/shapes/jigsaw/part_iioo.png
 share/gnome/dia/shapes/jigsaw/part_iioo.shape
-share/gnome/dia/shapes/jigsaw/part_iioo.xpm
+share/gnome/dia/shapes/jigsaw/part_ioii.png
 share/gnome/dia/shapes/jigsaw/part_ioii.shape
-share/gnome/dia/shapes/jigsaw/part_ioii.xpm
+share/gnome/dia/shapes/jigsaw/part_ioio.png
 share/gnome/dia/shapes/jigsaw/part_ioio.shape
-share/gnome/dia/shapes/jigsaw/part_ioio.xpm
+share/gnome/dia/shapes/jigsaw/part_iooi.png
 share/gnome/dia/shapes/jigsaw/part_iooi.shape
-share/gnome/dia/shapes/jigsaw/part_iooi.xpm
+share/gnome/dia/shapes/jigsaw/part_iooo.png
 share/gnome/dia/shapes/jigsaw/part_iooo.shape
-share/gnome/dia/shapes/jigsaw/part_iooo.xpm
+share/gnome/dia/shapes/jigsaw/part_oiii.png
 share/gnome/dia/shapes/jigsaw/part_oiii.shape
-share/gnome/dia/shapes/jigsaw/part_oiii.xpm
+share/gnome/dia/shapes/jigsaw/part_oiio.png
 share/gnome/dia/shapes/jigsaw/part_oiio.shape
-share/gnome/dia/shapes/jigsaw/part_oiio.xpm
+share/gnome/dia/shapes/jigsaw/part_oioi.png
 share/gnome/dia/shapes/jigsaw/part_oioi.shape
-share/gnome/dia/shapes/jigsaw/part_oioi.xpm
+share/gnome/dia/shapes/jigsaw/part_oioo.png
 share/gnome/dia/shapes/jigsaw/part_oioo.shape
-share/gnome/dia/shapes/jigsaw/part_oioo.xpm
+share/gnome/dia/shapes/jigsaw/part_ooii.png
 share/gnome/dia/shapes/jigsaw/part_ooii.shape
-share/gnome/dia/shapes/jigsaw/part_ooii.xpm
+share/gnome/dia/shapes/jigsaw/part_ooio.png
 share/gnome/dia/shapes/jigsaw/part_ooio.shape
-share/gnome/dia/shapes/jigsaw/part_ooio.xpm
+share/gnome/dia/shapes/jigsaw/part_oooi.png
 share/gnome/dia/shapes/jigsaw/part_oooi.shape
-share/gnome/dia/shapes/jigsaw/part_oooi.xpm
+share/gnome/dia/shapes/jigsaw/part_oooo.png
 share/gnome/dia/shapes/jigsaw/part_oooo.shape
-share/gnome/dia/shapes/jigsaw/part_oooo.xpm
+share/gnome/dia/shapes/sybase/client.png
 share/gnome/dia/shapes/sybase/client.shape
-share/gnome/dia/shapes/sybase/client.xpm
+share/gnome/dia/shapes/sybase/dataserver.png
 share/gnome/dia/shapes/sybase/dataserver.shape
-share/gnome/dia/shapes/sybase/dataserver.xpm
+share/gnome/dia/shapes/sybase/ltm.png
 share/gnome/dia/shapes/sybase/ltm.shape
-share/gnome/dia/shapes/sybase/ltm.xpm
+share/gnome/dia/shapes/sybase/repserver.png
 share/gnome/dia/shapes/sybase/repserver.shape
-share/gnome/dia/shapes/sybase/repserver.xpm
+share/gnome/dia/shapes/sybase/rsm.png
 share/gnome/dia/shapes/sybase/rsm.shape
-share/gnome/dia/shapes/sybase/rsm.xpm
+share/gnome/dia/shapes/sybase/stableq.png
 share/gnome/dia/shapes/sybase/stableq.shape
-share/gnome/dia/shapes/sybase/stableq.xpm
 share/gnome/dia/sheets/Assorted.sheet
+share/gnome/dia/sheets/ChemEng.sheet
 share/gnome/dia/sheets/Circuit.sheet
 share/gnome/dia/sheets/Contact.sheet
 share/gnome/dia/sheets/Cybernetics.sheet
@@ -1123,6 +1256,40 @@ share/gnome/dia/sheets/GRAFCET/etapems.xpm
 share/gnome/dia/sheets/GRAFCET/etapesp.xpm
 share/gnome/dia/sheets/GRAFCET/vergent_and.xpm
 share/gnome/dia/sheets/IsometricMap.sheet
+share/gnome/dia/sheets/Istar.sheet
+share/gnome/dia/sheets/Istar/agent.xpm
+share/gnome/dia/sheets/Istar/decomposition.xpm
+share/gnome/dia/sheets/Istar/dependency.xpm
+share/gnome/dia/sheets/Istar/goal.xpm
+share/gnome/dia/sheets/Istar/means_ends.xpm
+share/gnome/dia/sheets/Istar/neg_contrib.xpm
+share/gnome/dia/sheets/Istar/pos_contrib.xpm
+share/gnome/dia/sheets/Istar/position.xpm
+share/gnome/dia/sheets/Istar/role.xpm
+share/gnome/dia/sheets/Istar/task.xpm
+share/gnome/dia/sheets/Jackson.sheet
+share/gnome/dia/sheets/Jackson/designed_domain.xpm
+share/gnome/dia/sheets/Jackson/machine_domain.xpm
+share/gnome/dia/sheets/Jackson/req_phen.xpm
+share/gnome/dia/sheets/KAOS.sheet
+share/gnome/dia/sheets/KAOS/and-complete-ref.xpm
+share/gnome/dia/sheets/KAOS/and-ref.xpm
+share/gnome/dia/sheets/KAOS/assumption.xpm
+share/gnome/dia/sheets/KAOS/capable-of.xpm
+share/gnome/dia/sheets/KAOS/conflicts.xpm
+share/gnome/dia/sheets/KAOS/controls.xpm
+share/gnome/dia/sheets/KAOS/input.xpm
+share/gnome/dia/sheets/KAOS/monitors.xpm
+share/gnome/dia/sheets/KAOS/obstacle.xpm
+share/gnome/dia/sheets/KAOS/obstructs.xpm
+share/gnome/dia/sheets/KAOS/op-ref.xpm
+share/gnome/dia/sheets/KAOS/or-complete-ref.xpm
+share/gnome/dia/sheets/KAOS/or-ref.xpm
+share/gnome/dia/sheets/KAOS/output.xpm
+share/gnome/dia/sheets/KAOS/performs.xpm
+share/gnome/dia/sheets/KAOS/requirement.xpm
+share/gnome/dia/sheets/KAOS/responsibility.xpm
+share/gnome/dia/sheets/KAOS/softgoal.xpm
 share/gnome/dia/sheets/Logic.sheet
 share/gnome/dia/sheets/MSE.sheet
 share/gnome/dia/sheets/Misc.sheet
@@ -1130,11 +1297,11 @@ share/gnome/dia/sheets/Pneumatic.sheet
 share/gnome/dia/sheets/SADT.sheet
 share/gnome/dia/sheets/SDL.sheet
 share/gnome/dia/sheets/UML.sheet
-share/gnome/dia/sheets/UML/aggregation.xpm
-share/gnome/dia/sheets/UML/eventsink.xpm
-share/gnome/dia/sheets/UML/eventsource.xpm
-share/gnome/dia/sheets/UML/receptacle.xpm
-share/gnome/dia/sheets/UML/umlclass_template.xpm
+share/gnome/dia/sheets/UML/aggregation.png
+share/gnome/dia/sheets/UML/eventsink.png
+share/gnome/dia/sheets/UML/eventsource.png
+share/gnome/dia/sheets/UML/receptacle.png
+share/gnome/dia/sheets/UML/umlclass_template.png
 share/gnome/dia/sheets/chronogram.sheet
 share/gnome/dia/sheets/ciscocomputer.sheet
 share/gnome/dia/sheets/ciscohub.sheet
@@ -1181,6 +1348,7 @@ share/locale/es/LC_MESSAGES/dia.mo
 share/locale/fi/LC_MESSAGES/dia.mo
 share/locale/fr/LC_MESSAGES/dia.mo
 share/locale/ga/LC_MESSAGES/dia.mo
+share/locale/gu/LC_MESSAGES/dia.mo
 share/locale/hr/LC_MESSAGES/dia.mo
 share/locale/hu/LC_MESSAGES/dia.mo
 share/locale/is/LC_MESSAGES/dia.mo
@@ -1218,12 +1386,16 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/help/dia
 @dirrm share/gnome/dia/xslt
 @dirrm share/gnome/dia/sheets/UML
+@dirrm share/gnome/dia/sheets/KAOS
+@dirrm share/gnome/dia/sheets/Jackson
+@dirrm share/gnome/dia/sheets/Istar
 @dirrm share/gnome/dia/sheets/GRAFCET
 @dirrm share/gnome/dia/sheets/ER
 @dirrm share/gnome/dia/sheets
 @dirrm share/gnome/dia/shapes/sybase
 @dirrm share/gnome/dia/shapes/jigsaw
 @dirrm share/gnome/dia/shapes/SDL
+@dirrm share/gnome/dia/shapes/RDP
 @dirrm share/gnome/dia/shapes/Pneumatic
 @dirrm share/gnome/dia/shapes/Network
 @dirrm share/gnome/dia/shapes/Misc
@@ -1238,6 +1410,7 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/dia/shapes/Civil
 @dirrm share/gnome/dia/shapes/Cisco
 @dirrm share/gnome/dia/shapes/Circuit
+@dirrm share/gnome/dia/shapes/ChemEng
 @dirrm share/gnome/dia/shapes/Assorted
 @dirrm share/gnome/dia/shapes
 %%PYTHON:%%@dirrm share/gnome/dia/python