Pullup ticket 1696 - requested by drochner

security update for dia

Revisions pulled up:
- pkgsrc/graphics/dia/Makefile			1.44
- pkgsrc/graphics/dia/Makefile.common		1.10, 1.11, 1.12
- pkgsrc/graphics/dia/PLIST			1.12, 1.13
- pkgsrc/graphics/dia/distinfo			1.16, 1.17, 1.18
- pkgsrc/graphics/dia/options.mk		1.4
- pkgsrc/graphics/dia/patches/patch-ab		removed
- pkgsrc/graphics/dia/patches/patch-ac		removed
- pkgsrc/graphics/dia/patches/patch-ad		removed
- pkgsrc/graphics/dia/patches/patch-ca		1.1
- pkgsrc/graphics/dia/patches/patch-cb		1.1
- pkgsrc/graphics/dia/patches/patch-cc		1.1
- pkgsrc/graphics/dia-python/Makefile		1.8
- pkgsrc/graphics/dia-python/PLIST		1.2

   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Tue May  2 16:23:30 UTC 2006

   Modified Files:
   	pkgsrc/graphics/dia: Makefile Makefile.common PLIST distinfo
   	pkgsrc/graphics/dia-python: Makefile PLIST
   Removed Files:
   	pkgsrc/graphics/dia/patches: patch-ab patch-ac patch-ad

   Log Message:
   update to 0.95
   changes:
   -"mainpoint" system allows lines to always point towards the middle
   -Python plug-ins added
   -automatically change grid size depending on zoom level
   -Text input now highlights the object
   -security problems fixed in XFig import and Python plug-in
   -new shapes added
   -new UML objects added
   -Full screen mode
   -Improved SVG import
   -Plug-in loading and unloading doesn't require restart
   -i18n problems fixed
   -bugs have been fixed
   -Command line usage has improved
   -ses the new GTK+ File Dialog

   pkgsrc change:
   -precompile Python files
---
   Module Name:		pkgsrc
   Committed By:	abs
   Date:		Tue May 16 21:15:23 UTC 2006

   Modified Files:
   	pkgsrc/graphics/dia: Makefile.common

   Log Message:
   USE_LANGUAGES+=c++
---
   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Wed May 31 17:50:12 UTC 2006

   Modified Files:
   	pkgsrc/graphics/dia: Makefile.common distinfo

   Log Message:
   update to 0.95.1
   changes:
   3 minor bugfixes
---
   Module Name:		pkgsrc
   Committed By:	drochner
   Date:		Sun Jun 11 16:55:35 UTC 2006

   Modified Files:
   	pkgsrc/graphics/dia: PLIST distinfo options.mk
   Added Files:
   	pkgsrc/graphics/dia/patches: patch-ca patch-cb patch-cc

   Log Message:
   fix help file installation in the !gnome case, problem found by
   Lubomir Sedlacik
   (no PKGREVISION bump because the default case is not affected)
   Help display seems fundamentally broken to me in the !gnome case;
   the code looks for an "index.html" which is not installed (and which
   no make rule is present for).

1 files changed, 355 insertions, 98 deletions

diff --git a/graphics/dia/PLIST b/graphics/dia/PLIST
index 184ee97c68c..4579988a7a6 100644
--- a/graphics/dia/PLIST
+++ b/graphics/dia/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2005/01/20 18:49:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10.10.1 2006/06/13 21:29:04 salo Exp $
 bin/dia
+lib/dia/libaadl_objects.la
 lib/dia/libbondgraph_objects.la
 lib/dia/libcairo_filter.la
 lib/dia/libcgm_filter.la
@@ -18,6 +19,7 @@ lib/dia/libkaos_objects.la
 lib/dia/libmetapost_filter.la
 lib/dia/libmisc_objects.la
 lib/dia/libnetwork_objects.la
+lib/dia/libpgf_filter.la
 lib/dia/libpixbuf_filter.la
 lib/dia/libpstricks_filter.la
 lib/dia/libsadt_objects.la
@@ -25,23 +27,12 @@ lib/dia/libshape_filter.la
 lib/dia/libstandard_objects.la
 lib/dia/libsvg_filter.la
 lib/dia/libuml_objects.la
-lib/dia/libwmf_filter.la
 lib/dia/libwpg_filter.la
 lib/dia/libxfig_filter.la
 lib/dia/libxslt_filter.la
 man/man1/dia.1
 share/applications/dia.desktop
 share/dia/dia_logo.png
-share/dia/images/broken-chain.xpm
-share/dia/images/connectable-empty.png
-share/dia/images/connectable.png
-share/dia/images/off-grid.png
-share/dia/images/on-grid.png
-share/dia/images/selectable-empty.png
-share/dia/images/selectable.png
-share/dia/images/unbroken-chain.xpm
-share/dia/images/visible-empty.png
-share/dia/images/visible.png
 share/dia/shapes/Assorted/arrow-chevron.png
 share/dia/shapes/Assorted/arrow-chevron.shape
 share/dia/shapes/Assorted/arrow-down.png
@@ -296,6 +287,8 @@ share/dia/shapes/Cisco/10700.png
 share/dia/shapes/Cisco/10700.shape
 share/dia/shapes/Cisco/15200.png
 share/dia/shapes/Cisco/15200.shape
+share/dia/shapes/Cisco/15800.png
+share/dia/shapes/Cisco/15800.shape
 share/dia/shapes/Cisco/3174.png
 share/dia/shapes/Cisco/3174.shape
 share/dia/shapes/Cisco/3x74.png
@@ -318,10 +311,18 @@ share/dia/shapes/Cisco/7505.png
 share/dia/shapes/Cisco/7505.shape
 share/dia/shapes/Cisco/7507.png
 share/dia/shapes/Cisco/7507.shape
+share/dia/shapes/Cisco/access_gateway.png
+share/dia/shapes/Cisco/access_gateway.shape
+share/dia/shapes/Cisco/access_server.png
+share/dia/shapes/Cisco/access_server.shape
 share/dia/shapes/Cisco/accesspoint.png
 share/dia/shapes/Cisco/accesspoint.shape
 share/dia/shapes/Cisco/adm.png
 share/dia/shapes/Cisco/adm.shape
+share/dia/shapes/Cisco/androgynous_person.png
+share/dia/shapes/Cisco/androgynous_person.shape
+share/dia/shapes/Cisco/antenna.png
+share/dia/shapes/Cisco/antenna.shape
 share/dia/shapes/Cisco/asic.png
 share/dia/shapes/Cisco/asic.shape
 share/dia/shapes/Cisco/ata.png
@@ -330,22 +331,27 @@ share/dia/shapes/Cisco/atm3800.png
 share/dia/shapes/Cisco/atm3800.shape
 share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.png
 share/dia/shapes/Cisco/atm_fast_gigabit_etherswitch.shape
