6 files changed, 347 insertions, 314 deletions

diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index e5fc1484e552..6daccfa72e70 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	dia
-PORTVERSION=	0.94
-PORTREVISION=	6
+PORTVERSION=	0.95
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.94
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
diff --git a/graphics/dia/distinfo b/graphics/dia/distinfo
index 008ba8877dbf..661b44c859e7 100644
--- a/graphics/dia/distinfo
+++ b/graphics/dia/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/dia-0.94.tar.bz2) = 63584224912dab49fed8d2cf87ea2d85
-SHA256 (gnome2/dia-0.94.tar.bz2) = 0a621123806d78ad66c3ee34a2e3509cca371d73c0694969c17c2081e259f259
-SIZE (gnome2/dia-0.94.tar.bz2) = 3348869
+MD5 (gnome2/dia-0.95.tar.bz2) = d319921a91d4600df3578a4a64416393
+SHA256 (gnome2/dia-0.95.tar.bz2) = be505ca1632ab1e573c034f2954dfc18fd4679b095e84900bcaaeaaefa0241c4
+SIZE (gnome2/dia-0.95.tar.bz2) = 4202618
diff --git a/graphics/dia/files/patch-CVE-2006-1550 b/graphics/dia/files/patch-CVE-2006-1550
deleted file mode 100644
index f14c1377bd65..000000000000
--- a/graphics/dia/files/patch-CVE-2006-1550
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -u plug-ins/xfig/xfig.h plug-ins/xfig/xfig.h
---- plug-ins/xfig/xfig.h	2004-08-16 09:56:21.000000000 +0200
-+++ plug-ins/xfig/xfig.h	2006-03-29 21:40:15.000000000 +0200
-@@ -6,6 +6,7 @@
- 
- #define FIG_MAX_DEFAULT_COLORS 32
- #define FIG_MAX_USER_COLORS 512
-+#define FIG_MAX_DEPTHS 1000
- /* 1200 PPI */
- #define FIG_UNIT 472.440944881889763779527559055118
- /* 1/80 inch */
-diff -u plug-ins/xfig/xfig-import.c plug-ins/xfig/xfig-import.c
---- plug-ins/xfig/xfig-import.c	2004-08-16 09:56:21.000000000 +0200
-+++ plug-ins/xfig/xfig-import.c	2006-03-29 21:40:21.000000000 +0200
-@@ -441,11 +441,17 @@
- static Color
- fig_color(int color_index) 
- {
--    if (color_index == -1) 
-+    if (color_index <= -1) 
-         return color_black; /* Default color */
--    if (color_index < FIG_MAX_DEFAULT_COLORS) 
-+    else if (color_index < FIG_MAX_DEFAULT_COLORS) 
-         return fig_default_colors[color_index];
--    else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
-+    else if (color_index < FIG_MAX_USER_COLORS) 
-+	return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS];
-+    else {
-+	message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."),
-+		      color_index);
-+	return color_black;
-+    }
- }
- 
- static Color
-@@ -563,23 +569,25 @@
- static int
- fig_read_n_points(FILE *file, int n, Point **points) {
-     int i;
--    Point *new_points;
--
--    new_points = (Point*)g_malloc(sizeof(Point)*n);
-+    GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n);
- 
-     for (i = 0; i < n; i++) {
- 	int x,y;
-+	Point p;
- 	if (fscanf(file, " %d %d ", &x, &y) != 2) {
- 	    message_error(_("Error while reading %dth of %d points: %s\n"),
- 			  i, n, strerror(errno));
--	    free(new_points);
-+	    g_array_free(points_list, TRUE);
- 	    return FALSE;
- 	}
--	new_points[i].x = x/FIG_UNIT;
--	new_points[i].y = y/FIG_UNIT;
-+	p.x = x/FIG_UNIT;
-+	p.y = y/FIG_UNIT;
-+	g_array_append_val(points_list, p);
-     }
-     fscanf(file, "\n");
--    *points = new_points;
-+    
-+    *points = (Point *)points_list->data;
-+    g_array_free(points_list, FALSE);
-     return TRUE;
- }
- 
-@@ -683,7 +691,7 @@
-     return text_buf;
- }
- 
--static GList *depths[1000];
-+static GList *depths[FIG_MAX_DEPTHS];
- 
- /* If there's something in the compound stack, we ignore the depth field,
-    as it will be determined by the group anyway */
-@@ -693,6 +701,26 @@
-    level.  Best we can do now. */
- static int compound_depth;
- 
-+/** Add an object at a given depth.  This function checks for depth limits
-+ * and updates the compound depth if needed.
-+ *
-+ * @param newobj An object to add.  If we're inside a compound, this
-+ * doesn't really add the object.
-+ * @param depth A depth as in the Fig format, max 999
-+ */
-+static void
-+add_at_depth(DiaObject *newobj, int depth) {
-+    if (depth < 0 || depth >= FIG_MAX_DEPTHS) {
-+	message_error(_("Depth %d of of range, only 0-%d allowed.\n"),
-+		      depth, FIG_MAX_DEPTHS-1);
-+	depth = FIG_MAX_DEPTHS - 1;
-+    }
-+    if (compound_stack == NULL) 
-+	depths[depth] = g_list_append(depths[depth], newobj);
-+    else 
-+	if (compound_depth > depth) compound_depth = depth;
-+}
-+
- static DiaObject *
- fig_read_ellipse(FILE *file, DiagramData *dia) {
-     int sub_type;
-@@ -749,10 +777,7 @@
-     /* Angle -- can't rotate yet */
- 
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-     return newobj;
- }
-@@ -885,10 +910,7 @@
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
-  exit:
-     prop_list_free(props);
-     g_free(forward_arrow_info);
-@@ -1111,10 +1133,7 @@
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
-  exit:
-     prop_list_free(props);
-     g_free(forward_arrow_info);
-@@ -1202,10 +1221,7 @@
-     /* Cap style */
-      
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-  exit:
-     g_free(forward_arrow_info);
-@@ -1298,10 +1314,7 @@
-     newobj->ops->set_props(newobj, props);
-     
-     /* Depth field */
--    if (compound_stack == NULL)
--	depths[depth] = g_list_append(depths[depth], newobj);
--    else
--	if (compound_depth > depth) compound_depth = depth;
-+    add_at_depth(newobj, depth);
- 
-  exit:
-     if (text_buf != NULL) free(text_buf);
-@@ -1347,6 +1360,12 @@
- 	    return FALSE;
- 	}
- 
-+	if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) {
-+	    message_error(_("Color number %d out of range 0..%d.  Discarding color.\n"),
-+			  colornumber, FIG_MAX_USER_COLORS);
-+	    return FALSE;
-+	}
-+
- 	color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0;
- 	color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0;
- 	color.blue = (colorvalues & 0x000000ff) / 255.0;
-@@ -1393,7 +1412,7 @@
- 	}
- 	/* Group extends don't really matter */
- 	if (compound_stack == NULL)
--	    compound_depth = 999;
-+	    compound_depth = FIG_MAX_DEPTHS - 1;
- 	compound_stack = g_slist_append(compound_stack, NULL);
- 	return TRUE;
- 	break;
-@@ -1551,7 +1570,7 @@
-     for (i = 0; i < FIG_MAX_USER_COLORS; i++) {
- 	fig_colors[i] = color_black;
-     }
--    for (i = 0; i < 1000; i++) {
-+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
- 	depths[i] = NULL;
-     }
- 
-@@ -1606,7 +1625,7 @@
-     } while (TRUE);
- 
-     /* Now we can reorder for the depth fields */
--    for (i = 0; i < 1000; i++) {
-+    for (i = 0; i < FIG_MAX_DEPTHS; i++) {
- 	if (depths[i] != NULL)
- 	    layer_add_objects_first(dia->active_layer, depths[i]);
-     }
diff --git a/graphics/dia/files/patch-ag b/graphics/dia/files/patch-ag
deleted file mode 100644
index 30f688242da2..000000000000
--- a/graphics/dia/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/plug-ins.c.orig	Mon Aug  7 13:51:41 2000
-+++ lib/plug-ins.c	Mon Aug  7 13:52:01 2000
-@@ -45,7 +45,7 @@
- #  define PLUG_IN_EXT_LEN 4
- #else
- /* this one should work on any platform where libtool is used to compile dia */
--#  define PLUG_IN_EXT ".la"
-+#  define PLUG_IN_EXT ".so"
- #  define PLUG_IN_EXT_LEN 3
- #endif
- 
diff --git a/graphics/dia/files/patch-sheets_ER.sheet.in b/graphics/dia/files/patch-sheets_ER.sheet.in
deleted file mode 100644
index 8082c33ed17f..000000000000
--- a/graphics/dia/files/patch-sheets_ER.sheet.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sheets/ER.sheet.in~	Sat Nov 19 11:49:51 2005
-+++ sheets/ER.sheet.in	Sat Nov 19 11:49:51 2005
-@@ -8,7 +8,7 @@
-     </object>
-     <object name="ER - Entity" intdata="1">
-       <_description>Weak entity</_description>
--      <icon>ER/weakentity.png</icon>
-+      <icon>ER/weakentity.xpm</icon>
-     </object>
-     <object name="ER - Relationship">
-       <_description>Relationship</_description>
diff --git a/graphics/dia/pkg-plist b/graphics/dia/pkg-plist
index d87fce714003..3091f40f6096 100644
--- a/graphics/dia/pkg-plist
+++ b/graphics/dia/pkg-plist
@@ -1,4 +1,6 @@
 bin/dia
+lib/dia/libaadl_objects.la
+lib/dia/libaadl_objects.so
 lib/dia/libbondgraph_objects.la
 lib/dia/libbondgraph_objects.so
 lib/dia/libcairo_filter.la
@@ -35,6 +37,8 @@ lib/dia/libmisc_objects.la
 lib/dia/libmisc_objects.so
 lib/dia/libnetwork_objects.la
 lib/dia/libnetwork_objects.so
+lib/dia/libpgf_filter.la
+lib/dia/libpgf_filter.so
 lib/dia/libpixbuf_filter.la
 lib/dia/libpixbuf_filter.so
 lib/dia/libpstricks_filter.la
@@ -51,8 +55,6 @@ lib/dia/libsvg_filter.la
 lib/dia/libsvg_filter.so
 lib/dia/libuml_objects.la
 lib/dia/libuml_objects.so
-lib/dia/libwmf_filter.la
-lib/dia/libwmf_filter.so
 lib/dia/libwpg_filter.la
 lib/dia/libwpg_filter.so
 lib/dia/libxfig_filter.la
@@ -62,19 +64,11 @@ lib/dia/libxslt_filter.so
 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/codegen.py
 %%PYTHON:%%share/gnome/dia/python/diasvg.py
 %%PYTHON:%%share/gnome/dia/python/diasvg_import.py
+%%PYTHON:%%share/gnome/dia/python/dot.py
 %%PYTHON:%%share/gnome/dia/python/group_props.py
 %%PYTHON:%%share/gnome/dia/python/gtkcons.py
 %%PYTHON:%%share/gnome/dia/python/otypes.py
@@ -335,6 +329,8 @@ share/gnome/dia/shapes/Cisco/10700.png
 share/gnome/dia/shapes/Cisco/10700.shape
 share/gnome/dia/shapes/Cisco/15200.png
 share/gnome/dia/shapes/Cisco/15200.shape
+share/gnome/dia/shapes/Cisco/15800.png
+share/gnome/dia/shapes/Cisco/15800.shape
 share/gnome/dia/shapes/Cisco/3174.png
 share/gnome/dia/shapes/Cisco/3174.shape
 share/gnome/dia/shapes/Cisco/3x74.png
@@ -357,10 +353,18 @@ share/gnome/dia/shapes/Cisco/7505.png
 share/gnome/dia/shapes/Cisco/7505.shape
 share/gnome/dia/shapes/Cisco/7507.png
 share/gnome/dia/shapes/Cisco/7507.shape
+share/gnome/dia/shapes/Cisco/access_gateway.png
+share/gnome/dia/shapes/Cisco/access_gateway.shape
+share/gnome/dia/shapes/Cisco/access_server.png
+share/gnome/dia/shapes/Cisco/access_server.shape
 share/gnome/dia/shapes/Cisco/accesspoint.png
 share/gnome/dia/shapes/Cisco/accesspoint.shape
 share/gnome/dia/shapes/Cisco/adm.png
 share/gnome/dia/shapes/Cisco/adm.shape
+share/gnome/dia/shapes/Cisco/androgynous_person.png
+share/gnome/dia/shapes/Cisco/androgynous_person.shape
+share/gnome/dia/shapes/Cisco/antenna.png
+share/gnome/dia/shapes/Cisco/antenna.shape
 share/gnome/dia/shapes/Cisco/asic.png
 share/gnome/dia/shapes/Cisco/asic.shape
 share/gnome/dia/shapes/Cisco/ata.png
@@ -369,22 +373,27 @@ share/gnome/dia/shapes/Cisco/atm3800.png
 share/gnome/dia/shapes/Cisco/atm3800.shape
 share/gnome/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
 share/gnome/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
-share/gnome/dia/shapes/Cisco/atm_router.png
 share/gnome/dia/shapes/Cisco/atm_router.shape
 share/gnome/dia/shapes/Cisco/atm_switch.png
 share/gnome/dia/shapes/Cisco/atm_switch.shape
-share/gnome/dia/shapes/Cisco/atm_tag_sw_gigabit_router.png
-share/gnome/dia/shapes/Cisco/atm_tag_sw_gigabit_router.shape
 share/gnome/dia/shapes/Cisco/atm_tag_switch_router.png
 share/gnome/dia/shapes/Cisco/atm_tag_switch_router.shape
+share/gnome/dia/shapes/Cisco/automatic_protection_switching.png
+share/gnome/dia/shapes/Cisco/automatic_protection_switching.shape
 share/gnome/dia/shapes/Cisco/bbfw.png
 share/gnome/dia/shapes/Cisco/bbfw.shape
 share/gnome/dia/shapes/Cisco/bbfw_media.png
 share/gnome/dia/shapes/Cisco/bbfw_media.shape
+share/gnome/dia/shapes/Cisco/bbs.png
+share/gnome/dia/shapes/Cisco/bbs.shape
 share/gnome/dia/shapes/Cisco/bbsm.png
 share/gnome/dia/shapes/Cisco/bbsm.shape
 share/gnome/dia/shapes/Cisco/branch_office.png
 share/gnome/dia/shapes/Cisco/branch_office.shape
+share/gnome/dia/shapes/Cisco/branch_office_blue.png
+share/gnome/dia/shapes/Cisco/branch_office_blue.shape
+share/gnome/dia/shapes/Cisco/branch_office_subdued.png
+share/gnome/dia/shapes/Cisco/branch_office_subdued.shape
 share/gnome/dia/shapes/Cisco/breakout_box.png
 share/gnome/dia/shapes/Cisco/breakout_box.shape
 share/gnome/dia/shapes/Cisco/bridge.png
@@ -401,44 +410,74 @@ share/gnome/dia/shapes/Cisco/callmanager.png
 share/gnome/dia/shapes/Cisco/callmanager.shape
 share/gnome/dia/shapes/Cisco/car.png
 share/gnome/dia/shapes/Cisco/car.shape
+share/gnome/dia/shapes/Cisco/carrier_routing_system.png
+share/gnome/dia/shapes/Cisco/carrier_routing_system.shape
 share/gnome/dia/shapes/Cisco/catalyst_access_gateway.png
 share/gnome/dia/shapes/Cisco/catalyst_access_gateway.shape
-share/gnome/dia/shapes/Cisco/cddi_fddi.png
-share/gnome/dia/shapes/Cisco/cddi_fddi.shape
+share/gnome/dia/shapes/Cisco/cddi_fddi_concentrator.png
+share/gnome/dia/shapes/Cisco/cddi_fddi_concentrator.shape
 share/gnome/dia/shapes/Cisco/cdm.png
 share/gnome/dia/shapes/Cisco/cdm.shape
 share/gnome/dia/shapes/Cisco/cellular_phone.png
 share/gnome/dia/shapes/Cisco/cellular_phone.shape
-share/gnome/dia/shapes/Cisco/centri.png
-share/gnome/dia/shapes/Cisco/centri.shape
+share/gnome/dia/shapes/Cisco/centri_firewall.png
+share/gnome/dia/shapes/Cisco/centri_firewall.shape
+share/gnome/dia/shapes/Cisco/channelized_pipe.png
+share/gnome/dia/shapes/Cisco/channelized_pipe.shape
 share/gnome/dia/shapes/Cisco/cisco_hub.png
 share/gnome/dia/shapes/Cisco/cisco_hub.shape
 share/gnome/dia/shapes/Cisco/ciscosecurity.png
 share/gnome/dia/shapes/Cisco/ciscosecurity.shape
 share/gnome/dia/shapes/Cisco/ciscoworks.png
 share/gnome/dia/shapes/Cisco/ciscoworks.shape
+share/gnome/dia/shapes/Cisco/ciscoworks_man.png
+share/gnome/dia/shapes/Cisco/ciscoworks_man.shape
 share/gnome/dia/shapes/Cisco/class45_switch.png
 share/gnome/dia/shapes/Cisco/class45_switch.shape
 share/gnome/dia/shapes/Cisco/cloud.png
 share/gnome/dia/shapes/Cisco/cloud.shape
+share/gnome/dia/shapes/Cisco/cloud_dark.png
+share/gnome/dia/shapes/Cisco/cloud_dark.shape
+share/gnome/dia/shapes/Cisco/cloud_gold.png
+share/gnome/dia/shapes/Cisco/cloud_gold.shape
+share/gnome/dia/shapes/Cisco/cloud_white.png
+share/gnome/dia/shapes/Cisco/cloud_white.shape
 share/gnome/dia/shapes/Cisco/communications_server.png
 share/gnome/dia/shapes/Cisco/communications_server.shape
+share/gnome/dia/shapes/Cisco/concatenated_payload.png
+share/gnome/dia/shapes/Cisco/concatenated_payload.shape
 share/gnome/dia/shapes/Cisco/content_engine.png
 share/gnome/dia/shapes/Cisco/content_engine.shape
-share/gnome/dia/shapes/Cisco/content_service_router.png
-share/gnome/dia/shapes/Cisco/content_service_router.shape
+share/gnome/dia/shapes/Cisco/content_router.png
+share/gnome/dia/shapes/Cisco/content_router.shape
+share/gnome/dia/shapes/Cisco/content_service_module.png
+share/gnome/dia/shapes/Cisco/content_service_module.shape
 share/gnome/dia/shapes/Cisco/content_switch.png
 share/gnome/dia/shapes/Cisco/content_switch.shape
-share/gnome/dia/shapes/Cisco/content_switch_module.png
-share/gnome/dia/shapes/Cisco/content_switch_module.shape
 share/gnome/dia/shapes/Cisco/css1100.png
 share/gnome/dia/shapes/Cisco/css1100.shape
+share/gnome/dia/shapes/Cisco/csm-s.png
+share/gnome/dia/shapes/Cisco/csm-s.shape
 share/gnome/dia/shapes/Cisco/csu_dsu.png
 share/gnome/dia/shapes/Cisco/csu_dsu.shape
 share/gnome/dia/shapes/Cisco/cte.png
 share/gnome/dia/shapes/Cisco/cte.shape
+share/gnome/dia/shapes/Cisco/data_center_switch.png
+share/gnome/dia/shapes/Cisco/data_center_switch.shape
+share/gnome/dia/shapes/Cisco/data_center_switch_reversed.png
+share/gnome/dia/shapes/Cisco/data_center_switch_reversed.shape
+share/gnome/dia/shapes/Cisco/data_switch_processor.png
+share/gnome/dia/shapes/Cisco/data_switch_processor.shape
+share/gnome/dia/shapes/Cisco/detector.png
+share/gnome/dia/shapes/Cisco/detector.shape
+share/gnome/dia/shapes/Cisco/digital_cross-connect.png
+share/gnome/dia/shapes/Cisco/digital_cross-connect.shape
+share/gnome/dia/shapes/Cisco/director_fcis.png
+share/gnome/dia/shapes/Cisco/director_fcis.shape
 share/gnome/dia/shapes/Cisco/directory_server.png
 share/gnome/dia/shapes/Cisco/directory_server.shape
+share/gnome/dia/shapes/Cisco/disk_subsystem.png
+share/gnome/dia/shapes/Cisco/disk_subsystem.shape
 share/gnome/dia/shapes/Cisco/diskette.png
 share/gnome/dia/shapes/Cisco/diskette.shape
 share/gnome/dia/shapes/Cisco/distributed_director.png
@@ -449,10 +488,17 @@ share/gnome/dia/shapes/Cisco/dpt.png
 share/gnome/dia/shapes/Cisco/dpt.shape
 share/gnome/dia/shapes/Cisco/dslam.png
 share/gnome/dia/shapes/Cisco/dslam.shape
+share/gnome/dia/shapes/Cisco/dual_mode_accesspoint.png
+share/gnome/dia/shapes/Cisco/dual_mode_accesspoint.shape
 share/gnome/dia/shapes/Cisco/dwdm_filter.png
 share/gnome/dia/shapes/Cisco/dwdm_filter.shape
+share/gnome/dia/shapes/Cisco/edge_label_switch_router.png
+share/gnome/dia/shapes/Cisco/edge_label_switch_router_with_netflow.png
+share/gnome/dia/shapes/Cisco/edge_label_switch_router_with_netflow.shape
 share/gnome/dia/shapes/Cisco/end_office.png
 share/gnome/dia/shapes/Cisco/end_office.shape
+share/gnome/dia/shapes/Cisco/etherclient.png
+share/gnome/dia/shapes/Cisco/etherclient.shape
 share/gnome/dia/shapes/Cisco/fax.png
 share/gnome/dia/shapes/Cisco/fax.shape
 share/gnome/dia/shapes/Cisco/fc_storage.png
@@ -461,16 +507,28 @@ share/gnome/dia/shapes/Cisco/fddi_ring.png
 share/gnome/dia/shapes/Cisco/fddi_ring.shape
 share/gnome/dia/shapes/Cisco/file_cabinet.png
 share/gnome/dia/shapes/Cisco/file_cabinet.shape
+share/gnome/dia/shapes/Cisco/file_engine.png
+share/gnome/dia/shapes/Cisco/file_engine.shape
 share/gnome/dia/shapes/Cisco/file_server.png
 share/gnome/dia/shapes/Cisco/file_server.shape
 share/gnome/dia/shapes/Cisco/firewall.png
 share/gnome/dia/shapes/Cisco/firewall.shape
+share/gnome/dia/shapes/Cisco/firewall_horizontal.png
+share/gnome/dia/shapes/Cisco/firewall_horizontal.shape
+share/gnome/dia/shapes/Cisco/firewall_subdued.png
+share/gnome/dia/shapes/Cisco/firewall_subdued.shape
 share/gnome/dia/shapes/Cisco/front_end_processor.png
 share/gnome/dia/shapes/Cisco/front_end_processor.shape
+share/gnome/dia/shapes/Cisco/fwsm.png
+share/gnome/dia/shapes/Cisco/fwsm.shape
 share/gnome/dia/shapes/Cisco/general_appliance.png
 share/gnome/dia/shapes/Cisco/general_appliance.shape
 share/gnome/dia/shapes/Cisco/generic_building.png
 share/gnome/dia/shapes/Cisco/generic_building.shape
+share/gnome/dia/shapes/Cisco/generic_building_blue.png
+share/gnome/dia/shapes/Cisco/generic_building_blue.shape
+share/gnome/dia/shapes/Cisco/generic_building_subdued.png
+share/gnome/dia/shapes/Cisco/generic_building_subdued.shape
 share/gnome/dia/shapes/Cisco/generic_gateway.png
 share/gnome/dia/shapes/Cisco/generic_gateway.shape
 share/gnome/dia/shapes/Cisco/generic_processor.png
@@ -481,22 +539,36 @@ share/gnome/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
 share/gnome/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
 share/gnome/dia/shapes/Cisco/government_building.png
 share/gnome/dia/shapes/Cisco/government_building.shape
+share/gnome/dia/shapes/Cisco/guard.png
+share/gnome/dia/shapes/Cisco/guard.shape
 share/gnome/dia/shapes/Cisco/h323.png
 share/gnome/dia/shapes/Cisco/h323.shape
 share/gnome/dia/shapes/Cisco/handheld.png
 share/gnome/dia/shapes/Cisco/handheld.shape
+share/gnome/dia/shapes/Cisco/headphones.png
+share/gnome/dia/shapes/Cisco/headphones.shape
+share/gnome/dia/shapes/Cisco/home_office.png
+share/gnome/dia/shapes/Cisco/home_office.shape
 share/gnome/dia/shapes/Cisco/hootphone.png
 share/gnome/dia/shapes/Cisco/hootphone.shape
 share/gnome/dia/shapes/Cisco/host.png
 share/gnome/dia/shapes/Cisco/host.shape
+share/gnome/dia/shapes/Cisco/house.png
+share/gnome/dia/shapes/Cisco/house.shape
+share/gnome/dia/shapes/Cisco/house_blue.png
+share/gnome/dia/shapes/Cisco/house_blue.shape
 share/gnome/dia/shapes/Cisco/hp_mini.png
 share/gnome/dia/shapes/Cisco/hp_mini.shape
 share/gnome/dia/shapes/Cisco/hub.png
 share/gnome/dia/shapes/Cisco/hub.shape
+share/gnome/dia/shapes/Cisco/hub_subdued.png
+share/gnome/dia/shapes/Cisco/hub_subdued.shape
 share/gnome/dia/shapes/Cisco/iad_router.png
 share/gnome/dia/shapes/Cisco/iad_router.shape
 share/gnome/dia/shapes/Cisco/ibm_mainframe.png
 share/gnome/dia/shapes/Cisco/ibm_mainframe.shape
+share/gnome/dia/shapes/Cisco/ibm_mainframe_with_fep.png
+share/gnome/dia/shapes/Cisco/ibm_mainframe_with_fep.shape
 share/gnome/dia/shapes/Cisco/ibm_mini.png
 share/gnome/dia/shapes/Cisco/ibm_mini.shape
 share/gnome/dia/shapes/Cisco/ibm_tower.png
@@ -505,56 +577,96 @@ share/gnome/dia/shapes/Cisco/icm.png
 share/gnome/dia/shapes/Cisco/icm.shape
 share/gnome/dia/shapes/Cisco/ics.png
 share/gnome/dia/shapes/Cisco/ics.shape
+share/gnome/dia/shapes/Cisco/intelliswitch_stack.png
+share/gnome/dia/shapes/Cisco/intelliswitch_stack.shape
 share/gnome/dia/shapes/Cisco/ios_firewall.png
 share/gnome/dia/shapes/Cisco/ios_firewall.shape
+share/gnome/dia/shapes/Cisco/ios_slb.png
+share/gnome/dia/shapes/Cisco/ios_slb.shape
 share/gnome/dia/shapes/Cisco/ip.png
 share/gnome/dia/shapes/Cisco/ip.shape
 share/gnome/dia/shapes/Cisco/ip_dsl.png
 share/gnome/dia/shapes/Cisco/ip_dsl.shape
+share/gnome/dia/shapes/Cisco/ip_old-style.png
+share/gnome/dia/shapes/Cisco/ip_old-style.shape
 share/gnome/dia/shapes/Cisco/ip_phone.png
 share/gnome/dia/shapes/Cisco/ip_phone.shape
 share/gnome/dia/shapes/Cisco/ip_softphone.png
 share/gnome/dia/shapes/Cisco/ip_softphone.shape
 share/gnome/dia/shapes/Cisco/ip_telephony_router.png
 share/gnome/dia/shapes/Cisco/ip_telephony_router.shape
-share/gnome/dia/shapes/Cisco/iptc.png
-share/gnome/dia/shapes/Cisco/iptc.shape
+share/gnome/dia/shapes/Cisco/ip_transport_concentrator.png
+share/gnome/dia/shapes/Cisco/ip_transport_concentrator.shape
 share/gnome/dia/shapes/Cisco/iptv_broadcast_server.png
 share/gnome/dia/shapes/Cisco/iptv_broadcast_server.shape
 share/gnome/dia/shapes/Cisco/iptv_content_manager.png
 share/gnome/dia/shapes/Cisco/iptv_content_manager.shape
+share/gnome/dia/shapes/Cisco/iscsi_switch.png
+share/gnome/dia/shapes/Cisco/iscsi_switch.shape
 share/gnome/dia/shapes/Cisco/isdn_switch.png
 share/gnome/dia/shapes/Cisco/isdn_switch.shape
 share/gnome/dia/shapes/Cisco/itp.png
 share/gnome/dia/shapes/Cisco/itp.shape
+share/gnome/dia/shapes/Cisco/jbod.png
+share/gnome/dia/shapes/Cisco/jbod.shape
 share/gnome/dia/shapes/Cisco/key.png
 share/gnome/dia/shapes/Cisco/key.shape
+share/gnome/dia/shapes/Cisco/label_switch_router.png
+share/gnome/dia/shapes/Cisco/label_switch_router.shape
+share/gnome/dia/shapes/Cisco/lan2lan_switch.png
+share/gnome/dia/shapes/Cisco/lan2lan_switch.shape
 share/gnome/dia/shapes/Cisco/lan_to_lan.png
 share/gnome/dia/shapes/Cisco/lan_to_lan.shape
 share/gnome/dia/shapes/Cisco/laptop.png
 share/gnome/dia/shapes/Cisco/laptop.shape
 share/gnome/dia/shapes/Cisco/layer3_switch.png
 share/gnome/dia/shapes/Cisco/layer3_switch.shape
+share/gnome/dia/shapes/Cisco/layer_2_remote_switch.png
+share/gnome/dia/shapes/Cisco/layer_2_remote_switch.shape
+share/gnome/dia/shapes/Cisco/lightweight_ap.png
+share/gnome/dia/shapes/Cisco/lightweight_ap.shape
 share/gnome/dia/shapes/Cisco/localdirector.png
 share/gnome/dia/shapes/Cisco/localdirector.shape
+share/gnome/dia/shapes/Cisco/location_server.png
+share/gnome/dia/shapes/Cisco/location_server.shape
 share/gnome/dia/shapes/Cisco/lock.png
 share/gnome/dia/shapes/Cisco/lock.shape
+share/gnome/dia/shapes/Cisco/lock_and_key.png
+share/gnome/dia/shapes/Cisco/lock_and_key.shape
 share/gnome/dia/shapes/Cisco/longreach_cpe.png
 share/gnome/dia/shapes/Cisco/longreach_cpe.shape
 share/gnome/dia/shapes/Cisco/mac_woman.png
 share/gnome/dia/shapes/Cisco/mac_woman.shape
+share/gnome/dia/shapes/Cisco/mac_woman_right.png
+share/gnome/dia/shapes/Cisco/mac_woman_right.shape
 share/gnome/dia/shapes/Cisco/macintosh.png
 share/gnome/dia/shapes/Cisco/macintosh.shape
+share/gnome/dia/shapes/Cisco/man.png
+share/gnome/dia/shapes/Cisco/man.shape
+share/gnome/dia/shapes/Cisco/man_blue.png
+share/gnome/dia/shapes/Cisco/man_blue.shape
+share/gnome/dia/shapes/Cisco/man_gold.png
+share/gnome/dia/shapes/Cisco/man_gold.shape
+share/gnome/dia/shapes/Cisco/man_red.png
+share/gnome/dia/shapes/Cisco/man_red.shape
 share/gnome/dia/shapes/Cisco/man_woman.png
 share/gnome/dia/shapes/Cisco/man_woman.shape
 share/gnome/dia/shapes/Cisco/mas_gateway.png
 share/gnome/dia/shapes/Cisco/mas_gateway.shape
 share/gnome/dia/shapes/Cisco/mau.png
 share/gnome/dia/shapes/Cisco/mau.shape
+share/gnome/dia/shapes/Cisco/mcu.png
+share/gnome/dia/shapes/Cisco/mcu.shape
 share/gnome/dia/shapes/Cisco/mdu.png
 share/gnome/dia/shapes/Cisco/mdu.shape
 share/gnome/dia/shapes/Cisco/me1100.png
 share/gnome/dia/shapes/Cisco/me1100.shape
+share/gnome/dia/shapes/Cisco/medium_building.png
+share/gnome/dia/shapes/Cisco/medium_building.shape
+share/gnome/dia/shapes/Cisco/medium_building_blue.png
+share/gnome/dia/shapes/Cisco/medium_building_blue.shape
+share/gnome/dia/shapes/Cisco/medium_building_subdued.png
+share/gnome/dia/shapes/Cisco/medium_building_subdued.shape
 share/gnome/dia/shapes/Cisco/metro1500.png
 share/gnome/dia/shapes/Cisco/metro1500.shape
 share/gnome/dia/shapes/Cisco/mgx8220.png
@@ -563,22 +675,40 @@ share/gnome/dia/shapes/Cisco/mgx8240.png
 share/gnome/dia/shapes/Cisco/mgx8240.shape
 share/gnome/dia/shapes/Cisco/mgx8260.png
 share/gnome/dia/shapes/Cisco/mgx8260.shape
+share/gnome/dia/shapes/Cisco/mgx_8000_series_voice_gateway.png
+share/gnome/dia/shapes/Cisco/mgx_8000_series_voice_gateway.shape
 share/gnome/dia/shapes/Cisco/microphone.png
 share/gnome/dia/shapes/Cisco/microphone.shape
 share/gnome/dia/shapes/Cisco/microwebserver.png
 share/gnome/dia/shapes/Cisco/microwebserver.shape
 share/gnome/dia/shapes/Cisco/mini_vax.png
 share/gnome/dia/shapes/Cisco/mini_vax.shape
+share/gnome/dia/shapes/Cisco/mobile_access_ip_phone.png
+share/gnome/dia/shapes/Cisco/mobile_access_ip_phone.shape
+share/gnome/dia/shapes/Cisco/mobile_access_router.png
+share/gnome/dia/shapes/Cisco/mobile_access_router.shape
 share/gnome/dia/shapes/Cisco/modem.png
 share/gnome/dia/shapes/Cisco/modem.shape
 share/gnome/dia/shapes/Cisco/moh_server.png
 share/gnome/dia/shapes/Cisco/moh_server.shape
+share/gnome/dia/shapes/Cisco/monitor.png
+share/gnome/dia/shapes/Cisco/monitor.shape
+share/gnome/dia/shapes/Cisco/multi-fabric_server_switch.png
+share/gnome/dia/shapes/Cisco/multi-fabric_server_switch.shape
+share/gnome/dia/shapes/Cisco/multilayer_remote_switch.png
+share/gnome/dia/shapes/Cisco/multilayer_remote_switch.shape
 share/gnome/dia/shapes/Cisco/multilayer_switch.png
 share/gnome/dia/shapes/Cisco/multilayer_switch.shape
+share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon.png
+share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon.shape
+share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.png
+share/gnome/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.shape
 share/gnome/dia/shapes/Cisco/multiswitch_device.png
 share/gnome/dia/shapes/Cisco/multiswitch_device.shape
 share/gnome/dia/shapes/Cisco/mux.png
 share/gnome/dia/shapes/Cisco/mux.shape
+share/gnome/dia/shapes/Cisco/nat.png
+share/gnome/dia/shapes/Cisco/nat.shape
 share/gnome/dia/shapes/Cisco/netflow_router.png
 share/gnome/dia/shapes/Cisco/netflow_router.shape
 share/gnome/dia/shapes/Cisco/netranger.png
@@ -587,20 +717,28 @@ share/gnome/dia/shapes/Cisco/netsonar.png
 share/gnome/dia/shapes/Cisco/netsonar.shape
 share/gnome/dia/shapes/Cisco/network_management.png
 share/gnome/dia/shapes/Cisco/network_management.shape
+share/gnome/dia/shapes/Cisco/newton.png
+share/gnome/dia/shapes/Cisco/newton.shape
 share/gnome/dia/shapes/Cisco/octel.png
 share/gnome/dia/shapes/Cisco/octel.shape
-share/gnome/dia/shapes/Cisco/ons15500.png
-share/gnome/dia/shapes/Cisco/ons15500.shape
+share/gnome/dia/shapes/Cisco/ons15104.png
+share/gnome/dia/shapes/Cisco/ons15104.shape
+share/gnome/dia/shapes/Cisco/ons15540.png
+share/gnome/dia/shapes/Cisco/ons15540.shape
 share/gnome/dia/shapes/Cisco/optical_amplifier.png
 share/gnome/dia/shapes/Cisco/optical_amplifier.shape
+share/gnome/dia/shapes/Cisco/optical_cross-connect.png
+share/gnome/dia/shapes/Cisco/optical_cross-connect.shape
+share/gnome/dia/shapes/Cisco/optical_fiber.png
+share/gnome/dia/shapes/Cisco/optical_fiber.shape
 share/gnome/dia/shapes/Cisco/optical_services_router.png
 share/gnome/dia/shapes/Cisco/optical_services_router.shape
 share/gnome/dia/shapes/Cisco/optical_transport.png
 share/gnome/dia/shapes/Cisco/optical_transport.shape
 share/gnome/dia/shapes/Cisco/pad.png
 share/gnome/dia/shapes/Cisco/pad.shape
-share/gnome/dia/shapes/Cisco/pad_x28.png
-share/gnome/dia/shapes/Cisco/pad_x28.shape
+share/gnome/dia/shapes/Cisco/pager.png
+share/gnome/dia/shapes/Cisco/pager.shape
 share/gnome/dia/shapes/Cisco/pbx.png
 share/gnome/dia/shapes/Cisco/pbx.shape
 share/gnome/dia/shapes/Cisco/pbx_switch.png
@@ -609,20 +747,38 @@ share/gnome/dia/shapes/Cisco/pc.png
 share/gnome/dia/shapes/Cisco/pc.shape
 share/gnome/dia/shapes/Cisco/pc_adapter_card.png
 share/gnome/dia/shapes/Cisco/pc_adapter_card.shape
+share/gnome/dia/shapes/Cisco/pc_card.png
+share/gnome/dia/shapes/Cisco/pc_card.shape
 share/gnome/dia/shapes/Cisco/pc_man.png
 share/gnome/dia/shapes/Cisco/pc_man.shape
+share/gnome/dia/shapes/Cisco/pc_man_left.png
+share/gnome/dia/shapes/Cisco/pc_man_left.shape
 share/gnome/dia/shapes/Cisco/pc_router_card.png
 share/gnome/dia/shapes/Cisco/pc_router_card.shape
+share/gnome/dia/shapes/Cisco/pc_software.png
+share/gnome/dia/shapes/Cisco/pc_software.shape
 share/gnome/dia/shapes/Cisco/pc_video.png
 share/gnome/dia/shapes/Cisco/pc_video.shape
+share/gnome/dia/shapes/Cisco/pc_with_router-based_software.png
+share/gnome/dia/shapes/Cisco/pc_with_router-based_software.shape
 share/gnome/dia/shapes/Cisco/pda.png
 share/gnome/dia/shapes/Cisco/pda.shape
 share/gnome/dia/shapes/Cisco/phone.png
 share/gnome/dia/shapes/Cisco/phone.shape
+share/gnome/dia/shapes/Cisco/phone_2.png
+share/gnome/dia/shapes/Cisco/phone_2.shape
+share/gnome/dia/shapes/Cisco/phone_appliance.png
+share/gnome/dia/shapes/Cisco/phone_appliance.shape
+share/gnome/dia/shapes/Cisco/phone_ethernet.png
+share/gnome/dia/shapes/Cisco/phone_ethernet.shape
 share/gnome/dia/shapes/Cisco/phone_fax.png
 share/gnome/dia/shapes/Cisco/phone_fax.shape
+share/gnome/dia/shapes/Cisco/phone_feature.png
+share/gnome/dia/shapes/Cisco/phone_feature.shape
 share/gnome/dia/shapes/Cisco/pix_firewall.png
 share/gnome/dia/shapes/Cisco/pix_firewall.shape
+share/gnome/dia/shapes/Cisco/pix_firewall_left.png
+share/gnome/dia/shapes/Cisco/pix_firewall_left.shape
 share/gnome/dia/shapes/Cisco/printer.png
 share/gnome/dia/shapes/Cisco/printer.shape
 share/gnome/dia/shapes/Cisco/programmable_switch.png
@@ -641,10 +797,14 @@ share/gnome/dia/shapes/Cisco/repeater.png
 share/gnome/dia/shapes/Cisco/repeater.shape
 share/gnome/dia/shapes/Cisco/route_switch_processor.png
 share/gnome/dia/shapes/Cisco/route_switch_processor.shape
+share/gnome/dia/shapes/Cisco/route_switch_processor_with_si.png
+share/gnome/dia/shapes/Cisco/route_switch_processor_with_si.shape
 share/gnome/dia/shapes/Cisco/router.png
 share/gnome/dia/shapes/Cisco/router.shape
 share/gnome/dia/shapes/Cisco/router_in_building.png
 share/gnome/dia/shapes/Cisco/router_in_building.shape
+share/gnome/dia/shapes/Cisco/router_subdued.png
+share/gnome/dia/shapes/Cisco/router_subdued.shape
 share/gnome/dia/shapes/Cisco/router_with_firewall.png
 share/gnome/dia/shapes/Cisco/router_with_firewall.shape
 share/gnome/dia/shapes/Cisco/router_with_silicon_switch.png
@@ -653,6 +813,10 @@ share/gnome/dia/shapes/Cisco/rps.png
 share/gnome/dia/shapes/Cisco/rps.shape
 share/gnome/dia/shapes/Cisco/running_man.png
 share/gnome/dia/shapes/Cisco/running_man.shape
+share/gnome/dia/shapes/Cisco/running_man_subdued.png
+share/gnome/dia/shapes/Cisco/running_man_subdued.shape
+share/gnome/dia/shapes/Cisco/running_woman.png
+share/gnome/dia/shapes/Cisco/running_woman.shape
 share/gnome/dia/shapes/Cisco/satellite.png
 share/gnome/dia/shapes/Cisco/satellite.shape
 share/gnome/dia/shapes/Cisco/satellite_dish.png
@@ -663,8 +827,14 @@ share/gnome/dia/shapes/Cisco/sc2200_vsc3000_host.png
 share/gnome/dia/shapes/Cisco/sc2200_vsc3000_host.shape
 share/gnome/dia/shapes/Cisco/scanner.png
 share/gnome/dia/shapes/Cisco/scanner.shape
+share/gnome/dia/shapes/Cisco/security_appliance.png
+share/gnome/dia/shapes/Cisco/security_appliance.shape
+share/gnome/dia/shapes/Cisco/server_switch.png
+share/gnome/dia/shapes/Cisco/server_switch.shape
 share/gnome/dia/shapes/Cisco/server_with_pc_router.png
 share/gnome/dia/shapes/Cisco/server_with_pc_router.shape
+share/gnome/dia/shapes/Cisco/service_control.png
+share/gnome/dia/shapes/Cisco/service_control.shape
 share/gnome/dia/shapes/Cisco/sip_proxy_server.png
 share/gnome/dia/shapes/Cisco/sip_proxy_server.shape
 share/gnome/dia/shapes/Cisco/sitting_woman.png
@@ -675,10 +845,14 @@ share/gnome/dia/shapes/Cisco/small_hub.png
 share/gnome/dia/shapes/Cisco/small_hub.shape
 share/gnome/dia/shapes/Cisco/softphone.png
 share/gnome/dia/shapes/Cisco/softphone.shape
-share/gnome/dia/shapes/Cisco/software_based_server.png
-share/gnome/dia/shapes/Cisco/software_based_server.shape
+share/gnome/dia/shapes/Cisco/software-based_router_on_file_server.png
+share/gnome/dia/shapes/Cisco/software-based_router_on_file_server.shape
+share/gnome/dia/shapes/Cisco/sonet_mux.png
+share/gnome/dia/shapes/Cisco/sonet_mux.shape
 share/gnome/dia/shapes/Cisco/speaker.png
 share/gnome/dia/shapes/Cisco/speaker.shape
+share/gnome/dia/shapes/Cisco/ssl_terminator.png
+share/gnome/dia/shapes/Cisco/ssl_terminator.shape
 share/gnome/dia/shapes/Cisco/standing_man.png
 share/gnome/dia/shapes/Cisco/standing_man.shape
 share/gnome/dia/shapes/Cisco/stb.png
@@ -687,6 +861,8 @@ share/gnome/dia/shapes/Cisco/storage_array.png
 share/gnome/dia/shapes/Cisco/storage_array.shape
 share/gnome/dia/shapes/Cisco/storage_router.png
 share/gnome/dia/shapes/Cisco/storage_router.shape
+share/gnome/dia/shapes/Cisco/storage_solution_engine.png
+share/gnome/dia/shapes/Cisco/storage_solution_engine.shape
 share/gnome/dia/shapes/Cisco/stp.png
 share/gnome/dia/shapes/Cisco/stp.shape
 share/gnome/dia/shapes/Cisco/sun_workstation.png
@@ -695,10 +871,14 @@ share/gnome/dia/shapes/Cisco/supercomputer.png
 share/gnome/dia/shapes/Cisco/supercomputer.shape
 share/gnome/dia/shapes/Cisco/svx.png
 share/gnome/dia/shapes/Cisco/svx.shape
+share/gnome/dia/shapes/Cisco/switch_processor.png
+share/gnome/dia/shapes/Cisco/switch_processor.shape
 share/gnome/dia/shapes/Cisco/system_controller.png
 share/gnome/dia/shapes/Cisco/system_controller.shape
 share/gnome/dia/shapes/Cisco/tablet.png
 share/gnome/dia/shapes/Cisco/tablet.shape
+share/gnome/dia/shapes/Cisco/tape_array.png
+share/gnome/dia/shapes/Cisco/tape_array.shape
 share/gnome/dia/shapes/Cisco/tdm_router.png
 share/gnome/dia/shapes/Cisco/tdm_router.shape
 share/gnome/dia/shapes/Cisco/telecommuter.png
@@ -707,8 +887,12 @@ share/gnome/dia/shapes/Cisco/telecommuter_house.png
 share/gnome/dia/shapes/Cisco/telecommuter_house.shape
 share/gnome/dia/shapes/Cisco/telecommuter_house_router.png
 share/gnome/dia/shapes/Cisco/telecommuter_house_router.shape
+share/gnome/dia/shapes/Cisco/telecommuter_house_subdued.png
+share/gnome/dia/shapes/Cisco/telecommuter_house_subdued.shape
 share/gnome/dia/shapes/Cisco/terminal.png
 share/gnome/dia/shapes/Cisco/terminal.shape
+share/gnome/dia/shapes/Cisco/terminal_server.png
+share/gnome/dia/shapes/Cisco/terminal_server.shape
 share/gnome/dia/shapes/Cisco/tokenring.png
 share/gnome/dia/shapes/Cisco/tokenring.shape
 share/gnome/dia/shapes/Cisco/transpath.png
@@ -719,8 +903,12 @@ share/gnome/dia/shapes/Cisco/turret.png
 share/gnome/dia/shapes/Cisco/turret.shape
 share/gnome/dia/shapes/Cisco/tv.png
 share/gnome/dia/shapes/Cisco/tv.shape
-share/gnome/dia/shapes/Cisco/ubr910.png
-share/gnome/dia/shapes/Cisco/ubr910.shape
+share/gnome/dia/shapes/Cisco/ubr910_cable_dsu.png
+share/gnome/dia/shapes/Cisco/ubr910_cable_dsu.shape
+share/gnome/dia/shapes/Cisco/umg_series.png
+share/gnome/dia/shapes/Cisco/umg_series.shape
+share/gnome/dia/shapes/Cisco/unity_express.png
+share/gnome/dia/shapes/Cisco/unity_express.shape
 share/gnome/dia/shapes/Cisco/unity_server.png
 share/gnome/dia/shapes/Cisco/unity_server.shape
 share/gnome/dia/shapes/Cisco/universal_gateway.png
@@ -731,16 +919,24 @@ share/gnome/dia/shapes/Cisco/ups.png
 share/gnome/dia/shapes/Cisco/ups.shape
 share/gnome/dia/shapes/Cisco/video_camera.png
 share/gnome/dia/shapes/Cisco/video_camera.shape
+share/gnome/dia/shapes/Cisco/video_camera_right.png
+share/gnome/dia/shapes/Cisco/video_camera_right.shape
 share/gnome/dia/shapes/Cisco/vip.png
 share/gnome/dia/shapes/Cisco/vip.shape
-share/gnome/dia/shapes/Cisco/voice_atm_switch.png
-share/gnome/dia/shapes/Cisco/voice_atm_switch.shape
-share/gnome/dia/shapes/Cisco/voice_commserver.png
-share/gnome/dia/shapes/Cisco/voice_commserver.shape
-share/gnome/dia/shapes/Cisco/voice_router.png
-share/gnome/dia/shapes/Cisco/voice_router.shape
-share/gnome/dia/shapes/Cisco/voice_switch.png
-share/gnome/dia/shapes/Cisco/voice_switch.shape
+share/gnome/dia/shapes/Cisco/virtual_layer_switch.png
+share/gnome/dia/shapes/Cisco/virtual_layer_switch.shape
+share/gnome/dia/shapes/Cisco/vn2900.png
+share/gnome/dia/shapes/Cisco/vn2900.shape
+share/gnome/dia/shapes/Cisco/vn5900.png
+share/gnome/dia/shapes/Cisco/vn5900.shape
+share/gnome/dia/shapes/Cisco/vn5902.png
+share/gnome/dia/shapes/Cisco/vn5902.shape
+share/gnome/dia/shapes/Cisco/voice-enabled_access_server.png
+share/gnome/dia/shapes/Cisco/voice-enabled_access_server.shape
+share/gnome/dia/shapes/Cisco/voice-enabled_atm_switch.png
+share/gnome/dia/shapes/Cisco/voice-enabled_atm_switch.shape
+share/gnome/dia/shapes/Cisco/voice-enabled_router.png
+share/gnome/dia/shapes/Cisco/voice-enabled_router.shape
 share/gnome/dia/shapes/Cisco/voice_switch2.png
 share/gnome/dia/shapes/Cisco/voice_switch2.shape
 share/gnome/dia/shapes/Cisco/vpn_concentrator.png
@@ -749,22 +945,50 @@ share/gnome/dia/shapes/Cisco/vpn_gateway.png
 share/gnome/dia/shapes/Cisco/vpn_gateway.shape
 share/gnome/dia/shapes/Cisco/vsc3000.png
 share/gnome/dia/shapes/Cisco/vsc3000.shape
+share/gnome/dia/shapes/Cisco/wan.png
+share/gnome/dia/shapes/Cisco/wan.shape
 share/gnome/dia/shapes/Cisco/wavelength_router.png
 share/gnome/dia/shapes/Cisco/wavelength_router.shape
+share/gnome/dia/shapes/Cisco/wdm.png
+share/gnome/dia/shapes/Cisco/wdm.shape
 share/gnome/dia/shapes/Cisco/web_browser.png
 share/gnome/dia/shapes/Cisco/web_browser.shape
 share/gnome/dia/shapes/Cisco/web_cluster.png
 share/gnome/dia/shapes/Cisco/web_cluster.shape
+share/gnome/dia/shapes/Cisco/wi-fi_tag.png
+share/gnome/dia/shapes/Cisco/wi-fi_tag.shape
 share/gnome/dia/shapes/Cisco/wireless.png
 share/gnome/dia/shapes/Cisco/wireless.shape
 share/gnome/dia/shapes/Cisco/wireless_bridge.png
 share/gnome/dia/shapes/Cisco/wireless_bridge.shape
+share/gnome/dia/shapes/Cisco/wireless_connectivity.png
+share/gnome/dia/shapes/Cisco/wireless_connectivity.shape
+share/gnome/dia/shapes/Cisco/wireless_location_appliance.png
+share/gnome/dia/shapes/Cisco/wireless_location_appliance.shape
+share/gnome/dia/shapes/Cisco/wireless_router.png
+share/gnome/dia/shapes/Cisco/wireless_router.shape
 share/gnome/dia/shapes/Cisco/wireless_transport.png
 share/gnome/dia/shapes/Cisco/wireless_transport.shape
+share/gnome/dia/shapes/Cisco/wlan_controller.png
+share/gnome/dia/shapes/Cisco/wlan_controller.shape
+share/gnome/dia/shapes/Cisco/woman.png
+share/gnome/dia/shapes/Cisco/woman.shape
+share/gnome/dia/shapes/Cisco/woman_blue.png
+share/gnome/dia/shapes/Cisco/woman_blue.shape
+share/gnome/dia/shapes/Cisco/woman_gold.png
+share/gnome/dia/shapes/Cisco/woman_gold.shape
+share/gnome/dia/shapes/Cisco/woman_red.png
+share/gnome/dia/shapes/Cisco/woman_red.shape
 share/gnome/dia/shapes/Cisco/workgroup_director.png
 share/gnome/dia/shapes/Cisco/workgroup_director.shape
+share/gnome/dia/shapes/Cisco/workgroup_fcis.png
+share/gnome/dia/shapes/Cisco/workgroup_fcis.shape
 share/gnome/dia/shapes/Cisco/workgroup_switch.png
 share/gnome/dia/shapes/Cisco/workgroup_switch.shape
+share/gnome/dia/shapes/Cisco/workgroup_switch_subdued.png
+share/gnome/dia/shapes/Cisco/workgroup_switch_subdued.shape
+share/gnome/dia/shapes/Cisco/workgroup_switch_voice-enabled.png
+share/gnome/dia/shapes/Cisco/workgroup_switch_voice-enabled.shape
 share/gnome/dia/shapes/Cisco/workstation.png
 share/gnome/dia/shapes/Cisco/workstation.shape
 share/gnome/dia/shapes/Cisco/www_server.png
@@ -991,6 +1215,14 @@ share/gnome/dia/shapes/Flowchart/transaction.png
 share/gnome/dia/shapes/Flowchart/transaction.shape
 share/gnome/dia/shapes/Flowchart/transmittape.png
 share/gnome/dia/shapes/Flowchart/transmittape.shape
+share/gnome/dia/shapes/Gane_and_Sarson/alt-entity.png
+share/gnome/dia/shapes/Gane_and_Sarson/alt-entity.shape
+share/gnome/dia/shapes/Gane_and_Sarson/data_store.png
+share/gnome/dia/shapes/Gane_and_Sarson/data_store.shape
+share/gnome/dia/shapes/Gane_and_Sarson/entity.png
+share/gnome/dia/shapes/Gane_and_Sarson/entity.shape
+share/gnome/dia/shapes/Gane_and_Sarson/process.png
+share/gnome/dia/shapes/Gane_and_Sarson/process.shape
 share/gnome/dia/shapes/Logic/and.png
 share/gnome/dia/shapes/Logic/and.shape
 share/gnome/dia/shapes/Logic/buffer.png
@@ -1267,6 +1499,7 @@ share/gnome/dia/shapes/sybase/rsm.png
 share/gnome/dia/shapes/sybase/rsm.shape
 share/gnome/dia/shapes/sybase/stableq.png
 share/gnome/dia/shapes/sybase/stableq.shape
+share/gnome/dia/sheets/AADL.sheet
 share/gnome/dia/sheets/Assorted.sheet
 share/gnome/dia/sheets/ChemEng.sheet
 share/gnome/dia/sheets/Circuit.sheet
@@ -1274,52 +1507,53 @@ share/gnome/dia/sheets/Contact.sheet
 share/gnome/dia/sheets/Cybernetics.sheet
 share/gnome/dia/sheets/EML.sheet
 share/gnome/dia/sheets/ER.sheet
-share/gnome/dia/sheets/ER/weakentity.xpm
+share/gnome/dia/sheets/ER/weakentity.png
 share/gnome/dia/sheets/Electric.sheet
 share/gnome/dia/sheets/FS.sheet
 share/gnome/dia/sheets/Flowchart.sheet
 share/gnome/dia/sheets/GRAFCET.sheet
-share/gnome/dia/sheets/GRAFCET/etapei.xpm
-share/gnome/dia/sheets/GRAFCET/etapemc.xpm
-share/gnome/dia/sheets/GRAFCET/etapeme.xpm
-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/GRAFCET/etapei.png
+share/gnome/dia/sheets/GRAFCET/etapemc.png
+share/gnome/dia/sheets/GRAFCET/etapeme.png
+share/gnome/dia/sheets/GRAFCET/etapems.png
+share/gnome/dia/sheets/GRAFCET/etapesp.png
+share/gnome/dia/sheets/GRAFCET/vergent_and.png
+share/gnome/dia/sheets/Gane_and_Sarson.sheet
 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/Istar/agent.png
+share/gnome/dia/sheets/Istar/decomposition.png
+share/gnome/dia/sheets/Istar/dependency.png
+share/gnome/dia/sheets/Istar/goal.png
+share/gnome/dia/sheets/Istar/means_ends.png
+share/gnome/dia/sheets/Istar/neg_contrib.png
+share/gnome/dia/sheets/Istar/pos_contrib.png
+share/gnome/dia/sheets/Istar/position.png
+share/gnome/dia/sheets/Istar/role.png
+share/gnome/dia/sheets/Istar/task.png
 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/Jackson/designed_domain.png
+share/gnome/dia/sheets/Jackson/machine_domain.png
+share/gnome/dia/sheets/Jackson/req_phen.png
 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/KAOS/and-complete-ref.png
+share/gnome/dia/sheets/KAOS/and-ref.png
+share/gnome/dia/sheets/KAOS/assumption.png
+share/gnome/dia/sheets/KAOS/capable-of.png
+share/gnome/dia/sheets/KAOS/conflicts.png
+share/gnome/dia/sheets/KAOS/controls.png
+share/gnome/dia/sheets/KAOS/input.png
+share/gnome/dia/sheets/KAOS/monitors.png
+share/gnome/dia/sheets/KAOS/obstacle.png
+share/gnome/dia/sheets/KAOS/obstructs.png
+share/gnome/dia/sheets/KAOS/op-ref.png
+share/gnome/dia/sheets/KAOS/or-complete-ref.png
+share/gnome/dia/sheets/KAOS/or-ref.png
+share/gnome/dia/sheets/KAOS/output.png
+share/gnome/dia/sheets/KAOS/performs.png
+share/gnome/dia/sheets/KAOS/requirement.png
+share/gnome/dia/sheets/KAOS/responsibility.png
+share/gnome/dia/sheets/KAOS/softgoal.png
 share/gnome/dia/sheets/Logic.sheet
 share/gnome/dia/sheets/MSE.sheet
 share/gnome/dia/sheets/Misc.sheet
@@ -1337,7 +1571,7 @@ share/gnome/dia/sheets/ciscocomputer.sheet
 share/gnome/dia/sheets/ciscohub.sheet
 share/gnome/dia/sheets/ciscomisc.sheet
 share/gnome/dia/sheets/cisconetwork.sheet
-share/gnome/dia/sheets/ciscorouter.sheet
+share/gnome/dia/sheets/ciscotelephony.sheet
 share/gnome/dia/sheets/civil.sheet
 share/gnome/dia/sheets/jigsaw.sheet
 share/gnome/dia/sheets/network.sheet
@@ -1351,11 +1585,29 @@ share/gnome/dia/xslt/dia-uml2owl.xsl
 share/gnome/dia/xslt/dia-uml2python.xsl
 share/gnome/dia/xslt/stylesheets.xml
 share/gnome/help/dia/C
+share/gnome/help/dia/en/authors.xml
 share/gnome/help/dia/en/dia.xml
+share/gnome/help/dia/en/entities.xml
 share/gnome/help/dia/en/graphics/greendots.png
 share/gnome/help/dia/en/graphics/home_network.png
 share/gnome/help/dia/en/graphics/line_icon.png
 share/gnome/help/dia/en/graphics/line_props.png
+share/gnome/help/dia/en/intro.xml
+share/gnome/help/dia/en/license.xml
+share/gnome/help/dia/en/usage-canvas.xml
+share/gnome/help/dia/en/usage-customization.xml
+share/gnome/help/dia/en/usage-layers.xml
+share/gnome/help/dia/en/usage-loadsave.xml
+share/gnome/help/dia/en/usage-objects-basic.xml
+share/gnome/help/dia/en/usage-objects-selecting.xml
+share/gnome/help/dia/en/usage-objects-special.xml
+share/gnome/help/dia/en/usage-objects.xml
+share/gnome/help/dia/en/usage-quickstart.xml
+share/gnome/help/dia/eu/dia.xml
+share/gnome/help/dia/eu/graphics/greendots.png
+share/gnome/help/dia/eu/graphics/home_network.png
+share/gnome/help/dia/eu/graphics/line_icon.png
+share/gnome/help/dia/eu/graphics/line_props.png
 share/gnome/help/dia/pl/dia.xml
 share/gnome/help/dia/pl/graphics/greendots.png
 share/gnome/help/dia/pl/graphics/home_network.png
@@ -1367,6 +1619,8 @@ share/gnome/pixmaps/dia_gnome_icon.png
 share/locale/am/LC_MESSAGES/dia.mo
 share/locale/az/LC_MESSAGES/dia.mo
 share/locale/be/LC_MESSAGES/dia.mo
+share/locale/bg/LC_MESSAGES/dia.mo
+share/locale/bs/LC_MESSAGES/dia.mo
 share/locale/ca/LC_MESSAGES/dia.mo
 share/locale/cs/LC_MESSAGES/dia.mo
 share/locale/da/LC_MESSAGES/dia.mo
@@ -1375,12 +1629,14 @@ share/locale/el/LC_MESSAGES/dia.mo
 share/locale/en_CA/LC_MESSAGES/dia.mo
 share/locale/en_GB/LC_MESSAGES/dia.mo
 share/locale/es/LC_MESSAGES/dia.mo
+share/locale/eu/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/id/LC_MESSAGES/dia.mo
 share/locale/is/LC_MESSAGES/dia.mo
 share/locale/it/LC_MESSAGES/dia.mo
 share/locale/ja/LC_MESSAGES/dia.mo
@@ -1389,14 +1645,16 @@ share/locale/mk/LC_MESSAGES/dia.mo
 share/locale/ml/LC_MESSAGES/dia.mo
 share/locale/mn/LC_MESSAGES/dia.mo
 share/locale/ms/LC_MESSAGES/dia.mo
+share/locale/nb/LC_MESSAGES/dia.mo
+share/locale/ne/LC_MESSAGES/dia.mo
 share/locale/nl/LC_MESSAGES/dia.mo
 share/locale/nn/LC_MESSAGES/dia.mo
-share/locale/no/LC_MESSAGES/dia.mo
 share/locale/pl/LC_MESSAGES/dia.mo
 share/locale/pt/LC_MESSAGES/dia.mo
 share/locale/pt_BR/LC_MESSAGES/dia.mo
 share/locale/ro/LC_MESSAGES/dia.mo
 share/locale/ru/LC_MESSAGES/dia.mo
+share/locale/rw/LC_MESSAGES/dia.mo
 share/locale/sk/LC_MESSAGES/dia.mo
 share/locale/sl/LC_MESSAGES/dia.mo
 share/locale/sq/LC_MESSAGES/dia.mo
@@ -1411,6 +1669,8 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/omf/dia
 @dirrm share/gnome/help/dia/pl/graphics
 @dirrm share/gnome/help/dia/pl
+@dirrm share/gnome/help/dia/eu/graphics
+@dirrm share/gnome/help/dia/eu
 @dirrm share/gnome/help/dia/en/graphics
 @dirrm share/gnome/help/dia/en
 @dirrm share/gnome/help/dia
@@ -1433,6 +1693,7 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/dia/shapes/Map
 @dirrm share/gnome/dia/shapes/MSE
 @dirrm share/gnome/dia/shapes/Logic
+@dirrm share/gnome/dia/shapes/Gane_and_Sarson
 @dirrm share/gnome/dia/shapes/Flowchart
 @dirrm share/gnome/dia/shapes/Electric
 @dirrm share/gnome/dia/shapes/Cybernetics
@@ -1444,6 +1705,5 @@ share/locale/zh_TW/LC_MESSAGES/dia.mo
 @dirrm share/gnome/dia/shapes/Assorted
 @dirrm share/gnome/dia/shapes
 %%PYTHON:%%@dirrm share/gnome/dia/python
-@dirrm share/gnome/dia/images
 @dirrm share/gnome/dia
 @dirrm lib/dia