-share/dia/shapes/Cisco/atm_router.png
 share/dia/shapes/Cisco/atm_router.shape
 share/dia/shapes/Cisco/atm_switch.png
 share/dia/shapes/Cisco/atm_switch.shape
-share/dia/shapes/Cisco/atm_tag_sw_gigabit_router.png
-share/dia/shapes/Cisco/atm_tag_sw_gigabit_router.shape
 share/dia/shapes/Cisco/atm_tag_switch_router.png
 share/dia/shapes/Cisco/atm_tag_switch_router.shape
+share/dia/shapes/Cisco/automatic_protection_switching.png
+share/dia/shapes/Cisco/automatic_protection_switching.shape
 share/dia/shapes/Cisco/bbfw.png
 share/dia/shapes/Cisco/bbfw.shape
 share/dia/shapes/Cisco/bbfw_media.png
 share/dia/shapes/Cisco/bbfw_media.shape
+share/dia/shapes/Cisco/bbs.png
+share/dia/shapes/Cisco/bbs.shape
 share/dia/shapes/Cisco/bbsm.png
 share/dia/shapes/Cisco/bbsm.shape
 share/dia/shapes/Cisco/branch_office.png
 share/dia/shapes/Cisco/branch_office.shape
+share/dia/shapes/Cisco/branch_office_blue.png
+share/dia/shapes/Cisco/branch_office_blue.shape
+share/dia/shapes/Cisco/branch_office_subdued.png
+share/dia/shapes/Cisco/branch_office_subdued.shape
 share/dia/shapes/Cisco/breakout_box.png
 share/dia/shapes/Cisco/breakout_box.shape
 share/dia/shapes/Cisco/bridge.png
@@ -362,44 +368,74 @@ share/dia/shapes/Cisco/callmanager.png
 share/dia/shapes/Cisco/callmanager.shape
 share/dia/shapes/Cisco/car.png
 share/dia/shapes/Cisco/car.shape
+share/dia/shapes/Cisco/carrier_routing_system.png
+share/dia/shapes/Cisco/carrier_routing_system.shape
 share/dia/shapes/Cisco/catalyst_access_gateway.png
 share/dia/shapes/Cisco/catalyst_access_gateway.shape
-share/dia/shapes/Cisco/cddi_fddi.png
-share/dia/shapes/Cisco/cddi_fddi.shape
+share/dia/shapes/Cisco/cddi_fddi_concentrator.png
+share/dia/shapes/Cisco/cddi_fddi_concentrator.shape
 share/dia/shapes/Cisco/cdm.png
 share/dia/shapes/Cisco/cdm.shape
 share/dia/shapes/Cisco/cellular_phone.png
 share/dia/shapes/Cisco/cellular_phone.shape
-share/dia/shapes/Cisco/centri.png
-share/dia/shapes/Cisco/centri.shape
+share/dia/shapes/Cisco/centri_firewall.png
+share/dia/shapes/Cisco/centri_firewall.shape
+share/dia/shapes/Cisco/channelized_pipe.png
+share/dia/shapes/Cisco/channelized_pipe.shape
 share/dia/shapes/Cisco/cisco_hub.png
 share/dia/shapes/Cisco/cisco_hub.shape
 share/dia/shapes/Cisco/ciscosecurity.png
 share/dia/shapes/Cisco/ciscosecurity.shape
 share/dia/shapes/Cisco/ciscoworks.png
 share/dia/shapes/Cisco/ciscoworks.shape
+share/dia/shapes/Cisco/ciscoworks_man.png
+share/dia/shapes/Cisco/ciscoworks_man.shape
 share/dia/shapes/Cisco/class45_switch.png
 share/dia/shapes/Cisco/class45_switch.shape
 share/dia/shapes/Cisco/cloud.png
 share/dia/shapes/Cisco/cloud.shape
+share/dia/shapes/Cisco/cloud_dark.png
+share/dia/shapes/Cisco/cloud_dark.shape
+share/dia/shapes/Cisco/cloud_gold.png
+share/dia/shapes/Cisco/cloud_gold.shape
+share/dia/shapes/Cisco/cloud_white.png
+share/dia/shapes/Cisco/cloud_white.shape
 share/dia/shapes/Cisco/communications_server.png
 share/dia/shapes/Cisco/communications_server.shape
+share/dia/shapes/Cisco/concatenated_payload.png
+share/dia/shapes/Cisco/concatenated_payload.shape
 share/dia/shapes/Cisco/content_engine.png
 share/dia/shapes/Cisco/content_engine.shape
-share/dia/shapes/Cisco/content_service_router.png
-share/dia/shapes/Cisco/content_service_router.shape
+share/dia/shapes/Cisco/content_router.png
+share/dia/shapes/Cisco/content_router.shape
+share/dia/shapes/Cisco/content_service_module.png
+share/dia/shapes/Cisco/content_service_module.shape
 share/dia/shapes/Cisco/content_switch.png
 share/dia/shapes/Cisco/content_switch.shape
-share/dia/shapes/Cisco/content_switch_module.png
-share/dia/shapes/Cisco/content_switch_module.shape
+share/dia/shapes/Cisco/csm-s.png
+share/dia/shapes/Cisco/csm-s.shape
 share/dia/shapes/Cisco/css1100.png
 share/dia/shapes/Cisco/css1100.shape
 share/dia/shapes/Cisco/csu_dsu.png
 share/dia/shapes/Cisco/csu_dsu.shape
 share/dia/shapes/Cisco/cte.png
 share/dia/shapes/Cisco/cte.shape
+share/dia/shapes/Cisco/data_center_switch.png
+share/dia/shapes/Cisco/data_center_switch.shape
+share/dia/shapes/Cisco/data_center_switch_reversed.png
+share/dia/shapes/Cisco/data_center_switch_reversed.shape
+share/dia/shapes/Cisco/data_switch_processor.png
+share/dia/shapes/Cisco/data_switch_processor.shape
+share/dia/shapes/Cisco/detector.png
+share/dia/shapes/Cisco/detector.shape
+share/dia/shapes/Cisco/digital_cross-connect.png
+share/dia/shapes/Cisco/digital_cross-connect.shape
+share/dia/shapes/Cisco/director_fcis.png
+share/dia/shapes/Cisco/director_fcis.shape
 share/dia/shapes/Cisco/directory_server.png
 share/dia/shapes/Cisco/directory_server.shape
+share/dia/shapes/Cisco/disk_subsystem.png
+share/dia/shapes/Cisco/disk_subsystem.shape
 share/dia/shapes/Cisco/diskette.png
 share/dia/shapes/Cisco/diskette.shape
 share/dia/shapes/Cisco/distributed_director.png
@@ -410,10 +446,17 @@ share/dia/shapes/Cisco/dpt.png
 share/dia/shapes/Cisco/dpt.shape
 share/dia/shapes/Cisco/dslam.png
 share/dia/shapes/Cisco/dslam.shape
+share/dia/shapes/Cisco/dual_mode_accesspoint.png
+share/dia/shapes/Cisco/dual_mode_accesspoint.shape
 share/dia/shapes/Cisco/dwdm_filter.png
 share/dia/shapes/Cisco/dwdm_filter.shape
+share/dia/shapes/Cisco/edge_label_switch_router.png
+share/dia/shapes/Cisco/edge_label_switch_router_with_netflow.png
+share/dia/shapes/Cisco/edge_label_switch_router_with_netflow.shape
 share/dia/shapes/Cisco/end_office.png
 share/dia/shapes/Cisco/end_office.shape
+share/dia/shapes/Cisco/etherclient.png
+share/dia/shapes/Cisco/etherclient.shape
 share/dia/shapes/Cisco/fax.png
 share/dia/shapes/Cisco/fax.shape
 share/dia/shapes/Cisco/fc_storage.png
@@ -422,16 +465,28 @@ share/dia/shapes/Cisco/fddi_ring.png
 share/dia/shapes/Cisco/fddi_ring.shape
 share/dia/shapes/Cisco/file_cabinet.png
 share/dia/shapes/Cisco/file_cabinet.shape
+share/dia/shapes/Cisco/file_engine.png
+share/dia/shapes/Cisco/file_engine.shape
 share/dia/shapes/Cisco/file_server.png
 share/dia/shapes/Cisco/file_server.shape
 share/dia/shapes/Cisco/firewall.png
 share/dia/shapes/Cisco/firewall.shape
+share/dia/shapes/Cisco/firewall_horizontal.png
+share/dia/shapes/Cisco/firewall_horizontal.shape
+share/dia/shapes/Cisco/firewall_subdued.png
+share/dia/shapes/Cisco/firewall_subdued.shape
 share/dia/shapes/Cisco/front_end_processor.png
 share/dia/shapes/Cisco/front_end_processor.shape
+share/dia/shapes/Cisco/fwsm.png
+share/dia/shapes/Cisco/fwsm.shape
 share/dia/shapes/Cisco/general_appliance.png
 share/dia/shapes/Cisco/general_appliance.shape
 share/dia/shapes/Cisco/generic_building.png
 share/dia/shapes/Cisco/generic_building.shape
+share/dia/shapes/Cisco/generic_building_blue.png
+share/dia/shapes/Cisco/generic_building_blue.shape
+share/dia/shapes/Cisco/generic_building_subdued.png
+share/dia/shapes/Cisco/generic_building_subdued.shape
 share/dia/shapes/Cisco/generic_gateway.png
 share/dia/shapes/Cisco/generic_gateway.shape
 share/dia/shapes/Cisco/generic_processor.png
@@ -442,22 +497,36 @@ share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.png
 share/dia/shapes/Cisco/gigabit_switch_router_atm_tag.shape
 share/dia/shapes/Cisco/government_building.png
 share/dia/shapes/Cisco/government_building.shape
+share/dia/shapes/Cisco/guard.png
+share/dia/shapes/Cisco/guard.shape
 share/dia/shapes/Cisco/h323.png
 share/dia/shapes/Cisco/h323.shape
 share/dia/shapes/Cisco/handheld.png
 share/dia/shapes/Cisco/handheld.shape
+share/dia/shapes/Cisco/headphones.png
+share/dia/shapes/Cisco/headphones.shape
+share/dia/shapes/Cisco/home_office.png
+share/dia/shapes/Cisco/home_office.shape
 share/dia/shapes/Cisco/hootphone.png
 share/dia/shapes/Cisco/hootphone.shape
 share/dia/shapes/Cisco/host.png
 share/dia/shapes/Cisco/host.shape
+share/dia/shapes/Cisco/house.png
+share/dia/shapes/Cisco/house.shape
+share/dia/shapes/Cisco/house_blue.png
+share/dia/shapes/Cisco/house_blue.shape
 share/dia/shapes/Cisco/hp_mini.png
 share/dia/shapes/Cisco/hp_mini.shape
 share/dia/shapes/Cisco/hub.png
 share/dia/shapes/Cisco/hub.shape
+share/dia/shapes/Cisco/hub_subdued.png
+share/dia/shapes/Cisco/hub_subdued.shape
 share/dia/shapes/Cisco/iad_router.png
 share/dia/shapes/Cisco/iad_router.shape
 share/dia/shapes/Cisco/ibm_mainframe.png
 share/dia/shapes/Cisco/ibm_mainframe.shape
+share/dia/shapes/Cisco/ibm_mainframe_with_fep.png
+share/dia/shapes/Cisco/ibm_mainframe_with_fep.shape
 share/dia/shapes/Cisco/ibm_mini.png
 share/dia/shapes/Cisco/ibm_mini.shape
 share/dia/shapes/Cisco/ibm_tower.png
@@ -466,56 +535,96 @@ share/dia/shapes/Cisco/icm.png
 share/dia/shapes/Cisco/icm.shape
 share/dia/shapes/Cisco/ics.png
 share/dia/shapes/Cisco/ics.shape
+share/dia/shapes/Cisco/intelliswitch_stack.png
+share/dia/shapes/Cisco/intelliswitch_stack.shape
 share/dia/shapes/Cisco/ios_firewall.png
 share/dia/shapes/Cisco/ios_firewall.shape
+share/dia/shapes/Cisco/ios_slb.png
+share/dia/shapes/Cisco/ios_slb.shape
 share/dia/shapes/Cisco/ip.png
 share/dia/shapes/Cisco/ip.shape
 share/dia/shapes/Cisco/ip_dsl.png
 share/dia/shapes/Cisco/ip_dsl.shape
+share/dia/shapes/Cisco/ip_old-style.png
+share/dia/shapes/Cisco/ip_old-style.shape
 share/dia/shapes/Cisco/ip_phone.png
 share/dia/shapes/Cisco/ip_phone.shape
 share/dia/shapes/Cisco/ip_softphone.png
 share/dia/shapes/Cisco/ip_softphone.shape
 share/dia/shapes/Cisco/ip_telephony_router.png
 share/dia/shapes/Cisco/ip_telephony_router.shape
-share/dia/shapes/Cisco/iptc.png
-share/dia/shapes/Cisco/iptc.shape
+share/dia/shapes/Cisco/ip_transport_concentrator.png
+share/dia/shapes/Cisco/ip_transport_concentrator.shape
 share/dia/shapes/Cisco/iptv_broadcast_server.png
 share/dia/shapes/Cisco/iptv_broadcast_server.shape
 share/dia/shapes/Cisco/iptv_content_manager.png
 share/dia/shapes/Cisco/iptv_content_manager.shape
+share/dia/shapes/Cisco/iscsi_switch.png
+share/dia/shapes/Cisco/iscsi_switch.shape
 share/dia/shapes/Cisco/isdn_switch.png
 share/dia/shapes/Cisco/isdn_switch.shape
 share/dia/shapes/Cisco/itp.png
 share/dia/shapes/Cisco/itp.shape
+share/dia/shapes/Cisco/jbod.png
+share/dia/shapes/Cisco/jbod.shape
 share/dia/shapes/Cisco/key.png
 share/dia/shapes/Cisco/key.shape
+share/dia/shapes/Cisco/label_switch_router.png
+share/dia/shapes/Cisco/label_switch_router.shape
+share/dia/shapes/Cisco/lan2lan_switch.png
+share/dia/shapes/Cisco/lan2lan_switch.shape
 share/dia/shapes/Cisco/lan_to_lan.png
 share/dia/shapes/Cisco/lan_to_lan.shape
 share/dia/shapes/Cisco/laptop.png
 share/dia/shapes/Cisco/laptop.shape
 share/dia/shapes/Cisco/layer3_switch.png
 share/dia/shapes/Cisco/layer3_switch.shape
+share/dia/shapes/Cisco/layer_2_remote_switch.png
+share/dia/shapes/Cisco/layer_2_remote_switch.shape
+share/dia/shapes/Cisco/lightweight_ap.png
+share/dia/shapes/Cisco/lightweight_ap.shape
 share/dia/shapes/Cisco/localdirector.png
 share/dia/shapes/Cisco/localdirector.shape
+share/dia/shapes/Cisco/location_server.png
+share/dia/shapes/Cisco/location_server.shape
 share/dia/shapes/Cisco/lock.png
 share/dia/shapes/Cisco/lock.shape
+share/dia/shapes/Cisco/lock_and_key.png
+share/dia/shapes/Cisco/lock_and_key.shape
 share/dia/shapes/Cisco/longreach_cpe.png
 share/dia/shapes/Cisco/longreach_cpe.shape
 share/dia/shapes/Cisco/mac_woman.png
 share/dia/shapes/Cisco/mac_woman.shape
+share/dia/shapes/Cisco/mac_woman_right.png
+share/dia/shapes/Cisco/mac_woman_right.shape
 share/dia/shapes/Cisco/macintosh.png
 share/dia/shapes/Cisco/macintosh.shape
+share/dia/shapes/Cisco/man.png
+share/dia/shapes/Cisco/man.shape
+share/dia/shapes/Cisco/man_blue.png
+share/dia/shapes/Cisco/man_blue.shape
+share/dia/shapes/Cisco/man_gold.png
+share/dia/shapes/Cisco/man_gold.shape
+share/dia/shapes/Cisco/man_red.png
+share/dia/shapes/Cisco/man_red.shape
 share/dia/shapes/Cisco/man_woman.png
 share/dia/shapes/Cisco/man_woman.shape
 share/dia/shapes/Cisco/mas_gateway.png
 share/dia/shapes/Cisco/mas_gateway.shape
 share/dia/shapes/Cisco/mau.png
 share/dia/shapes/Cisco/mau.shape
+share/dia/shapes/Cisco/mcu.png
+share/dia/shapes/Cisco/mcu.shape
 share/dia/shapes/Cisco/mdu.png
 share/dia/shapes/Cisco/mdu.shape
 share/dia/shapes/Cisco/me1100.png
 share/dia/shapes/Cisco/me1100.shape
+share/dia/shapes/Cisco/medium_building.png
+share/dia/shapes/Cisco/medium_building.shape
+share/dia/shapes/Cisco/medium_building_blue.png
+share/dia/shapes/Cisco/medium_building_blue.shape
+share/dia/shapes/Cisco/medium_building_subdued.png
+share/dia/shapes/Cisco/medium_building_subdued.shape
 share/dia/shapes/Cisco/metro1500.png
 share/dia/shapes/Cisco/metro1500.shape
 share/dia/shapes/Cisco/mgx8220.png
@@ -524,22 +633,40 @@ share/dia/shapes/Cisco/mgx8240.png
 share/dia/shapes/Cisco/mgx8240.shape
 share/dia/shapes/Cisco/mgx8260.png
 share/dia/shapes/Cisco/mgx8260.shape
+share/dia/shapes/Cisco/mgx_8000_series_voice_gateway.png
+share/dia/shapes/Cisco/mgx_8000_series_voice_gateway.shape
 share/dia/shapes/Cisco/microphone.png
 share/dia/shapes/Cisco/microphone.shape
 share/dia/shapes/Cisco/microwebserver.png
 share/dia/shapes/Cisco/microwebserver.shape
 share/dia/shapes/Cisco/mini_vax.png
 share/dia/shapes/Cisco/mini_vax.shape
+share/dia/shapes/Cisco/mobile_access_ip_phone.png
+share/dia/shapes/Cisco/mobile_access_ip_phone.shape
+share/dia/shapes/Cisco/mobile_access_router.png
+share/dia/shapes/Cisco/mobile_access_router.shape
 share/dia/shapes/Cisco/modem.png
 share/dia/shapes/Cisco/modem.shape
 share/dia/shapes/Cisco/moh_server.png
 share/dia/shapes/Cisco/moh_server.shape
+share/dia/shapes/Cisco/monitor.png
+share/dia/shapes/Cisco/monitor.shape
+share/dia/shapes/Cisco/multi-fabric_server_switch.png
+share/dia/shapes/Cisco/multi-fabric_server_switch.shape
+share/dia/shapes/Cisco/multilayer_remote_switch.png
+share/dia/shapes/Cisco/multilayer_remote_switch.shape
 share/dia/shapes/Cisco/multilayer_switch.png
 share/dia/shapes/Cisco/multilayer_switch.shape
+share/dia/shapes/Cisco/multilayer_switch_with_silicon.png
+share/dia/shapes/Cisco/multilayer_switch_with_silicon.shape
+share/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.png
+share/dia/shapes/Cisco/multilayer_switch_with_silicon_subdued.shape
 share/dia/shapes/Cisco/multiswitch_device.png
 share/dia/shapes/Cisco/multiswitch_device.shape
 share/dia/shapes/Cisco/mux.png
 share/dia/shapes/Cisco/mux.shape
+share/dia/shapes/Cisco/nat.png
+share/dia/shapes/Cisco/nat.shape
 share/dia/shapes/Cisco/netflow_router.png
 share/dia/shapes/Cisco/netflow_router.shape
 share/dia/shapes/Cisco/netranger.png
@@ -548,20 +675,28 @@ share/dia/shapes/Cisco/netsonar.png
 share/dia/shapes/Cisco/netsonar.shape
 share/dia/shapes/Cisco/network_management.png
 share/dia/shapes/Cisco/network_management.shape
+share/dia/shapes/Cisco/newton.png
+share/dia/shapes/Cisco/newton.shape
 share/dia/shapes/Cisco/octel.png
 share/dia/shapes/Cisco/octel.shape
-share/dia/shapes/Cisco/ons15500.png
-share/dia/shapes/Cisco/ons15500.shape
+share/dia/shapes/Cisco/ons15104.png
+share/dia/shapes/Cisco/ons15104.shape
+share/dia/shapes/Cisco/ons15540.png
+share/dia/shapes/Cisco/ons15540.shape
 share/dia/shapes/Cisco/optical_amplifier.png
 share/dia/shapes/Cisco/optical_amplifier.shape
+share/dia/shapes/Cisco/optical_cross-connect.png
+share/dia/shapes/Cisco/optical_cross-connect.shape
+share/dia/shapes/Cisco/optical_fiber.png
+share/dia/shapes/Cisco/optical_fiber.shape
 share/dia/shapes/Cisco/optical_services_router.png
 share/dia/shapes/Cisco/optical_services_router.shape
 share/dia/shapes/Cisco/optical_transport.png
 share/dia/shapes/Cisco/optical_transport.shape
 share/dia/shapes/Cisco/pad.png
 share/dia/shapes/Cisco/pad.shape
-share/dia/shapes/Cisco/pad_x28.png
-share/dia/shapes/Cisco/pad_x28.shape
+share/dia/shapes/Cisco/pager.png
+share/dia/shapes/Cisco/pager.shape
 share/dia/shapes/Cisco/pbx.png
 share/dia/shapes/Cisco/pbx.shape
 share/dia/shapes/Cisco/pbx_switch.png
@@ -570,20 +705,38 @@ share/dia/shapes/Cisco/pc.png
 share/dia/shapes/Cisco/pc.shape
 share/dia/shapes/Cisco/pc_adapter_card.png
 share/dia/shapes/Cisco/pc_adapter_card.shape
+share/dia/shapes/Cisco/pc_card.png
+share/dia/shapes/Cisco/pc_card.shape
 share/dia/shapes/Cisco/pc_man.png
 share/dia/shapes/Cisco/pc_man.shape
+share/dia/shapes/Cisco/pc_man_left.png
+share/dia/shapes/Cisco/pc_man_left.shape
 share/dia/shapes/Cisco/pc_router_card.png
 share/dia/shapes/Cisco/pc_router_card.shape
+share/dia/shapes/Cisco/pc_software.png
+share/dia/shapes/Cisco/pc_software.shape
 share/dia/shapes/Cisco/pc_video.png
 share/dia/shapes/Cisco/pc_video.shape
+share/dia/shapes/Cisco/pc_with_router-based_software.png
+share/dia/shapes/Cisco/pc_with_router-based_software.shape
 share/dia/shapes/Cisco/pda.png
 share/dia/shapes/Cisco/pda.shape
 share/dia/shapes/Cisco/phone.png
 share/dia/shapes/Cisco/phone.shape
+share/dia/shapes/Cisco/phone_2.png
+share/dia/shapes/Cisco/phone_2.shape
+share/dia/shapes/Cisco/phone_appliance.png
+share/dia/shapes/Cisco/phone_appliance.shape
+share/dia/shapes/Cisco/phone_ethernet.png
+share/dia/shapes/Cisco/phone_ethernet.shape
 share/dia/shapes/Cisco/phone_fax.png
 share/dia/shapes/Cisco/phone_fax.shape
+share/dia/shapes/Cisco/phone_feature.png
+share/dia/shapes/Cisco/phone_feature.shape
 share/dia/shapes/Cisco/pix_firewall.png
 share/dia/shapes/Cisco/pix_firewall.shape
+share/dia/shapes/Cisco/pix_firewall_left.png
+share/dia/shapes/Cisco/pix_firewall_left.shape
 share/dia/shapes/Cisco/printer.png
 share/dia/shapes/Cisco/printer.shape
 share/dia/shapes/Cisco/programmable_switch.png
@@ -602,10 +755,14 @@ share/dia/shapes/Cisco/repeater.png
 share/dia/shapes/Cisco/repeater.shape
 share/dia/shapes/Cisco/route_switch_processor.png
 share/dia/shapes/Cisco/route_switch_processor.shape
+share/dia/shapes/Cisco/route_switch_processor_with_si.png
+share/dia/shapes/Cisco/route_switch_processor_with_si.shape
 share/dia/shapes/Cisco/router.png
 share/dia/shapes/Cisco/router.shape
 share/dia/shapes/Cisco/router_in_building.png
 share/dia/shapes/Cisco/router_in_building.shape
+share/dia/shapes/Cisco/router_subdued.png
+share/dia/shapes/Cisco/router_subdued.shape
 share/dia/shapes/Cisco/router_with_firewall.png
 share/dia/shapes/Cisco/router_with_firewall.shape
 share/dia/shapes/Cisco/router_with_silicon_switch.png
@@ -614,6 +771,10 @@ share/dia/shapes/Cisco/rps.png
 share/dia/shapes/Cisco/rps.shape
 share/dia/shapes/Cisco/running_man.png
 share/dia/shapes/Cisco/running_man.shape
+share/dia/shapes/Cisco/running_man_subdued.png
+share/dia/shapes/Cisco/running_man_subdued.shape
+share/dia/shapes/Cisco/running_woman.png
+share/dia/shapes/Cisco/running_woman.shape
 share/dia/shapes/Cisco/satellite.png
 share/dia/shapes/Cisco/satellite.shape
 share/dia/shapes/Cisco/satellite_dish.png
@@ -624,8 +785,14 @@ share/dia/shapes/Cisco/sc2200_vsc3000_host.png
 share/dia/shapes/Cisco/sc2200_vsc3000_host.shape
 share/dia/shapes/Cisco/scanner.png
 share/dia/shapes/Cisco/scanner.shape
+share/dia/shapes/Cisco/security_appliance.png
+share/dia/shapes/Cisco/security_appliance.shape
+share/dia/shapes/Cisco/server_switch.png
+share/dia/shapes/Cisco/server_switch.shape
 share/dia/shapes/Cisco/server_with_pc_router.png
 share/dia/shapes/Cisco/server_with_pc_router.shape
+share/dia/shapes/Cisco/service_control.png
+share/dia/shapes/Cisco/service_control.shape
 share/dia/shapes/Cisco/sip_proxy_server.png
 share/dia/shapes/Cisco/sip_proxy_server.shape
 share/dia/shapes/Cisco/sitting_woman.png
@@ -636,10 +803,14 @@ share/dia/shapes/Cisco/small_hub.png
 share/dia/shapes/Cisco/small_hub.shape
 share/dia/shapes/Cisco/softphone.png
 share/dia/shapes/Cisco/softphone.shape
-share/dia/shapes/Cisco/software_based_server.png
-share/dia/shapes/Cisco/software_based_server.shape
+share/dia/shapes/Cisco/software-based_router_on_file_server.png
+share/dia/shapes/Cisco/software-based_router_on_file_server.shape
+share/dia/shapes/Cisco/sonet_mux.png
+share/dia/shapes/Cisco/sonet_mux.shape
 share/dia/shapes/Cisco/speaker.png
 share/dia/shapes/Cisco/speaker.shape
+share/dia/shapes/Cisco/ssl_terminator.png
+share/dia/shapes/Cisco/ssl_terminator.shape
 share/dia/shapes/Cisco/standing_man.png
 share/dia/shapes/Cisco/standing_man.shape
 share/dia/shapes/Cisco/stb.png
@@ -648,6 +819,8 @@ share/dia/shapes/Cisco/storage_array.png
 share/dia/shapes/Cisco/storage_array.shape
 share/dia/shapes/Cisco/storage_router.png
 share/dia/shapes/Cisco/storage_router.shape
+share/dia/shapes/Cisco/storage_solution_engine.png
+share/dia/shapes/Cisco/storage_solution_engine.shape
 share/dia/shapes/Cisco/stp.png
 share/dia/shapes/Cisco/stp.shape
 share/dia/shapes/Cisco/sun_workstation.png
@@ -656,10 +829,14 @@ share/dia/shapes/Cisco/supercomputer.png
 share/dia/shapes/Cisco/supercomputer.shape
 share/dia/shapes/Cisco/svx.png
 share/dia/shapes/Cisco/svx.shape
+share/dia/shapes/Cisco/switch_processor.png
+share/dia/shapes/Cisco/switch_processor.shape
 share/dia/shapes/Cisco/system_controller.png
 share/dia/shapes/Cisco/system_controller.shape
 share/dia/shapes/Cisco/tablet.png
 share/dia/shapes/Cisco/tablet.shape
+share/dia/shapes/Cisco/tape_array.png
+share/dia/shapes/Cisco/tape_array.shape
 share/dia/shapes/Cisco/tdm_router.png
 share/dia/shapes/Cisco/tdm_router.shape
 share/dia/shapes/Cisco/telecommuter.png
@@ -668,8 +845,12 @@ share/dia/shapes/Cisco/telecommuter_house.png
 share/dia/shapes/Cisco/telecommuter_house.shape
 share/dia/shapes/Cisco/telecommuter_house_router.png
 share/dia/shapes/Cisco/telecommuter_house_router.shape
+share/dia/shapes/Cisco/telecommuter_house_subdued.png
+share/dia/shapes/Cisco/telecommuter_house_subdued.shape
 share/dia/shapes/Cisco/terminal.png
 share/dia/shapes/Cisco/terminal.shape
+share/dia/shapes/Cisco/terminal_server.png
+share/dia/shapes/Cisco/terminal_server.shape
 share/dia/shapes/Cisco/tokenring.png
 share/dia/shapes/Cisco/tokenring.shape
 share/dia/shapes/Cisco/transpath.png
@@ -680,8 +861,12 @@ share/dia/shapes/Cisco/turret.png
 share/dia/shapes/Cisco/turret.shape
 share/dia/shapes/Cisco/tv.png
 share/dia/shapes/Cisco/tv.shape
-share/dia/shapes/Cisco/ubr910.png
-share/dia/shapes/Cisco/ubr910.shape
+share/dia/shapes/Cisco/ubr910_cable_dsu.png
+share/dia/shapes/Cisco/ubr910_cable_dsu.shape
+share/dia/shapes/Cisco/umg_series.png
+share/dia/shapes/Cisco/umg_series.shape
+share/dia/shapes/Cisco/unity_express.png
+share/dia/shapes/Cisco/unity_express.shape
 share/dia/shapes/Cisco/unity_server.png
 share/dia/shapes/Cisco/unity_server.shape
 share/dia/shapes/Cisco/universal_gateway.png
@@ -692,16 +877,24 @@ share/dia/shapes/Cisco/ups.png
 share/dia/shapes/Cisco/ups.shape
 share/dia/shapes/Cisco/video_camera.png
 share/dia/shapes/Cisco/video_camera.shape
+share/dia/shapes/Cisco/video_camera_right.png
+share/dia/shapes/Cisco/video_camera_right.shape
 share/dia/shapes/Cisco/vip.png
 share/dia/shapes/Cisco/vip.shape
-share/dia/shapes/Cisco/voice_atm_switch.png
-share/dia/shapes/Cisco/voice_atm_switch.shape
-share/dia/shapes/Cisco/voice_commserver.png
-share/dia/shapes/Cisco/voice_commserver.shape
-share/dia/shapes/Cisco/voice_router.png
-share/dia/shapes/Cisco/voice_router.shape
-share/dia/shapes/Cisco/voice_switch.png
-share/dia/shapes/Cisco/voice_switch.shape
+share/dia/shapes/Cisco/virtual_layer_switch.png
+share/dia/shapes/Cisco/virtual_layer_switch.shape
+share/dia/shapes/Cisco/vn2900.png
+share/dia/shapes/Cisco/vn2900.shape
+share/dia/shapes/Cisco/vn5900.png
+share/dia/shapes/Cisco/vn5900.shape
+share/dia/shapes/Cisco/vn5902.png
+share/dia/shapes/Cisco/vn5902.shape
+share/dia/shapes/Cisco/voice-enabled_access_server.png
+share/dia/shapes/Cisco/voice-enabled_access_server.shape
+share/dia/shapes/Cisco/voice-enabled_atm_switch.png
+share/dia/shapes/Cisco/voice-enabled_atm_switch.shape
+share/dia/shapes/Cisco/voice-enabled_router.png
+share/dia/shapes/Cisco/voice-enabled_router.shape
 share/dia/shapes/Cisco/voice_switch2.png
 share/dia/shapes/Cisco/voice_switch2.shape
 share/dia/shapes/Cisco/vpn_concentrator.png
@@ -710,22 +903,50 @@ share/dia/shapes/Cisco/vpn_gateway.png
 share/dia/shapes/Cisco/vpn_gateway.shape
 share/dia/shapes/Cisco/vsc3000.png
 share/dia/shapes/Cisco/vsc3000.shape
+share/dia/shapes/Cisco/wan.png
+share/dia/shapes/Cisco/wan.shape
 share/dia/shapes/Cisco/wavelength_router.png
 share/dia/shapes/Cisco/wavelength_router.shape
+share/dia/shapes/Cisco/wdm.png
+share/dia/shapes/Cisco/wdm.shape
 share/dia/shapes/Cisco/web_browser.png
 share/dia/shapes/Cisco/web_browser.shape
 share/dia/shapes/Cisco/web_cluster.png
 share/dia/shapes/Cisco/web_cluster.shape
+share/dia/shapes/Cisco/wi-fi_tag.png
+share/dia/shapes/Cisco/wi-fi_tag.shape
 share/dia/shapes/Cisco/wireless.png
 share/dia/shapes/Cisco/wireless.shape
 share/dia/shapes/Cisco/wireless_bridge.png
 share/dia/shapes/Cisco/wireless_bridge.shape
+share/dia/shapes/Cisco/wireless_connectivity.png
+share/dia/shapes/Cisco/wireless_connectivity.shape
+share/dia/shapes/Cisco/wireless_location_appliance.png
+share/dia/shapes/Cisco/wireless_location_appliance.shape
+share/dia/shapes/Cisco/wireless_router.png
+share/dia/shapes/Cisco/wireless_router.shape
 share/dia/shapes/Cisco/wireless_transport.png
 share/dia/shapes/Cisco/wireless_transport.shape
+share/dia/shapes/Cisco/wlan_controller.png
+share/dia/shapes/Cisco/wlan_controller.shape
+share/dia/shapes/Cisco/woman.png
+share/dia/shapes/Cisco/woman.shape
+share/dia/shapes/Cisco/woman_blue.png
+share/dia/shapes/Cisco/woman_blue.shape
+share/dia/shapes/Cisco/woman_gold.png
+share/dia/shapes/Cisco/woman_gold.shape
+share/dia/shapes/Cisco/woman_red.png
+share/dia/shapes/Cisco/woman_red.shape
 share/dia/shapes/Cisco/workgroup_director.png
 share/dia/shapes/Cisco/workgroup_director.shape
+share/dia/shapes/Cisco/workgroup_fcis.png
+share/dia/shapes/Cisco/workgroup_fcis.shape
 share/dia/shapes/Cisco/workgroup_switch.png
 share/dia/shapes/Cisco/workgroup_switch.shape
+share/dia/shapes/Cisco/workgroup_switch_subdued.png
+share/dia/shapes/Cisco/workgroup_switch_subdued.shape
+share/dia/shapes/Cisco/workgroup_switch_voice-enabled.png
+share/dia/shapes/Cisco/workgroup_switch_voice-enabled.shape
 share/dia/shapes/Cisco/workstation.png
 share/dia/shapes/Cisco/workstation.shape
 share/dia/shapes/Cisco/www_server.png
@@ -952,6 +1173,14 @@ share/dia/shapes/Flowchart/transaction.png
 share/dia/shapes/Flowchart/transaction.shape
 share/dia/shapes/Flowchart/transmittape.png
 share/dia/shapes/Flowchart/transmittape.shape
+share/dia/shapes/Gane_and_Sarson/alt-entity.png
+share/dia/shapes/Gane_and_Sarson/alt-entity.shape
+share/dia/shapes/Gane_and_Sarson/data_store.png
+share/dia/shapes/Gane_and_Sarson/data_store.shape
+share/dia/shapes/Gane_and_Sarson/entity.png
+share/dia/shapes/Gane_and_Sarson/entity.shape
+share/dia/shapes/Gane_and_Sarson/process.png
+share/dia/shapes/Gane_and_Sarson/process.shape
 share/dia/shapes/Logic/and.png
 share/dia/shapes/Logic/and.shape
 share/dia/shapes/Logic/buffer.png
@@ -1228,6 +1457,7 @@ share/dia/shapes/sybase/rsm.png
 share/dia/shapes/sybase/rsm.shape
 share/dia/shapes/sybase/stableq.png
 share/dia/shapes/sybase/stableq.shape
+share/dia/sheets/AADL.sheet
 share/dia/sheets/Assorted.sheet
 share/dia/sheets/ChemEng.sheet
 share/dia/sheets/Circuit.sheet
@@ -1235,52 +1465,53 @@ share/dia/sheets/Contact.sheet
 share/dia/sheets/Cybernetics.sheet
 share/dia/sheets/EML.sheet
 share/dia/sheets/ER.sheet
-share/dia/sheets/ER/weakentity.xpm
+share/dia/sheets/ER/weakentity.png
 share/dia/sheets/Electric.sheet
 share/dia/sheets/FS.sheet
 share/dia/sheets/Flowchart.sheet
 share/dia/sheets/GRAFCET.sheet
-share/dia/sheets/GRAFCET/etapei.xpm
-share/dia/sheets/GRAFCET/etapemc.xpm
-share/dia/sheets/GRAFCET/etapeme.xpm
-share/dia/sheets/GRAFCET/etapems.xpm
-share/dia/sheets/GRAFCET/etapesp.xpm
-share/dia/sheets/GRAFCET/vergent_and.xpm
+share/dia/sheets/GRAFCET/etapei.png
+share/dia/sheets/GRAFCET/etapemc.png
+share/dia/sheets/GRAFCET/etapeme.png
+share/dia/sheets/GRAFCET/etapems.png
+share/dia/sheets/GRAFCET/etapesp.png
+share/dia/sheets/GRAFCET/vergent_and.png
+share/dia/sheets/Gane_and_Sarson.sheet
 share/dia/sheets/IsometricMap.sheet
 share/dia/sheets/Istar.sheet
-share/dia/sheets/Istar/agent.xpm
-share/dia/sheets/Istar/decomposition.xpm
-share/dia/sheets/Istar/dependency.xpm
-share/dia/sheets/Istar/goal.xpm
-share/dia/sheets/Istar/means_ends.xpm
-share/dia/sheets/Istar/neg_contrib.xpm
-share/dia/sheets/Istar/pos_contrib.xpm
-share/dia/sheets/Istar/position.xpm
-share/dia/sheets/Istar/role.xpm
-share/dia/sheets/Istar/task.xpm
+share/dia/sheets/Istar/agent.png
+share/dia/sheets/Istar/decomposition.png
+share/dia/sheets/Istar/dependency.png
+share/dia/sheets/Istar/goal.png
+share/dia/sheets/Istar/means_ends.png
+share/dia/sheets/Istar/neg_contrib.png
+share/dia/sheets/Istar/pos_contrib.png
+share/dia/sheets/Istar/position.png
+share/dia/sheets/Istar/role.png
+share/dia/sheets/Istar/task.png
 share/dia/sheets/Jackson.sheet
-share/dia/sheets/Jackson/designed_domain.xpm
-share/dia/sheets/Jackson/machine_domain.xpm
-share/dia/sheets/Jackson/req_phen.xpm
+share/dia/sheets/Jackson/designed_domain.png
+share/dia/sheets/Jackson/machine_domain.png
+share/dia/sheets/Jackson/req_phen.png
 share/dia/sheets/KAOS.sheet
-share/dia/sheets/KAOS/and-complete-ref.xpm
-share/dia/sheets/KAOS/and-ref.xpm
-share/dia/sheets/KAOS/assumption.xpm
-share/dia/sheets/KAOS/capable-of.xpm
-share/dia/sheets/KAOS/conflicts.xpm
-share/dia/sheets/KAOS/controls.xpm
-share/dia/sheets/KAOS/input.xpm
-share/dia/sheets/KAOS/monitors.xpm
-share/dia/sheets/KAOS/obstacle.xpm
-share/dia/sheets/KAOS/obstructs.xpm
-share/dia/sheets/KAOS/op-ref.xpm
-share/dia/sheets/KAOS/or-complete-ref.xpm
-share/dia/sheets/KAOS/or-ref.xpm
-share/dia/sheets/KAOS/output.xpm
-share/dia/sheets/KAOS/performs.xpm
-share/dia/sheets/KAOS/requirement.xpm
-share/dia/sheets/KAOS/responsibility.xpm
-share/dia/sheets/KAOS/softgoal.xpm
+share/dia/sheets/KAOS/and-complete-ref.png
+share/dia/sheets/KAOS/and-ref.png
+share/dia/sheets/KAOS/assumption.png
+share/dia/sheets/KAOS/capable-of.png
+share/dia/sheets/KAOS/conflicts.png
+share/dia/sheets/KAOS/controls.png
+share/dia/sheets/KAOS/input.png
+share/dia/sheets/KAOS/monitors.png
+share/dia/sheets/KAOS/obstacle.png
+share/dia/sheets/KAOS/obstructs.png
+share/dia/sheets/KAOS/op-ref.png
+share/dia/sheets/KAOS/or-complete-ref.png
+share/dia/sheets/KAOS/or-ref.png
+share/dia/sheets/KAOS/output.png
+share/dia/sheets/KAOS/performs.png
+share/dia/sheets/KAOS/requirement.png
+share/dia/sheets/KAOS/responsibility.png
+share/dia/sheets/KAOS/softgoal.png
 share/dia/sheets/Logic.sheet
 share/dia/sheets/MSE.sheet
 share/dia/sheets/Misc.sheet
@@ -1298,7 +1529,7 @@ share/dia/sheets/ciscocomputer.sheet
 share/dia/sheets/ciscohub.sheet
 share/dia/sheets/ciscomisc.sheet
 share/dia/sheets/cisconetwork.sheet
-share/dia/sheets/ciscorouter.sheet
+share/dia/sheets/ciscotelephony.sheet
 share/dia/sheets/civil.sheet
 share/dia/sheets/jigsaw.sheet
 share/dia/sheets/network.sheet
@@ -1311,19 +1542,39 @@ share/dia/xslt/dia-uml2java.xsl
 share/dia/xslt/dia-uml2owl.xsl
 share/dia/xslt/dia-uml2python.xsl
 share/dia/xslt/stylesheets.xml
-${GNOME_OPTION}share/gnome/help/dia/C
-${GNOME_OPTION}share/gnome/help/dia/en/dia.xml
-${GNOME_OPTION}share/gnome/help/dia/en/graphics/greendots.png
-${GNOME_OPTION}share/gnome/help/dia/en/graphics/home_network.png
-${GNOME_OPTION}share/gnome/help/dia/en/graphics/line_icon.png
-${GNOME_OPTION}share/gnome/help/dia/en/graphics/line_props.png
-${GNOME_OPTION}share/gnome/help/dia/pl/dia.xml
-${GNOME_OPTION}share/gnome/help/dia/pl/graphics/greendots.png
-${GNOME_OPTION}share/gnome/help/dia/pl/graphics/home_network.png
-${GNOME_OPTION}share/gnome/help/dia/pl/graphics/line_props.png
+${DIA_HELPDIR}/C
+${DIA_HELPDIR}/en/authors.xml
+${DIA_HELPDIR}/en/dia.xml
+${DIA_HELPDIR}/en/entities.xml
+${DIA_HELPDIR}/en/graphics/greendots.png
+${DIA_HELPDIR}/en/graphics/home_network.png
+${DIA_HELPDIR}/en/graphics/line_icon.png
+${DIA_HELPDIR}/en/graphics/line_props.png
+${DIA_HELPDIR}/en/intro.xml
+${DIA_HELPDIR}/en/license.xml
+${DIA_HELPDIR}/en/usage-canvas.xml
+${DIA_HELPDIR}/en/usage-customization.xml
+${DIA_HELPDIR}/en/usage-layers.xml
+${DIA_HELPDIR}/en/usage-loadsave.xml
+${DIA_HELPDIR}/en/usage-objects-basic.xml
+${DIA_HELPDIR}/en/usage-objects-selecting.xml
+${DIA_HELPDIR}/en/usage-objects-special.xml
+${DIA_HELPDIR}/en/usage-objects.xml
+${DIA_HELPDIR}/en/usage-quickstart.xml
+${DIA_HELPDIR}/eu/dia.xml
+${DIA_HELPDIR}/eu/graphics/greendots.png
+${DIA_HELPDIR}/eu/graphics/home_network.png
+${DIA_HELPDIR}/eu/graphics/line_icon.png
+${DIA_HELPDIR}/eu/graphics/line_props.png
+${DIA_HELPDIR}/pl/dia.xml
+${DIA_HELPDIR}/pl/graphics/greendots.png
+${DIA_HELPDIR}/pl/graphics/home_network.png
+${DIA_HELPDIR}/pl/graphics/line_props.png
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/dia.mo
@@ -1332,12 +1583,14 @@ ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/dia.mo
@@ -1346,14 +1599,16 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/dia.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/dia.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/dia.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/dia.mo
@@ -1376,12 +1631,14 @@ share/pixmaps/dia_gnome_icon.png
 @exec ${MKDIR} %D/share/oaf
 @dirrm share/oaf
 @comment in xdg-dirs: @dirrm share/mime-info
-${GNOME_OPTION}@dirrm share/gnome/help/dia/pl/graphics
-${GNOME_OPTION}@dirrm share/gnome/help/dia/pl
-${GNOME_OPTION}@dirrm share/gnome/help/dia/en/graphics
-${GNOME_OPTION}@dirrm share/gnome/help/dia/en
-${GNOME_OPTION}@dirrm share/gnome/help/dia
-${GNOME_OPTION}@comment in gnome2-dirs: @dirrm share/gnome/help
+@dirrm ${DIA_HELPDIR}/pl/graphics
+@dirrm ${DIA_HELPDIR}/pl
+@dirrm ${DIA_HELPDIR}/eu/graphics
+@dirrm ${DIA_HELPDIR}/eu
+@dirrm ${DIA_HELPDIR}/en/graphics
+@dirrm ${DIA_HELPDIR}/en
+@dirrm ${DIA_HELPDIR}
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/dia/xslt
 @dirrm share/dia/sheets/UML
 @dirrm share/dia/sheets/KAOS
@@ -1401,6 +1658,7 @@ ${GNOME_OPTION}@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/dia/shapes/Map
 @dirrm share/dia/shapes/MSE
 @dirrm share/dia/shapes/Logic
+@dirrm share/dia/shapes/Gane_and_Sarson
 @dirrm share/dia/shapes/Flowchart
 @dirrm share/dia/shapes/Electric
 @dirrm share/dia/shapes/Cybernetics
@@ -1411,7 +1669,6 @@ ${GNOME_OPTION}@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/dia/shapes/ChemEng
 @dirrm share/dia/shapes/Assorted
 @dirrm share/dia/shapes
-@dirrm share/dia/images
 @dirrm share/dia
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/dia