dia r3927 - in trunk: . installer/win32

From: sdteffen svn gnome org
To: svn-commits-list gnome org
Subject: dia r3927 - in trunk: . installer/win32
Date: Mon, 7 Apr 2008 22:11:22 +0100 (BST)
Author: sdteffen
Date: Mon Apr  7 22:11:21 2008
New Revision: 3927
URL: http://svn.gnome.org/viewvc/dia?rev=3927&view=rev

Log:
	* installer/win32/dia.nsi: Various small updates; the sample files
	are now included in the installer build (fixes bug #518094)

Modified:
   trunk/ChangeLog
   trunk/installer/win32/dia.nsi

Modified: trunk/installer/win32/dia.nsi
==============================================================================
--- trunk/installer/win32/dia.nsi	(original)
+++ trunk/installer/win32/dia.nsi	Mon Apr  7 22:11:21 2008
@@ -577,94 +577,94 @@
 ${SetOutPath} "$INSTDIR\shapes\Circuit"
 ${File} "..\..\shapes\Circuit\" "ground.png"
 ${File} "..\..\shapes\Circuit\" "ground.shape"
-${File} "..\..\shapes\Circuit\" "ground.xpm"
+${File} "..\..\shapes\Circuit\" "ground.png"
 ${File} "..\..\shapes\Circuit\" "hcapacitor.png"
 ${File} "..\..\shapes\Circuit\" "hcapacitor.shape"
-${File} "..\..\shapes\Circuit\" "hcapacitor.xpm"
+${File} "..\..\shapes\Circuit\" "hcapacitor.png"
 ${File} "..\..\shapes\Circuit\" "hdiode.png"
 ${File} "..\..\shapes\Circuit\" "hdiode.shape"
-${File} "..\..\shapes\Circuit\" "hdiode.xpm"
+${File} "..\..\shapes\Circuit\" "hdiode.png"
 ${File} "..\..\shapes\Circuit\" "hfuse_de.png"
 ${File} "..\..\shapes\Circuit\" "hfuse_de.shape"
-${File} "..\..\shapes\Circuit\" "hfuse_de.xpm"
+${File} "..\..\shapes\Circuit\" "hfuse_de.png"
 ${File} "..\..\shapes\Circuit\" "hinductor.png"
 ${File} "..\..\shapes\Circuit\" "hinductor.shape"
-${File} "..\..\shapes\Circuit\" "hinductor.xpm"
+${File} "..\..\shapes\Circuit\" "hinductor.png"
 ${File} "..\..\shapes\Circuit\" "hinductor_de.png"
 ${File} "..\..\shapes\Circuit\" "hinductor_de.shape"
-${File} "..\..\shapes\Circuit\" "hinductor_de.xpm"
+${File} "..\..\shapes\Circuit\" "hinductor_de.png"
 ${File} "..\..\shapes\Circuit\" "hjumper.png"
 ${File} "..\..\shapes\Circuit\" "hjumper.shape"
 ${File} "..\..\shapes\Circuit\" "hled_de.png"
 ${File} "..\..\shapes\Circuit\" "hled_de.shape"
-${File} "..\..\shapes\Circuit\" "hled_de.xpm"
+${File} "..\..\shapes\Circuit\" "hled_de.png"
 ${File} "..\..\shapes\Circuit\" "hpowersource_de.png"
 ${File} "..\..\shapes\Circuit\" "hpowersource_de.shape"
-${File} "..\..\shapes\Circuit\" "hpowersource_de.xpm"
+${File} "..\..\shapes\Circuit\" "hpowersource_de.png"
 ${File} "..\..\shapes\Circuit\" "hresistor.png"
 ${File} "..\..\shapes\Circuit\" "hresistor.shape"
-${File} "..\..\shapes\Circuit\" "hresistor.xpm"
+${File} "..\..\shapes\Circuit\" "hresistor.png"
 ${File} "..\..\shapes\Circuit\" "hresistor_de.png"
 ${File} "..\..\shapes\Circuit\" "hresistor_de.shape"
-${File} "..\..\shapes\Circuit\" "hresistor_de.xpm"
+${File} "..\..\shapes\Circuit\" "hresistor_de.png"
 ${File} "..\..\shapes\Circuit\" "hzener.png"
 ${File} "..\..\shapes\Circuit\" "hzener.shape"
-${File} "..\..\shapes\Circuit\" "hzener.xpm"
+${File} "..\..\shapes\Circuit\" "hzener.png"
 ${File} "..\..\shapes\Circuit\" "lamp_de.png"
 ${File} "..\..\shapes\Circuit\" "lamp_de.shape"
-${File} "..\..\shapes\Circuit\" "lamp_de.xpm"
+${File} "..\..\shapes\Circuit\" "lamp_de.png"
 ${File} "..\..\shapes\Circuit\" "microphone_de.png"
 ${File} "..\..\shapes\Circuit\" "microphone_de.shape"
-${File} "..\..\shapes\Circuit\" "microphone_de.xpm"
+${File} "..\..\shapes\Circuit\" "microphone_de.png"
 ${File} "..\..\shapes\Circuit\" "nmos_de.png"
 ${File} "..\..\shapes\Circuit\" "nmos_de.shape"
-${File} "..\..\shapes\Circuit\" "nmos_de.xpm"
+${File} "..\..\shapes\Circuit\" "nmos_de.png"
 ${File} "..\..\shapes\Circuit\" "npn.png"
 ${File} "..\..\shapes\Circuit\" "npn.shape"
-${File} "..\..\shapes\Circuit\" "npn.xpm"
+${File} "..\..\shapes\Circuit\" "npn.png"
 ${File} "..\..\shapes\Circuit\" "opamp.png"
 ${File} "..\..\shapes\Circuit\" "opamp.shape"
-${File} "..\..\shapes\Circuit\" "opamp.xpm"
+${File} "..\..\shapes\Circuit\" "opamp.png"
 ${File} "..\..\shapes\Circuit\" "pmos_de.png"
 ${File} "..\..\shapes\Circuit\" "pmos_de.shape"
-${File} "..\..\shapes\Circuit\" "pmos_de.xpm"
+${File} "..\..\shapes\Circuit\" "pmos_de.png"
 ${File} "..\..\shapes\Circuit\" "pnp.png"
 ${File} "..\..\shapes\Circuit\" "pnp.shape"
-${File} "..\..\shapes\Circuit\" "pnp.xpm"
+${File} "..\..\shapes\Circuit\" "pnp.png"
 ${File} "..\..\shapes\Circuit\" "README"
 ${File} "..\..\shapes\Circuit\" "speaker_de.png"
 ${File} "..\..\shapes\Circuit\" "speaker_de.shape"
-${File} "..\..\shapes\Circuit\" "speaker_de.xpm"
+${File} "..\..\shapes\Circuit\" "speaker_de.png"
 ${File} "..\..\shapes\Circuit\" "vcapacitor.png"
 ${File} "..\..\shapes\Circuit\" "vcapacitor.shape"
-${File} "..\..\shapes\Circuit\" "vcapacitor.xpm"
+${File} "..\..\shapes\Circuit\" "vcapacitor.png"
 ${File} "..\..\shapes\Circuit\" "vdiode.png"
 ${File} "..\..\shapes\Circuit\" "vdiode.shape"
-${File} "..\..\shapes\Circuit\" "vdiode.xpm"
+${File} "..\..\shapes\Circuit\" "vdiode.png"
 ${File} "..\..\shapes\Circuit\" "vfuse_de.png"
 ${File} "..\..\shapes\Circuit\" "vfuse_de.shape"
-${File} "..\..\shapes\Circuit\" "vfuse_de.xpm"
+${File} "..\..\shapes\Circuit\" "vfuse_de.png"
 ${File} "..\..\shapes\Circuit\" "vinductor.png"
 ${File} "..\..\shapes\Circuit\" "vinductor.shape"
-${File} "..\..\shapes\Circuit\" "vinductor.xpm"
+${File} "..\..\shapes\Circuit\" "vinductor.png"
 ${File} "..\..\shapes\Circuit\" "vinductor_de.png"
 ${File} "..\..\shapes\Circuit\" "vinductor_de.shape"
-${File} "..\..\shapes\Circuit\" "vinductor_de.xpm"
+${File} "..\..\shapes\Circuit\" "vinductor_de.png"
 ${File} "..\..\shapes\Circuit\" "vled_de.png"
 ${File} "..\..\shapes\Circuit\" "vled_de.shape"
-${File} "..\..\shapes\Circuit\" "vled_de.xpm"
+${File} "..\..\shapes\Circuit\" "vled_de.png"
 ${File} "..\..\shapes\Circuit\" "vpowersource_de.png"
 ${File} "..\..\shapes\Circuit\" "vpowersource_de.shape"
-${File} "..\..\shapes\Circuit\" "vpowersource_de.xpm"
+${File} "..\..\shapes\Circuit\" "vpowersource_de.png"
 ${File} "..\..\shapes\Circuit\" "vresistor.png"
 ${File} "..\..\shapes\Circuit\" "vresistor.shape"
-${File} "..\..\shapes\Circuit\" "vresistor.xpm"
+${File} "..\..\shapes\Circuit\" "vresistor.png"
 ${File} "..\..\shapes\Circuit\" "vresistor_de.png"
 ${File} "..\..\shapes\Circuit\" "vresistor_de.shape"
-${File} "..\..\shapes\Circuit\" "vresistor_de.xpm"
+${File} "..\..\shapes\Circuit\" "vresistor_de.png"
 ${File} "..\..\shapes\Circuit\" "vzener.png"
 ${File} "..\..\shapes\Circuit\" "vzener.shape"
-${File} "..\..\shapes\Circuit\" "vzener.xpm"
+${File} "..\..\shapes\Circuit\" "vzener.png"
 ${SetOutPath} "$INSTDIR\shapes\Cisco"
 ${File} "..\..\shapes\Cisco\" "1000.png"
 ${File} "..\..\shapes\Cisco\" "1000.shape"
@@ -1361,131 +1361,131 @@
 ${SetOutPath} "$INSTDIR\shapes\Civil"
 ${File} "..\..\shapes\Civil\" "bvrest.png"
 ${File} "..\..\shapes\Civil\" "bvrest.shape"
-${File} "..\..\shapes\Civil\" "bvrest.xpm"
+${File} "..\..\shapes\Civil\" "bvrest.png"
 ${File} "..\..\shapes\Civil\" "civil_aerator.png"
 ${File} "..\..\shapes\Civil\" "civil_aerator.shape"
-${File} "..\..\shapes\Civil\" "civil_aerator.xpm"
+${File} "..\..\shapes\Civil\" "civil_aerator.png"
 ${File} "..\..\shapes\Civil\" "civil_arrow_right.png"
 ${File} "..\..\shapes\Civil\" "civil_arrow_right.shape"
-${File} "..\..\shapes\Civil\" "civil_arrow_right.xpm"
+${File} "..\..\shapes\Civil\" "civil_arrow_right.png"
 ${File} "..\..\shapes\Civil\" "civil_arrow_up.png"
 ${File} "..\..\shapes\Civil\" "civil_arrow_up.shape"
-${File} "..\..\shapes\Civil\" "civil_arrow_up.xpm"
+${File} "..\..\shapes\Civil\" "civil_arrow_up.png"
 ${File} "..\..\shapes\Civil\" "civil_backflow_preventer.png"
 ${File} "..\..\shapes\Civil\" "civil_backflow_preventer.shape"
-${File} "..\..\shapes\Civil\" "civil_backflow_preventer.xpm"
+${File} "..\..\shapes\Civil\" "civil_backflow_preventer.png"
 ${File} "..\..\shapes\Civil\" "civil_basin.png"
 ${File} "..\..\shapes\Civil\" "civil_basin.shape"
-${File} "..\..\shapes\Civil\" "civil_basin.xpm"
+${File} "..\..\shapes\Civil\" "civil_basin.png"
 ${File} "..\..\shapes\Civil\" "civil_container.png"
 ${File} "..\..\shapes\Civil\" "civil_container.shape"
-${File} "..\..\shapes\Civil\" "civil_container.xpm"
+${File} "..\..\shapes\Civil\" "civil_container.png"
 ${File} "..\..\shapes\Civil\" "civil_final-settling_basin.png"
 ${File} "..\..\shapes\Civil\" "civil_final-settling_basin.shape"
-${File} "..\..\shapes\Civil\" "civil_final-settling_basin.xpm"
+${File} "..\..\shapes\Civil\" "civil_final-settling_basin.png"
 ${File} "..\..\shapes\Civil\" "civil_frequency_converter.png"
 ${File} "..\..\shapes\Civil\" "civil_frequency_converter.shape"
-${File} "..\..\shapes\Civil\" "civil_frequency_converter.xpm"
+${File} "..\..\shapes\Civil\" "civil_frequency_converter.png"
 ${File} "..\..\shapes\Civil\" "civil_gas_bottle.png"
 ${File} "..\..\shapes\Civil\" "civil_gas_bottle.shape"
-${File} "..\..\shapes\Civil\" "civil_gas_bottle.xpm"
+${File} "..\..\shapes\Civil\" "civil_gas_bottle.png"
 ${File} "..\..\shapes\Civil\" "civil_horizontal_limiting_line.png"
 ${File} "..\..\shapes\Civil\" "civil_horizontal_limiting_line.shape"
-${File} "..\..\shapes\Civil\" "civil_horizontal_limiting_line.xpm"
+${File} "..\..\shapes\Civil\" "civil_horizontal_limiting_line.png"
 ${File} "..\..\shapes\Civil\" "civil_horizontal_valve.png"
 ${File} "..\..\shapes\Civil\" "civil_horizontal_valve.shape"
-${File} "..\..\shapes\Civil\" "civil_horizontal_valve.xpm"
+${File} "..\..\shapes\Civil\" "civil_horizontal_valve.png"
 ${File} "..\..\shapes\Civil\" "civil_motor.png"
 ${File} "..\..\shapes\Civil\" "civil_motor.shape"
-${File} "..\..\shapes\Civil\" "civil_motor.xpm"
+${File} "..\..\shapes\Civil\" "civil_motor.png"
 ${File} "..\..\shapes\Civil\" "civil_preliminary_clarification_tank.png"
 ${File} "..\..\shapes\Civil\" "civil_preliminary_clarification_tank.shape"
-${File} "..\..\shapes\Civil\" "civil_preliminary_clarification_tank.xpm"
+${File} "..\..\shapes\Civil\" "civil_preliminary_clarification_tank.png"
 ${File} "..\..\shapes\Civil\" "civil_rotor.png"
 ${File} "..\..\shapes\Civil\" "civil_rotor.shape"
-${File} "..\..\shapes\Civil\" "civil_rotor.xpm"
+${File} "..\..\shapes\Civil\" "civil_rotor.png"
 ${File} "..\..\shapes\Civil\" "civil_soil.png"
 ${File} "..\..\shapes\Civil\" "civil_soil.shape"
-${File} "..\..\shapes\Civil\" "civil_soil.xpm"
+${File} "..\..\shapes\Civil\" "civil_soil.png"
 ${File} "..\..\shapes\Civil\" "civil_vertical_limiting_line.png"
 ${File} "..\..\shapes\Civil\" "civil_vertical_limiting_line.shape"
-${File} "..\..\shapes\Civil\" "civil_vertical_limiting_line.xpm"
+${File} "..\..\shapes\Civil\" "civil_vertical_limiting_line.png"
 ${File} "..\..\shapes\Civil\" "civil_vertical_propeller.png"
 ${File} "..\..\shapes\Civil\" "civil_vertical_propeller.shape"
-${File} "..\..\shapes\Civil\" "civil_vertical_propeller.xpm"
+${File} "..\..\shapes\Civil\" "civil_vertical_propeller.png"
 ${File} "..\..\shapes\Civil\" "hcompressor.png"
 ${File} "..\..\shapes\Civil\" "hcompressor.shape"
-${File} "..\..\shapes\Civil\" "hcompressor.xpm"
+${File} "..\..\shapes\Civil\" "hcompressor.png"
 ${File} "..\..\shapes\Civil\" "hpump.png"
 ${File} "..\..\shapes\Civil\" "hpump.shape"
-${File} "..\..\shapes\Civil\" "hpump.xpm"
+${File} "..\..\shapes\Civil\" "hpump.png"
 ${File} "..\..\shapes\Civil\" "hrest.png"
 ${File} "..\..\shapes\Civil\" "hrest.shape"
-${File} "..\..\shapes\Civil\" "hrest.xpm"
+${File} "..\..\shapes\Civil\" "hrest.png"
 ${File} "..\..\shapes\Civil\" "line.png"
 ${File} "..\..\shapes\Civil\" "line.shape"
-${File} "..\..\shapes\Civil\" "line.xpm"
+${File} "..\..\shapes\Civil\" "line.png"
 ${File} "..\..\shapes\Civil\" "vcompressor.png"
 ${File} "..\..\shapes\Civil\" "vcompressor.shape"
-${File} "..\..\shapes\Civil\" "vcompressor.xpm"
+${File} "..\..\shapes\Civil\" "vcompressor.png"
 ${File} "..\..\shapes\Civil\" "vpump.png"
 ${File} "..\..\shapes\Civil\" "vpump.shape"
-${File} "..\..\shapes\Civil\" "vpump.xpm"
+${File} "..\..\shapes\Civil\" "vpump.png"
 ${File} "..\..\shapes\Civil\" "vrest.png"
 ${File} "..\..\shapes\Civil\" "vrest.shape"
-${File} "..\..\shapes\Civil\" "vrest.xpm"
+${File} "..\..\shapes\Civil\" "vrest.png"
 ${File} "..\..\shapes\Civil\" "water_level.png"
 ${File} "..\..\shapes\Civil\" "water_level.shape"
-${File} "..\..\shapes\Civil\" "water_level.xpm"
+${File} "..\..\shapes\Civil\" "water_level.png"
 ${SetOutPath} "$INSTDIR\shapes\Contact"
 ${File} "..\..\shapes\Contact\" "c_if.png"
 ${File} "..\..\shapes\Contact\" "c_if.shape"
-${File} "..\..\shapes\Contact\" "c_if.xpm"
+${File} "..\..\shapes\Contact\" "c_if.png"
 ${File} "..\..\shapes\Contact\" "c_ifnot.png"
 ${File} "..\..\shapes\Contact\" "c_ifnot.shape"
-${File} "..\..\shapes\Contact\" "c_ifnot.xpm"
+${File} "..\..\shapes\Contact\" "c_ifnot.png"
 ${File} "..\..\shapes\Contact\" "c_lamp.png"
 ${File} "..\..\shapes\Contact\" "c_lamp.shape"
-${File} "..\..\shapes\Contact\" "c_lamp.xpm"
+${File} "..\..\shapes\Contact\" "c_lamp.png"
 ${File} "..\..\shapes\Contact\" "c_relay.png"
 ${File} "..\..\shapes\Contact\" "c_relay.shape"
-${File} "..\..\shapes\Contact\" "c_relay.xpm"
+${File} "..\..\shapes\Contact\" "c_relay.png"
 ${File} "..\..\shapes\Contact\" "l_if.png"
 ${File} "..\..\shapes\Contact\" "l_if.shape"
-${File} "..\..\shapes\Contact\" "l_if.xpm"
+${File} "..\..\shapes\Contact\" "l_if.png"
 ${File} "..\..\shapes\Contact\" "l_ifnot.png"
 ${File} "..\..\shapes\Contact\" "l_ifnot.shape"
-${File} "..\..\shapes\Contact\" "l_ifnot.xpm"
+${File} "..\..\shapes\Contact\" "l_ifnot.png"
 ${File} "..\..\shapes\Contact\" "l_out.png"
 ${File} "..\..\shapes\Contact\" "l_out.shape"
-${File} "..\..\shapes\Contact\" "l_out.xpm"
+${File} "..\..\shapes\Contact\" "l_out.png"
 ${File} "..\..\shapes\Contact\" "l_outj.png"
 ${File} "..\..\shapes\Contact\" "l_outj.shape"
-${File} "..\..\shapes\Contact\" "l_outj.xpm"
+${File} "..\..\shapes\Contact\" "l_outj.png"
 ${File} "..\..\shapes\Contact\" "l_outnot.png"
 ${File} "..\..\shapes\Contact\" "l_outnot.shape"
-${File} "..\..\shapes\Contact\" "l_outnot.xpm"
+${File} "..\..\shapes\Contact\" "l_outnot.png"
 ${File} "..\..\shapes\Contact\" "l_outr.png"
 ${File} "..\..\shapes\Contact\" "l_outr.shape"
-${File} "..\..\shapes\Contact\" "l_outr.xpm"
+${File} "..\..\shapes\Contact\" "l_outr.png"
 ${File} "..\..\shapes\Contact\" "l_outrcep.png"
 ${File} "..\..\shapes\Contact\" "l_outrcep.shape"
-${File} "..\..\shapes\Contact\" "l_outrcep.xpm"
+${File} "..\..\shapes\Contact\" "l_outrcep.png"
 ${File} "..\..\shapes\Contact\" "l_outs.png"
 ${File} "..\..\shapes\Contact\" "l_outs.shape"
-${File} "..\..\shapes\Contact\" "l_outs.xpm"
+${File} "..\..\shapes\Contact\" "l_outs.png"
 ${File} "..\..\shapes\Contact\" "l_sout.png"
 ${File} "..\..\shapes\Contact\" "l_sout.shape"
-${File} "..\..\shapes\Contact\" "l_sout.xpm"
+${File} "..\..\shapes\Contact\" "l_sout.png"
 ${File} "..\..\shapes\Contact\" "l_soutnot.png"
 ${File} "..\..\shapes\Contact\" "l_soutnot.shape"
-${File} "..\..\shapes\Contact\" "l_soutnot.xpm"
+${File} "..\..\shapes\Contact\" "l_soutnot.png"
 ${File} "..\..\shapes\Contact\" "l_soutr.png"
 ${File} "..\..\shapes\Contact\" "l_soutr.shape"
-${File} "..\..\shapes\Contact\" "l_soutr.xpm"
+${File} "..\..\shapes\Contact\" "l_soutr.png"
 ${File} "..\..\shapes\Contact\" "l_souts.png"
 ${File} "..\..\shapes\Contact\" "l_souts.shape"
-${File} "..\..\shapes\Contact\" "l_souts.xpm"
+${File} "..\..\shapes\Contact\" "l_souts.png"
 ${SetOutPath} "$INSTDIR\shapes\Cybernetics"
 ${File} "..\..\shapes\Cybernetics\" "b-integrator.png"
 ${File} "..\..\shapes\Cybernetics\" "b-integrator.shape"
@@ -1550,124 +1550,124 @@
 ${SetOutPath} "$INSTDIR\shapes\Electric"
 ${File} "..\..\shapes\Electric\" "cnx.png"
 ${File} "..\..\shapes\Electric\" "cnx.shape"
-${File} "..\..\shapes\Electric\" "cnx.xpm"
+${File} "..\..\shapes\Electric\" "cnx.png"
 ${File} "..\..\shapes\Electric\" "command.png"
 ${File} "..\..\shapes\Electric\" "command.shape"
-${File} "..\..\shapes\Electric\" "command.xpm"
+${File} "..\..\shapes\Electric\" "command.png"
 ${File} "..\..\shapes\Electric\" "contact_f.png"
 ${File} "..\..\shapes\Electric\" "contact_f.shape"
-${File} "..\..\shapes\Electric\" "contact_f.xpm"
+${File} "..\..\shapes\Electric\" "contact_f.png"
 ${File} "..\..\shapes\Electric\" "contact_o.png"
 ${File} "..\..\shapes\Electric\" "contact_o.shape"
-${File} "..\..\shapes\Electric\" "contact_o.xpm"
+${File} "..\..\shapes\Electric\" "contact_o.png"
 ${File} "..\..\shapes\Electric\" "intpos_f.png"
 ${File} "..\..\shapes\Electric\" "intpos_f.shape"
-${File} "..\..\shapes\Electric\" "intpos_f.xpm"
+${File} "..\..\shapes\Electric\" "intpos_f.png"
 ${File} "..\..\shapes\Electric\" "intpos_o.png"
 ${File} "..\..\shapes\Electric\" "intpos_o.shape"
-${File} "..\..\shapes\Electric\" "intpos_o.xpm"
+${File} "..\..\shapes\Electric\" "intpos_o.png"
 ${File} "..\..\shapes\Electric\" "lamp.png"
 ${File} "..\..\shapes\Electric\" "lamp.shape"
-${File} "..\..\shapes\Electric\" "lamp.xpm"
+${File} "..\..\shapes\Electric\" "lamp.png"
 ${File} "..\..\shapes\Electric\" "relay.png"
 ${File} "..\..\shapes\Electric\" "relay.shape"
-${File} "..\..\shapes\Electric\" "relay.xpm"
+${File} "..\..\shapes\Electric\" "relay.png"
 ${File} "..\..\shapes\Electric\" "vcommand.png"
 ${File} "..\..\shapes\Electric\" "vcommand.shape"
-${File} "..\..\shapes\Electric\" "vcommand.xpm"
+${File} "..\..\shapes\Electric\" "vcommand.png"
 ${File} "..\..\shapes\Electric\" "vcontact_f.png"
 ${File} "..\..\shapes\Electric\" "vcontact_f.shape"
-${File} "..\..\shapes\Electric\" "vcontact_f.xpm"
+${File} "..\..\shapes\Electric\" "vcontact_f.png"
 ${File} "..\..\shapes\Electric\" "vcontact_o.png"
 ${File} "..\..\shapes\Electric\" "vcontact_o.shape"
-${File} "..\..\shapes\Electric\" "vcontact_o.xpm"
+${File} "..\..\shapes\Electric\" "vcontact_o.png"
 ${File} "..\..\shapes\Electric\" "vintpos_f.png"
 ${File} "..\..\shapes\Electric\" "vintpos_f.shape"
-${File} "..\..\shapes\Electric\" "vintpos_f.xpm"
+${File} "..\..\shapes\Electric\" "vintpos_f.png"
 ${File} "..\..\shapes\Electric\" "vintpos_o.png"
 ${File} "..\..\shapes\Electric\" "vintpos_o.shape"
-${File} "..\..\shapes\Electric\" "vintpos_o.xpm"
+${File} "..\..\shapes\Electric\" "vintpos_o.png"
 ${File} "..\..\shapes\Electric\" "vlamp.png"
 ${File} "..\..\shapes\Electric\" "vlamp.shape"
-${File} "..\..\shapes\Electric\" "vlamp.xpm"
+${File} "..\..\shapes\Electric\" "vlamp.png"
 ${File} "..\..\shapes\Electric\" "vrelay.png"
 ${File} "..\..\shapes\Electric\" "vrelay.shape"
-${File} "..\..\shapes\Electric\" "vrelay.xpm"
+${File} "..\..\shapes\Electric\" "vrelay.png"
 ${SetOutPath} "$INSTDIR\shapes\flowchart"
 ${File} "..\..\shapes\flowchart\" "collate.png"
 ${File} "..\..\shapes\flowchart\" "collate.shape"
-${File} "..\..\shapes\flowchart\" "collate.xpm"
+${File} "..\..\shapes\flowchart\" "collate.png"
 ${File} "..\..\shapes\flowchart\" "datasource.shape"
 ${File} "..\..\shapes\flowchart\" "datasource.png"
 ${File} "..\..\shapes\flowchart\" "delay.png"
 ${File} "..\..\shapes\flowchart\" "delay.shape"
-${File} "..\..\shapes\flowchart\" "delay.xpm"
+${File} "..\..\shapes\flowchart\" "delay.png"
 ${File} "..\..\shapes\flowchart\" "display.png"
 ${File} "..\..\shapes\flowchart\" "display.shape"
-${File} "..\..\shapes\flowchart\" "display.xpm"
+${File} "..\..\shapes\flowchart\" "display.png"
 ${File} "..\..\shapes\flowchart\" "document.png"
 ${File} "..\..\shapes\flowchart\" "document.shape"
-${File} "..\..\shapes\flowchart\" "document.xpm"
+${File} "..\..\shapes\flowchart\" "document.png"
 ${File} "..\..\shapes\flowchart\" "extract.png"
 ${File} "..\..\shapes\flowchart\" "extract.shape"
-${File} "..\..\shapes\flowchart\" "extract.xpm"
+${File} "..\..\shapes\flowchart\" "extract.png"
 ${File} "..\..\shapes\flowchart\" "intstorage.png"
 ${File} "..\..\shapes\flowchart\" "intstorage.shape"
-${File} "..\..\shapes\flowchart\" "intstorage.xpm"
+${File} "..\..\shapes\flowchart\" "intstorage.png"
 ${File} "..\..\shapes\flowchart\" "magdisk.png"
 ${File} "..\..\shapes\flowchart\" "magdisk.shape"
-${File} "..\..\shapes\flowchart\" "magdisk.xpm"
+${File} "..\..\shapes\flowchart\" "magdisk.png"
 ${File} "..\..\shapes\flowchart\" "magdrum.png"
 ${File} "..\..\shapes\flowchart\" "magdrum.shape"
-${File} "..\..\shapes\flowchart\" "magdrum.xpm"
+${File} "..\..\shapes\flowchart\" "magdrum.png"
 ${File} "..\..\shapes\flowchart\" "magtape.png"
 ${File} "..\..\shapes\flowchart\" "magtape.shape"
-${File} "..\..\shapes\flowchart\" "magtape.xpm"
+${File} "..\..\shapes\flowchart\" "magtape.png"
 ${File} "..\..\shapes\flowchart\" "manualinput.png"
 ${File} "..\..\shapes\flowchart\" "manualinput.shape"
-${File} "..\..\shapes\flowchart\" "manualinput.xpm"
+${File} "..\..\shapes\flowchart\" "manualinput.png"
 ${File} "..\..\shapes\flowchart\" "manualop.png"
 ${File} "..\..\shapes\flowchart\" "manualop.shape"
-${File} "..\..\shapes\flowchart\" "manualop.xpm"
+${File} "..\..\shapes\flowchart\" "manualop.png"
 ${File} "..\..\shapes\flowchart\" "merge.png"
 ${File} "..\..\shapes\flowchart\" "merge.shape"
-${File} "..\..\shapes\flowchart\" "merge.xpm"
+${File} "..\..\shapes\flowchart\" "merge.png"
 ${File} "..\..\shapes\flowchart\" "offlinestore.png"
 ${File} "..\..\shapes\flowchart\" "offlinestore.shape"
-${File} "..\..\shapes\flowchart\" "offlinestore.xpm"
+${File} "..\..\shapes\flowchart\" "offlinestore.png"
 ${File} "..\..\shapes\flowchart\" "offpageconn.png"
 ${File} "..\..\shapes\flowchart\" "offpageconn.shape"
-${File} "..\..\shapes\flowchart\" "offpageconn.xpm"
+${File} "..\..\shapes\flowchart\" "offpageconn.png"
 ${File} "..\..\shapes\flowchart\" "or.png"
 ${File} "..\..\shapes\flowchart\" "or.shape"
-${File} "..\..\shapes\flowchart\" "or.xpm"
+${File} "..\..\shapes\flowchart\" "or.png"
 ${File} "..\..\shapes\flowchart\" "predefdproc.png"
 ${File} "..\..\shapes\flowchart\" "predefdproc.shape"
-${File} "..\..\shapes\flowchart\" "predefdproc.xpm"
+${File} "..\..\shapes\flowchart\" "predefdproc.png"
 ${File} "..\..\shapes\flowchart\" "preparation.png"
 ${File} "..\..\shapes\flowchart\" "preparation.shape"
-${File} "..\..\shapes\flowchart\" "preparation.xpm"
+${File} "..\..\shapes\flowchart\" "preparation.png"
 ${File} "..\..\shapes\flowchart\" "punchedcard.png"
 ${File} "..\..\shapes\flowchart\" "punchedcard.shape"
-${File} "..\..\shapes\flowchart\" "punchedcard.xpm"
+${File} "..\..\shapes\flowchart\" "punchedcard.png"
 ${File} "..\..\shapes\flowchart\" "punchedtape.png"
 ${File} "..\..\shapes\flowchart\" "punchedtape.shape"
-${File} "..\..\shapes\flowchart\" "punchedtape.xpm"
+${File} "..\..\shapes\flowchart\" "punchedtape.png"
 ${File} "..\..\shapes\flowchart\" "sort.png"
 ${File} "..\..\shapes\flowchart\" "sort.shape"
-${File} "..\..\shapes\flowchart\" "sort.xpm"
+${File} "..\..\shapes\flowchart\" "sort.png"
 ${File} "..\..\shapes\flowchart\" "sumjunction.png"
 ${File} "..\..\shapes\flowchart\" "sumjunction.shape"
-${File} "..\..\shapes\flowchart\" "sumjunction.xpm"
+${File} "..\..\shapes\flowchart\" "sumjunction.png"
 ${File} "..\..\shapes\flowchart\" "terminal.png"
 ${File} "..\..\shapes\flowchart\" "terminal.shape"
-${File} "..\..\shapes\flowchart\" "terminal.xpm"
+${File} "..\..\shapes\flowchart\" "terminal.png"
 ${File} "..\..\shapes\flowchart\" "transaction.png"
 ${File} "..\..\shapes\flowchart\" "transaction.shape"
-${File} "..\..\shapes\flowchart\" "transaction.xpm"
+${File} "..\..\shapes\flowchart\" "transaction.png"
 ${File} "..\..\shapes\flowchart\" "transmittape.png"
 ${File} "..\..\shapes\flowchart\" "transmittape.shape"
-${File} "..\..\shapes\flowchart\" "transmittape.xpm"
+${File} "..\..\shapes\flowchart\" "transmittape.png"
 ${SetOutPath} "$INSTDIR\shapes\Gane_and_Sarson"
 ${File} "..\..\shapes\Gane_and_Sarson\" "alt-entity.png"
 ${File} "..\..\shapes\Gane_and_Sarson\" "alt-entity.shape"
@@ -1680,52 +1680,52 @@
 ${SetOutPath} "$INSTDIR\shapes\jigsaw"
 ${File} "..\..\shapes\jigsaw\" "part_iiii.png"
 ${File} "..\..\shapes\jigsaw\" "part_iiii.shape"
-${File} "..\..\shapes\jigsaw\" "part_iiii.xpm"
+${File} "..\..\shapes\jigsaw\" "part_iiii.png"
 ${File} "..\..\shapes\jigsaw\" "part_iiio.png"
 ${File} "..\..\shapes\jigsaw\" "part_iiio.shape"
-${File} "..\..\shapes\jigsaw\" "part_iiio.xpm"
+${File} "..\..\shapes\jigsaw\" "part_iiio.png"
 ${File} "..\..\shapes\jigsaw\" "part_iioi.png"
 ${File} "..\..\shapes\jigsaw\" "part_iioi.shape"
-${File} "..\..\shapes\jigsaw\" "part_iioi.xpm"
+${File} "..\..\shapes\jigsaw\" "part_iioi.png"
 ${File} "..\..\shapes\jigsaw\" "part_iioo.png"
 ${File} "..\..\shapes\jigsaw\" "part_iioo.shape"
-${File} "..\..\shapes\jigsaw\" "part_iioo.xpm"
+${File} "..\..\shapes\jigsaw\" "part_iioo.png"
 ${File} "..\..\shapes\jigsaw\" "part_ioii.png"
 ${File} "..\..\shapes\jigsaw\" "part_ioii.shape"
-${File} "..\..\shapes\jigsaw\" "part_ioii.xpm"
+${File} "..\..\shapes\jigsaw\" "part_ioii.png"
 ${File} "..\..\shapes\jigsaw\" "part_ioio.png"
 ${File} "..\..\shapes\jigsaw\" "part_ioio.shape"
-${File} "..\..\shapes\jigsaw\" "part_ioio.xpm"
+${File} "..\..\shapes\jigsaw\" "part_ioio.png"
 ${File} "..\..\shapes\jigsaw\" "part_iooi.png"
 ${File} "..\..\shapes\jigsaw\" "part_iooi.shape"
-${File} "..\..\shapes\jigsaw\" "part_iooi.xpm"
+${File} "..\..\shapes\jigsaw\" "part_iooi.png"
 ${File} "..\..\shapes\jigsaw\" "part_iooo.png"
 ${File} "..\..\shapes\jigsaw\" "part_iooo.shape"
-${File} "..\..\shapes\jigsaw\" "part_iooo.xpm"
+${File} "..\..\shapes\jigsaw\" "part_iooo.png"
 ${File} "..\..\shapes\jigsaw\" "part_oiii.png"
 ${File} "..\..\shapes\jigsaw\" "part_oiii.shape"
-${File} "..\..\shapes\jigsaw\" "part_oiii.xpm"
+${File} "..\..\shapes\jigsaw\" "part_oiii.png"
 ${File} "..\..\shapes\jigsaw\" "part_oiio.png"
 ${File} "..\..\shapes\jigsaw\" "part_oiio.shape"
-${File} "..\..\shapes\jigsaw\" "part_oiio.xpm"
+${File} "..\..\shapes\jigsaw\" "part_oiio.png"
 ${File} "..\..\shapes\jigsaw\" "part_oioi.png"
 ${File} "..\..\shapes\jigsaw\" "part_oioi.shape"
-${File} "..\..\shapes\jigsaw\" "part_oioi.xpm"
+${File} "..\..\shapes\jigsaw\" "part_oioi.png"
 ${File} "..\..\shapes\jigsaw\" "part_oioo.png"
 ${File} "..\..\shapes\jigsaw\" "part_oioo.shape"
-${File} "..\..\shapes\jigsaw\" "part_oioo.xpm"
+${File} "..\..\shapes\jigsaw\" "part_oioo.png"
 ${File} "..\..\shapes\jigsaw\" "part_ooii.png"
 ${File} "..\..\shapes\jigsaw\" "part_ooii.shape"
-${File} "..\..\shapes\jigsaw\" "part_ooii.xpm"
+${File} "..\..\shapes\jigsaw\" "part_ooii.png"
 ${File} "..\..\shapes\jigsaw\" "part_ooio.png"
 ${File} "..\..\shapes\jigsaw\" "part_ooio.shape"
-${File} "..\..\shapes\jigsaw\" "part_ooio.xpm"
+${File} "..\..\shapes\jigsaw\" "part_ooio.png"
 ${File} "..\..\shapes\jigsaw\" "part_oooi.png"
 ${File} "..\..\shapes\jigsaw\" "part_oooi.shape"
-${File} "..\..\shapes\jigsaw\" "part_oooi.xpm"
+${File} "..\..\shapes\jigsaw\" "part_oooi.png"
 ${File} "..\..\shapes\jigsaw\" "part_oooo.png"
 ${File} "..\..\shapes\jigsaw\" "part_oooo.shape"
-${File} "..\..\shapes\jigsaw\" "part_oooo.xpm"
+${File} "..\..\shapes\jigsaw\" "part_oooo.png"
 ${SetOutPath} "$INSTDIR\shapes\Lights"
 ${File} "..\..\shapes\Lights\" "ACL.png"
 ${File} "..\..\shapes\Lights\" "ACL.shape"
@@ -1838,179 +1838,179 @@
 ${SetOutPath} "$INSTDIR\shapes\MSE"
 ${File} "..\..\shapes\MSE\" "demultiplexer.png"
 ${File} "..\..\shapes\MSE\" "demultiplexer.shape"
-${File} "..\..\shapes\MSE\" "demultiplexer.xpm"
+${File} "..\..\shapes\MSE\" "demultiplexer.png"
 ${File} "..\..\shapes\MSE\" "large_extension_node.png"
 ${File} "..\..\shapes\MSE\" "large_extension_node.shape"
-${File} "..\..\shapes\MSE\" "large_extension_node.xpm"
+${File} "..\..\shapes\MSE\" "large_extension_node.png"
 ${File} "..\..\shapes\MSE\" "multiplexer.png"
 ${File} "..\..\shapes\MSE\" "multiplexer.shape"
-${File} "..\..\shapes\MSE\" "multiplexer.xpm"
+${File} "..\..\shapes\MSE\" "multiplexer.png"
 ${File} "..\..\shapes\MSE\" "node_center.png"
 ${File} "..\..\shapes\MSE\" "node_center.shape"
-${File} "..\..\shapes\MSE\" "node_center.xpm"
+${File} "..\..\shapes\MSE\" "node_center.png"
 ${File} "..\..\shapes\MSE\" "small_extension_node.png"
 ${File} "..\..\shapes\MSE\" "small_extension_node.shape"
-${File} "..\..\shapes\MSE\" "small_extension_node.xpm"
+${File} "..\..\shapes\MSE\" "small_extension_node.png"
 ${File} "..\..\shapes\MSE\" "tacsat.png"
 ${File} "..\..\shapes\MSE\" "tacsat.shape"
-${File} "..\..\shapes\MSE\" "tacsat.xpm"
+${File} "..\..\shapes\MSE\" "tacsat.png"
 ${SetOutPath} "$INSTDIR\shapes\network"
 ${File} "..\..\shapes\network\" "antenna.png"
 ${File} "..\..\shapes\network\" "antenna.shape"
-${File} "..\..\shapes\network\" "antenna.xpm"
+${File} "..\..\shapes\network\" "antenna.png"
 ${File} "..\..\shapes\network\" "computer.png"
 ${File} "..\..\shapes\network\" "computer.shape"
-${File} "..\..\shapes\network\" "computer.xpm"
+${File} "..\..\shapes\network\" "computer.png"
 ${File} "..\..\shapes\network\" "dat_external.png"
 ${File} "..\..\shapes\network\" "dat_external.shape"
-${File} "..\..\shapes\network\" "dat_external.xpm"
+${File} "..\..\shapes\network\" "dat_external.png"
 ${File} "..\..\shapes\network\" "digitizing_board.png"
 ${File} "..\..\shapes\network\" "digitizing_board.shape"
 ${File} "..\..\shapes\network\" "disc.png"
 ${File} "..\..\shapes\network\" "disc.shape"
-${File} "..\..\shapes\network\" "disc.xpm"
+${File} "..\..\shapes\network\" "disc.png"
 ${File} "..\..\shapes\network\" "diskette.png"
 ${File} "..\..\shapes\network\" "diskette.shape"
-${File} "..\..\shapes\network\" "diskette.xpm"
+${File} "..\..\shapes\network\" "diskette.png"
 ${File} "..\..\shapes\network\" "firewall.png"
 ${File} "..\..\shapes\network\" "firewall.shape"
-${File} "..\..\shapes\network\" "firewall.xpm"
+${File} "..\..\shapes\network\" "firewall.png"
 ${File} "..\..\shapes\network\" "flash.png"
 ${File} "..\..\shapes\network\" "flash.shape"
-${File} "..\..\shapes\network\" "flash.xpm"
+${File} "..\..\shapes\network\" "flash.png"
 ${File} "..\..\shapes\network\" "genmonitor.png"
 ${File} "..\..\shapes\network\" "genmonitor.shape"
-${File} "..\..\shapes\network\" "genmonitor.xpm"
+${File} "..\..\shapes\network\" "genmonitor.png"
 ${File} "..\..\shapes\network\" "hub.png"
 ${File} "..\..\shapes\network\" "hub.shape"
-${File} "..\..\shapes\network\" "hub.xpm"
+${File} "..\..\shapes\network\" "hub.png"
 ${File} "..\..\shapes\network\" "laptop.png"
 ${File} "..\..\shapes\network\" "laptop.shape"
 ${File} "..\..\shapes\network\" "mobile_phone.png"
 ${File} "..\..\shapes\network\" "mobile_phone.shape"
-${File} "..\..\shapes\network\" "mobile_phone.xpm"
+${File} "..\..\shapes\network\" "mobile_phone.png"
 ${File} "..\..\shapes\network\" "modem.png"
 ${File} "..\..\shapes\network\" "modem.shape"
-${File} "..\..\shapes\network\" "modem.xpm"
+${File} "..\..\shapes\network\" "modem.png"
 ${File} "..\..\shapes\network\" "modularswitch.png"
 ${File} "..\..\shapes\network\" "modularswitch.shape"
-${File} "..\..\shapes\network\" "modularswitch.xpm"
+${File} "..\..\shapes\network\" "modularswitch.png"
 ${File} "..\..\shapes\network\" "monitor.png"
 ${File} "..\..\shapes\network\" "monitor.shape"
-${File} "..\..\shapes\network\" "monitor.xpm"
+${File} "..\..\shapes\network\" "monitor.png"
 ${File} "..\..\shapes\network\" "nwcloud.png"
 ${File} "..\..\shapes\network\" "nwcloud.shape"
-${File} "..\..\shapes\network\" "nwcloud.xpm"
+${File} "..\..\shapes\network\" "nwcloud.png"
 ${File} "..\..\shapes\network\" "patch-panel.png"
 ${File} "..\..\shapes\network\" "patch-panel.shape"
-${File} "..\..\shapes\network\" "patch-panel.xpm"
+${File} "..\..\shapes\network\" "patch-panel.png"
 ${File} "..\..\shapes\network\" "pc_bigtower.png"
 ${File} "..\..\shapes\network\" "pc_bigtower.shape"
-${File} "..\..\shapes\network\" "pc_bigtower.xpm"
+${File} "..\..\shapes\network\" "pc_bigtower.png"
 ${File} "..\..\shapes\network\" "pc_desktop.png"
 ${File} "..\..\shapes\network\" "pc_desktop.shape"
-${File} "..\..\shapes\network\" "pc_desktop.xpm"
+${File} "..\..\shapes\network\" "pc_desktop.png"
 ${File} "..\..\shapes\network\" "pc_miditower.png"
 ${File} "..\..\shapes\network\" "pc_miditower.shape"
-${File} "..\..\shapes\network\" "pc_miditower.xpm"
+${File} "..\..\shapes\network\" "pc_miditower.png"
 ${File} "..\..\shapes\network\" "pc_minitower.png"
 ${File} "..\..\shapes\network\" "pc_minitower.shape"
-${File} "..\..\shapes\network\" "pc_minitower.xpm"
+${File} "..\..\shapes\network\" "pc_minitower.png"
 ${File} "..\..\shapes\network\" "plotter.png"
 ${File} "..\..\shapes\network\" "plotter.shape"
 ${File} "..\..\shapes\network\" "printer.png"
 ${File} "..\..\shapes\network\" "printer.shape"
-${File} "..\..\shapes\network\" "printer.xpm"
+${File} "..\..\shapes\network\" "printer.png"
 ${File} "..\..\shapes\network\" "rj45plug.png"
 ${File} "..\..\shapes\network\" "rj45plug.shape"
-${File} "..\..\shapes\network\" "rj45plug.xpm"
+${File} "..\..\shapes\network\" "rj45plug.png"
 ${File} "..\..\shapes\network\" "router-symbol.png"
 ${File} "..\..\shapes\network\" "router-symbol.shape"
-${File} "..\..\shapes\network\" "router-symbol.xpm"
+${File} "..\..\shapes\network\" "router-symbol.png"
 ${File} "..\..\shapes\network\" "sceadplug.png"
 ${File} "..\..\shapes\network\" "sceadplug.shape"
-${File} "..\..\shapes\network\" "sceadplug.xpm"
+${File} "..\..\shapes\network\" "sceadplug.png"
 ${File} "..\..\shapes\network\" "speaker.png"
 ${File} "..\..\shapes\network\" "speaker.shape"
-${File} "..\..\shapes\network\" "speaker.xpm"
+${File} "..\..\shapes\network\" "speaker.png"
 ${File} "..\..\shapes\network\" "speaker_amp.png"
 ${File} "..\..\shapes\network\" "speaker_amp.shape"
-${File} "..\..\shapes\network\" "speaker_amp.xpm"
+${File} "..\..\shapes\network\" "speaker_amp.png"
 ${File} "..\..\shapes\network\" "switch-atm-symbol.png"
 ${File} "..\..\shapes\network\" "switch-atm-symbol.shape"
-${File} "..\..\shapes\network\" "switch-atm-symbol.xpm"
+${File} "..\..\shapes\network\" "switch-atm-symbol.png"
 ${File} "..\..\shapes\network\" "switch-symbol.png"
 ${File} "..\..\shapes\network\" "switch-symbol.shape"
-${File} "..\..\shapes\network\" "switch-symbol.xpm"
+${File} "..\..\shapes\network\" "switch-symbol.png"
 ${File} "..\..\shapes\network\" "telephone.png"
 ${File} "..\..\shapes\network\" "telephone.shape"
 ${File} "..\..\shapes\network\" "workstation.png"
 ${File} "..\..\shapes\network\" "workstation.shape"
-${File} "..\..\shapes\network\" "workstation.xpm"
+${File} "..\..\shapes\network\" "workstation.png"
 ${File} "..\..\shapes\network\" "zip-disk.png"
 ${File} "..\..\shapes\network\" "zip-disk.shape"
-${File} "..\..\shapes\network\" "zip-disk.xpm"
+${File} "..\..\shapes\network\" "zip-disk.png"
 ${SetOutPath} "$INSTDIR\shapes\Pneumatic"
 ${File} "..\..\shapes\Pneumatic\" "cnx.png"
 ${File} "..\..\shapes\Pneumatic\" "cnx.shape"
-${File} "..\..\shapes\Pneumatic\" "cnx.xpm"
+${File} "..\..\shapes\Pneumatic\" "cnx.png"
 ${File} "..\..\shapes\Pneumatic\" "comelec1.png"
 ${File} "..\..\shapes\Pneumatic\" "comelec1.shape"
-${File} "..\..\shapes\Pneumatic\" "comelec1.xpm"
+${File} "..\..\shapes\Pneumatic\" "comelec1.png"
 ${File} "..\..\shapes\Pneumatic\" "comelec2.png"
 ${File} "..\..\shapes\Pneumatic\" "comelec2.shape"
-${File} "..\..\shapes\Pneumatic\" "comelec2.xpm"
+${File} "..\..\shapes\Pneumatic\" "comelec2.png"
 ${File} "..\..\shapes\Pneumatic\" "commusc.png"
 ${File} "..\..\shapes\Pneumatic\" "commusc.shape"
-${File} "..\..\shapes\Pneumatic\" "commusc.xpm"
+${File} "..\..\shapes\Pneumatic\" "commusc.png"
 ${File} "..\..\shapes\Pneumatic\" "compb.png"
 ${File} "..\..\shapes\Pneumatic\" "compb.shape"
-${File} "..\..\shapes\Pneumatic\" "compb.xpm"
+${File} "..\..\shapes\Pneumatic\" "compb.png"
 ${File} "..\..\shapes\Pneumatic\" "compilh.png"
 ${File} "..\..\shapes\Pneumatic\" "compilh.shape"
-${File} "..\..\shapes\Pneumatic\" "compilh.xpm"
+${File} "..\..\shapes\Pneumatic\" "compilh.png"
 ${File} "..\..\shapes\Pneumatic\" "compilp.png"
 ${File} "..\..\shapes\Pneumatic\" "compilp.shape"
-${File} "..\..\shapes\Pneumatic\" "compilp.xpm"
+${File} "..\..\shapes\Pneumatic\" "compilp.png"
 ${File} "..\..\shapes\Pneumatic\" "compush.png"
 ${File} "..\..\shapes\Pneumatic\" "compush.shape"
-${File} "..\..\shapes\Pneumatic\" "compush.xpm"
+${File} "..\..\shapes\Pneumatic\" "compush.png"
 ${File} "..\..\shapes\Pneumatic\" "comspr.png"
 ${File} "..\..\shapes\Pneumatic\" "comspr.shape"
-${File} "..\..\shapes\Pneumatic\" "comspr.xpm"
+${File} "..\..\shapes\Pneumatic\" "comspr.png"
 ${File} "..\..\shapes\Pneumatic\" "dejack.png"
 ${File} "..\..\shapes\Pneumatic\" "dejack.shape"
-${File} "..\..\shapes\Pneumatic\" "dejack.xpm"
+${File} "..\..\shapes\Pneumatic\" "dejack.png"
 ${File} "..\..\shapes\Pneumatic\" "dist22.png"
 ${File} "..\..\shapes\Pneumatic\" "dist22.shape"
-${File} "..\..\shapes\Pneumatic\" "dist22.xpm"
+${File} "..\..\shapes\Pneumatic\" "dist22.png"
 ${File} "..\..\shapes\Pneumatic\" "dist32.png"
 ${File} "..\..\shapes\Pneumatic\" "dist32.shape"
-${File} "..\..\shapes\Pneumatic\" "dist32.xpm"
+${File} "..\..\shapes\Pneumatic\" "dist32.png"
 ${File} "..\..\shapes\Pneumatic\" "dist42.png"
 ${File} "..\..\shapes\Pneumatic\" "dist42.shape"
-${File} "..\..\shapes\Pneumatic\" "dist42.xpm"
+${File} "..\..\shapes\Pneumatic\" "dist42.png"
 ${File} "..\..\shapes\Pneumatic\" "dist52.png"
 ${File} "..\..\shapes\Pneumatic\" "dist52.shape"
-${File} "..\..\shapes\Pneumatic\" "dist52.xpm"
+${File} "..\..\shapes\Pneumatic\" "dist52.png"
 ${File} "..\..\shapes\Pneumatic\" "drain.png"
 ${File} "..\..\shapes\Pneumatic\" "drain.shape"
-${File} "..\..\shapes\Pneumatic\" "drain.xpm"
+${File} "..\..\shapes\Pneumatic\" "drain.png"
 ${File} "..\..\shapes\Pneumatic\" "press.png"
 ${File} "..\..\shapes\Pneumatic\" "press.shape"
-${File} "..\..\shapes\Pneumatic\" "press.xpm"
+${File} "..\..\shapes\Pneumatic\" "press.png"
 ${File} "..\..\shapes\Pneumatic\" "presshy.png"
 ${File} "..\..\shapes\Pneumatic\" "presshy.shape"
-${File} "..\..\shapes\Pneumatic\" "presshy.xpm"
+${File} "..\..\shapes\Pneumatic\" "presshy.png"
 ${File} "..\..\shapes\Pneumatic\" "presspn.png"
 ${File} "..\..\shapes\Pneumatic\" "presspn.shape"
-${File} "..\..\shapes\Pneumatic\" "presspn.xpm"
+${File} "..\..\shapes\Pneumatic\" "presspn.png"
 ${File} "..\..\shapes\Pneumatic\" "seijack.png"
 ${File} "..\..\shapes\Pneumatic\" "seijack.shape"
-${File} "..\..\shapes\Pneumatic\" "seijack.xpm"
+${File} "..\..\shapes\Pneumatic\" "seijack.png"
 ${File} "..\..\shapes\Pneumatic\" "seojack.png"
 ${File} "..\..\shapes\Pneumatic\" "seojack.shape"
-${File} "..\..\shapes\Pneumatic\" "seojack.xpm"
+${File} "..\..\shapes\Pneumatic\" "seojack.png"
 ${SetOutPath} "$INSTDIR\shapes\RDP"
 ${File} "..\..\shapes\RDP\" "arc.png"
 ${File} "..\..\shapes\RDP\" "arc_inhibiteur.png"
@@ -2025,74 +2025,74 @@
 ${SetOutPath} "$INSTDIR\shapes\SDL"
 ${File} "..\..\shapes\SDL\" "block.png"
 ${File} "..\..\shapes\SDL\" "block.shape"
-${File} "..\..\shapes\SDL\" "block.xpm"
+${File} "..\..\shapes\SDL\" "block.png"
 ${File} "..\..\shapes\SDL\" "comment.png"
 ${File} "..\..\shapes\SDL\" "comment.shape"
-${File} "..\..\shapes\SDL\" "comment.xpm"
+${File} "..\..\shapes\SDL\" "comment.png"
 ${File} "..\..\shapes\SDL\" "decision.png"
 ${File} "..\..\shapes\SDL\" "decision.shape"
-${File} "..\..\shapes\SDL\" "decision.xpm"
+${File} "..\..\shapes\SDL\" "decision.png"
 ${File} "..\..\shapes\SDL\" "function.png"
 ${File} "..\..\shapes\SDL\" "function.shape"
-${File} "..\..\shapes\SDL\" "function.xpm"
+${File} "..\..\shapes\SDL\" "function.png"
 ${File} "..\..\shapes\SDL\" "header.png"
 ${File} "..\..\shapes\SDL\" "header.shape"
-${File} "..\..\shapes\SDL\" "header.xpm"
+${File} "..\..\shapes\SDL\" "header.png"
 ${File} "..\..\shapes\SDL\" "inout.png"
 ${File} "..\..\shapes\SDL\" "inout.shape"
-${File} "..\..\shapes\SDL\" "inout.xpm"
+${File} "..\..\shapes\SDL\" "inout.png"
 ${File} "..\..\shapes\SDL\" "macro.png"
 ${File} "..\..\shapes\SDL\" "macro.shape"
-${File} "..\..\shapes\SDL\" "macro.xpm"
+${File} "..\..\shapes\SDL\" "macro.png"
 ${File} "..\..\shapes\SDL\" "note.png"
 ${File} "..\..\shapes\SDL\" "note.shape"
-${File} "..\..\shapes\SDL\" "note.xpm"
+${File} "..\..\shapes\SDL\" "note.png"
 ${File} "..\..\shapes\SDL\" "process.png"
 ${File} "..\..\shapes\SDL\" "process.shape"
-${File} "..\..\shapes\SDL\" "process.xpm"
+${File} "..\..\shapes\SDL\" "process.png"
 ${File} "..\..\shapes\SDL\" "receive.png"
 ${File} "..\..\shapes\SDL\" "receive.shape"
-${File} "..\..\shapes\SDL\" "receive.xpm"
+${File} "..\..\shapes\SDL\" "receive.png"
 ${File} "..\..\shapes\SDL\" "return.png"
 ${File} "..\..\shapes\SDL\" "return.shape"
-${File} "..\..\shapes\SDL\" "return.xpm"
+${File} "..\..\shapes\SDL\" "return.png"
 ${File} "..\..\shapes\SDL\" "save.png"
 ${File} "..\..\shapes\SDL\" "save.shape"
-${File} "..\..\shapes\SDL\" "save.xpm"
+${File} "..\..\shapes\SDL\" "save.png"
 ${File} "..\..\shapes\SDL\" "send.png"
 ${File} "..\..\shapes\SDL\" "send.shape"
-${File} "..\..\shapes\SDL\" "send.xpm"
+${File} "..\..\shapes\SDL\" "send.png"
 ${File} "..\..\shapes\SDL\" "service.png"
 ${File} "..\..\shapes\SDL\" "service.shape"
-${File} "..\..\shapes\SDL\" "service.xpm"
+${File} "..\..\shapes\SDL\" "service.png"
 ${File} "..\..\shapes\SDL\" "state.png"
 ${File} "..\..\shapes\SDL\" "state.shape"
-${File} "..\..\shapes\SDL\" "state.xpm"
+${File} "..\..\shapes\SDL\" "state.png"
 ${File} "..\..\shapes\SDL\" "stop.png"
 ${File} "..\..\shapes\SDL\" "stop.shape"
-${File} "..\..\shapes\SDL\" "stop.xpm"
+${File} "..\..\shapes\SDL\" "stop.png"
 ${File} "..\..\shapes\SDL\" "task.png"
 ${File} "..\..\shapes\SDL\" "task.shape"
-${File} "..\..\shapes\SDL\" "task.xpm"
+${File} "..\..\shapes\SDL\" "task.png"
 ${SetOutPath} "$INSTDIR\shapes\sybase"
 ${File} "..\..\shapes\sybase\" "client.png"
 ${File} "..\..\shapes\sybase\" "client.shape"
-${File} "..\..\shapes\sybase\" "client.xpm"
+${File} "..\..\shapes\sybase\" "client.png"
 ${File} "..\..\shapes\sybase\" "dataserver.png"
 ${File} "..\..\shapes\sybase\" "dataserver.shape"
-${File} "..\..\shapes\sybase\" "dataserver.xpm"
+${File} "..\..\shapes\sybase\" "dataserver.png"
 ${File} "..\..\shapes\sybase\" "ltm.png"
 ${File} "..\..\shapes\sybase\" "ltm.shape"
-${File} "..\..\shapes\sybase\" "ltm.xpm"
+${File} "..\..\shapes\sybase\" "ltm.png"
 ${File} "..\..\shapes\sybase\" "repserver.png"
 ${File} "..\..\shapes\sybase\" "repserver.shape"
-${File} "..\..\shapes\sybase\" "repserver.xpm"
+${File} "..\..\shapes\sybase\" "repserver.png"
 ${File} "..\..\shapes\sybase\" "rsm.png"
 ${File} "..\..\shapes\sybase\" "rsm.shape"
-${File} "..\..\shapes\sybase\" "rsm.xpm"
+${File} "..\..\shapes\sybase\" "rsm.png"
 ${File} "..\..\shapes\sybase\" "stableq.png"
 ${File} "..\..\shapes\sybase\" "stableq.shape"
-${File} "..\..\shapes\sybase\" "stableq.xpm"
+${File} "..\..\shapes\sybase\" "stableq.png"
 ${SetOutPath} "$INSTDIR\sheets"
 ${File} "..\..\sheets\" "AADL.sheet"
 ${File} "..\..\sheets\" "Assorted.sheet"
@@ -2132,85 +2132,85 @@
 ${File} "..\..\sheets\" "UML.sheet"
 ${SetOutPath} "$INSTDIR\sheets\ER"
 ${File} "..\..\sheets\ER\" "weakentity.png"
-${File} "..\..\sheets\ER\" "weakentity.xpm"
+${File} "..\..\sheets\ER\" "weakentity.png"
 ${SetOutPath} "$INSTDIR\sheets\GRAFCET"
 ${File} "..\..\sheets\GRAFCET\" "etapei.png"
-${File} "..\..\sheets\GRAFCET\" "etapei.xpm"
+${File} "..\..\sheets\GRAFCET\" "etapei.png"
 ${File} "..\..\sheets\GRAFCET\" "etapemc.png"
-${File} "..\..\sheets\GRAFCET\" "etapemc.xpm"
+${File} "..\..\sheets\GRAFCET\" "etapemc.png"
+${File} "..\..\sheets\GRAFCET\" "etapeme.png"
 ${File} "..\..\sheets\GRAFCET\" "etapeme.png"
-${File} "..\..\sheets\GRAFCET\" "etapeme.xpm"
 ${File} "..\..\sheets\GRAFCET\" "etapems.png"
-${File} "..\..\sheets\GRAFCET\" "etapems.xpm"
+${File} "..\..\sheets\GRAFCET\" "etapems.png"
+${File} "..\..\sheets\GRAFCET\" "etapesp.png"
 ${File} "..\..\sheets\GRAFCET\" "etapesp.png"
-${File} "..\..\sheets\GRAFCET\" "etapesp.xpm"
 ${File} "..\..\sheets\GRAFCET\" "vergent_and.png"
-${File} "..\..\sheets\GRAFCET\" "vergent_and.xpm"
+${File} "..\..\sheets\GRAFCET\" "vergent_and.png"
 ${SetOutPath} "$INSTDIR\sheets\Istar"
 ${File} "..\..\sheets\Istar\" "agent.png"
-${File} "..\..\sheets\Istar\" "agent.xpm"
+${File} "..\..\sheets\Istar\" "agent.png"
 ${File} "..\..\sheets\Istar\" "decomposition.png"
-${File} "..\..\sheets\Istar\" "decomposition.xpm"
+${File} "..\..\sheets\Istar\" "decomposition.png"
+${File} "..\..\sheets\Istar\" "dependency.png"
 ${File} "..\..\sheets\Istar\" "dependency.png"
-${File} "..\..\sheets\Istar\" "dependency.xpm"
 ${File} "..\..\sheets\Istar\" "goal.png"
-${File} "..\..\sheets\Istar\" "goal.xpm"
+${File} "..\..\sheets\Istar\" "goal.png"
+${File} "..\..\sheets\Istar\" "means_ends.png"
 ${File} "..\..\sheets\Istar\" "means_ends.png"
-${File} "..\..\sheets\Istar\" "means_ends.xpm"
 ${File} "..\..\sheets\Istar\" "neg_contrib.png"
-${File} "..\..\sheets\Istar\" "neg_contrib.xpm"
+${File} "..\..\sheets\Istar\" "neg_contrib.png"
 ${File} "..\..\sheets\Istar\" "position.png"
-${File} "..\..\sheets\Istar\" "position.xpm"
+${File} "..\..\sheets\Istar\" "position.png"
+${File} "..\..\sheets\Istar\" "pos_contrib.png"
 ${File} "..\..\sheets\Istar\" "pos_contrib.png"
-${File} "..\..\sheets\Istar\" "pos_contrib.xpm"
 ${File} "..\..\sheets\Istar\" "role.png"
-${File} "..\..\sheets\Istar\" "role.xpm"
+${File} "..\..\sheets\Istar\" "role.png"
+${File} "..\..\sheets\Istar\" "task.png"
 ${File} "..\..\sheets\Istar\" "task.png"
-${File} "..\..\sheets\Istar\" "task.xpm"
 ${SetOutPath} "$INSTDIR\sheets\Jackson"
 ${File} "..\..\sheets\Jackson\" "designed_domain.png"
-${File} "..\..\sheets\Jackson\" "designed_domain.xpm"
+${File} "..\..\sheets\Jackson\" "designed_domain.png"
+${File} "..\..\sheets\Jackson\" "machine_domain.png"
 ${File} "..\..\sheets\Jackson\" "machine_domain.png"
-${File} "..\..\sheets\Jackson\" "machine_domain.xpm"
 ${File} "..\..\sheets\Jackson\" "req_phen.png"
-${File} "..\..\sheets\Jackson\" "req_phen.xpm"
+${File} "..\..\sheets\Jackson\" "req_phen.png"
 ${SetOutPath} "$INSTDIR\sheets\KAOS"
 ${File} "..\..\sheets\KAOS\" "and-complete-ref.png"
-${File} "..\..\sheets\KAOS\" "and-complete-ref.xpm"
+${File} "..\..\sheets\KAOS\" "and-complete-ref.png"
 ${File} "..\..\sheets\KAOS\" "and-ref.png"
-${File} "..\..\sheets\KAOS\" "and-ref.xpm"
+${File} "..\..\sheets\KAOS\" "and-ref.png"
+${File} "..\..\sheets\KAOS\" "assumption.png"
 ${File} "..\..\sheets\KAOS\" "assumption.png"
-${File} "..\..\sheets\KAOS\" "assumption.xpm"
 ${File} "..\..\sheets\KAOS\" "capable-of.png"
-${File} "..\..\sheets\KAOS\" "capable-of.xpm"
+${File} "..\..\sheets\KAOS\" "capable-of.png"
+${File} "..\..\sheets\KAOS\" "conflicts.png"
 ${File} "..\..\sheets\KAOS\" "conflicts.png"
-${File} "..\..\sheets\KAOS\" "conflicts.xpm"
 ${File} "..\..\sheets\KAOS\" "controls.png"
-${File} "..\..\sheets\KAOS\" "controls.xpm"
+${File} "..\..\sheets\KAOS\" "controls.png"
+${File} "..\..\sheets\KAOS\" "input.png"
 ${File} "..\..\sheets\KAOS\" "input.png"
-${File} "..\..\sheets\KAOS\" "input.xpm"
 ${File} "..\..\sheets\KAOS\" "monitors.png"
-${File} "..\..\sheets\KAOS\" "monitors.xpm"
+${File} "..\..\sheets\KAOS\" "monitors.png"
+${File} "..\..\sheets\KAOS\" "obstacle.png"
 ${File} "..\..\sheets\KAOS\" "obstacle.png"
-${File} "..\..\sheets\KAOS\" "obstacle.xpm"
 ${File} "..\..\sheets\KAOS\" "obstructs.png"
-${File} "..\..\sheets\KAOS\" "obstructs.xpm"
+${File} "..\..\sheets\KAOS\" "obstructs.png"
+${File} "..\..\sheets\KAOS\" "op-ref.png"
 ${File} "..\..\sheets\KAOS\" "op-ref.png"
-${File} "..\..\sheets\KAOS\" "op-ref.xpm"
 ${File} "..\..\sheets\KAOS\" "or-complete-ref.png"
-${File} "..\..\sheets\KAOS\" "or-complete-ref.xpm"
+${File} "..\..\sheets\KAOS\" "or-complete-ref.png"
+${File} "..\..\sheets\KAOS\" "or-ref.png"
 ${File} "..\..\sheets\KAOS\" "or-ref.png"
-${File} "..\..\sheets\KAOS\" "or-ref.xpm"
 ${File} "..\..\sheets\KAOS\" "output.png"
-${File} "..\..\sheets\KAOS\" "output.xpm"
+${File} "..\..\sheets\KAOS\" "output.png"
+${File} "..\..\sheets\KAOS\" "performs.png"
 ${File} "..\..\sheets\KAOS\" "performs.png"
-${File} "..\..\sheets\KAOS\" "performs.xpm"
 ${File} "..\..\sheets\KAOS\" "requirement.png"
-${File} "..\..\sheets\KAOS\" "requirement.xpm"
+${File} "..\..\sheets\KAOS\" "requirement.png"
+${File} "..\..\sheets\KAOS\" "responsibility.png"
 ${File} "..\..\sheets\KAOS\" "responsibility.png"
-${File} "..\..\sheets\KAOS\" "responsibility.xpm"
 ${File} "..\..\sheets\KAOS\" "softgoal.png"
-${File} "..\..\sheets\KAOS\" "softgoal.xpm"
+${File} "..\..\sheets\KAOS\" "softgoal.png"
 ${SetOutPath} "$INSTDIR\sheets\SISSI"
 ${File} "..\..\sheets\SISSI\" "1.xml"
 ${File} "..\..\sheets\SISSI\" "10.xml"
@@ -2335,7 +2335,7 @@
 ${File} "..\..\sheets\SISSI\" "safe.png"
 ${File} "..\..\sheets\SISSI\" "sauvegarde.xpm"
 ${File} "..\..\sheets\SISSI\" "si.xpm"
-${File} "..\..\sheets\SISSI\" "SISSI_object.xpm"
+${File} "..\..\sheets\SISSI\" "sissi_object.xpm"
 ${File} "..\..\sheets\SISSI\" "storage_array.png"
 ${File} "..\..\sheets\SISSI\" "support.xpm"
 ${File} "..\..\sheets\SISSI\" "tourniquet.png"
@@ -2345,15 +2345,15 @@
 ${File} "..\..\sheets\SISSI\" "ventilateur_centrifuge.png"
 ${SetOutPath} "$INSTDIR\sheets\UML"
 ${File} "..\..\sheets\UML\" "aggregation.png"
-${File} "..\..\sheets\UML\" "aggregation.xpm"
+${File} "..\..\sheets\UML\" "aggregation.png"
 ${File} "..\..\sheets\UML\" "eventsink.png"
-${File} "..\..\sheets\UML\" "eventsink.xpm"
+${File} "..\..\sheets\UML\" "eventsink.png"
+${File} "..\..\sheets\UML\" "eventsource.png"
 ${File} "..\..\sheets\UML\" "eventsource.png"
-${File} "..\..\sheets\UML\" "eventsource.xpm"
 ${File} "..\..\sheets\UML\" "receptacle.png"
-${File} "..\..\sheets\UML\" "receptacle.xpm"
+${File} "..\..\sheets\UML\" "receptacle.png"
+${File} "..\..\sheets\UML\" "umlclass_template.png"
 ${File} "..\..\sheets\UML\" "umlclass_template.png"
-${File} "..\..\sheets\UML\" "umlclass_template.xpm"
 ${SetOutPath} "$INSTDIR\help\C"
 ${File} "..\..\..\help\C\" "dia-manual.chm"
 ${File} "..\..\..\help\C\" "dia-manual.pdf"
@@ -2378,6 +2378,7 @@
 ${File} "..\..\samples\" "arrows.dia"
 ${File} "..\..\samples\" "chronograms.dia"
 ${File} "..\..\samples\" "CompositeAction.dia"
+${File} "..\..\samples\" "dia_logo.png"
 ${File} "..\..\samples\" "ER-demo.dia"
 ${File} "..\..\samples\" "grafcet.dia"
 ${File} "..\..\samples\" "Istar.dia"
@@ -2400,8 +2401,25 @@
 ${File} "..\..\samples\self\" "dia-renderer.dia"
 ${File} "..\..\samples\self\" "umlclass.dia"
 
-${SetOutPath} "$INSTDIR"
-${File} "..\..\" "dia_logo.png"
+${SetOutPath} "$INSTDIR\samples\Visio"
+${File} "..\..\samples\Visio\" "visio-schema.xdr"
+
+${SetOutPath} "$INSTDIR\samples\Visio\vdxtosvg"
+${File} "..\..\samples\Visio\vdxtosvg\" "animation_tests.png"
+${File} "..\..\samples\Visio\vdxtosvg\" "animation_tests.svg"
+${File} "..\..\samples\Visio\vdxtosvg\" "animation_tests.vdx"
+${File} "..\..\samples\Visio\vdxtosvg\" "basic_tests.png"
+${File} "..\..\samples\Visio\vdxtosvg\" "basic_tests.svg"
+${File} "..\..\samples\Visio\vdxtosvg\" "basic_tests.vdx"
+${File} "..\..\samples\Visio\vdxtosvg\" "BasicShapes.vdx"
+${File} "..\..\samples\Visio\vdxtosvg\" "curve_tests.vdx"
+${File} "..\..\samples\Visio\vdxtosvg\" "pattern_tests.vdx"
+${File} "..\..\samples\Visio\vdxtosvg\" "README"
+${File} "..\..\samples\Visio\vdxtosvg\" "seq_test.svg"
+${File} "..\..\samples\Visio\vdxtosvg\" "seq_test.vdx"
+${File} "..\..\samples\Visio\vdxtosvg\" "text_tests.png"
+${File} "..\..\samples\Visio\vdxtosvg\" "text_tests.svg"
+${File} "..\..\samples\Visio\vdxtosvg\" "text_tests.vdx"
     
 ${SetOutPath} "$INSTDIR\xslt"
 ${File} "..\..\plug-ins\xslt\" "dia-uml.xsl"
@@ -2423,7 +2441,7 @@
 
 !ifdef DIA_INCLUDE_GTK
 ${SetOutPath} "$INSTDIR\bin"
-${File} "..\..\..\bin\" "charset.dll"
+;${File} "..\..\..\bin\" "charset.dll"
 ;${File} "..\..\..\bin\" "gspawn-win32-helper-console.exe"
 ;${File} "..\..\..\bin\" "gspawn-win32-helper.exe"
 ${File} "..\..\..\bin\" "iconv.dll"
@@ -2433,10 +2451,10 @@
 ${File} "..\..\..\bin\" "libatk-1.0-0.dll"
 ${File} "..\..\..\bin\" "libcairo-2.dll"
 ;${File} "..\..\..\bin\" "libexpat.dll"
-${File} "..\..\..\bin\" "libfontconfig-1.dll"
-${File} "..\..\..\bin\" "freetype6.dll"
+;${File} "..\..\..\bin\" "libfontconfig-1.dll"
+;${File} "..\..\..\bin\" "freetype6.dll"
 ; TODO: Remove the following, once gladewin32 has switched to freetype6.dll
-${File} "..\..\..\bin\" "libfreetype-6.dll"
+;${File} "..\..\..\bin\" "libfreetype-6.dll"
 ${File} "..\..\..\bin\" "libgdk-win32-2.0-0.dll"
 ${File} "..\..\..\bin\" "libgdk_pixbuf-2.0-0.dll"
 ${File} "..\..\..\bin\" "libglib-2.0-0.dll"
@@ -2448,18 +2466,18 @@
 ${File} "..\..\..\bin\" "libpangocairo-1.0-0.dll"
 ${File} "..\..\..\bin\" "libpangoft2-1.0-0.dll"
 ${File} "..\..\..\bin\" "libpangowin32-1.0-0.dll"
-${File} "..\..\..\bin\" "libpng12.dll"
-;${File} "..\..\..\bin\" "libpng13.dll"
+;${File} "..\..\..\bin\" "libpng12.dll"
+${File} "..\..\..\bin\" "libpng13.dll"
 ;${File} "..\..\..\bin\" "librle3.dll"
 ${File} "..\..\..\bin\" "libtiff3.dll"
 ${File} "..\..\..\bin\" "libxml2.dll"
 ${File} "..\..\..\bin\" "pango-querymodules.exe"
-${File} "..\..\..\bin\" "xmlparse.dll"
-${File} "..\..\..\bin\" "xmltok.dll"
+;${File} "..\..\..\bin\" "xmlparse.dll"
+;${File} "..\..\..\bin\" "xmltok.dll"
 ${File} "..\..\..\bin\" "zlib1.dll"
 ${SetOutPath} "$INSTDIR\etc"
-${SetOutPath} "$INSTDIR\etc\fonts"
-${File} "..\..\..\etc\fonts\" "fonts.conf"
+;${SetOutPath} "$INSTDIR\etc\fonts"
+;${File} "..\..\..\etc\fonts\" "fonts.conf"
 ${SetOutPath} "$INSTDIR\etc\gtk-2.0"
 ${File} "..\..\..\etc\gtk-2.0\" "gdk-pixbuf.loaders"
 ${File} "..\..\..\etc\gtk-2.0\" "gtk.immodules"
@@ -2518,21 +2536,21 @@
 ${SetOutPath} "$INSTDIR\share\themes\Raleigh\gtk-2.0"
 ${File} "..\..\..\share\themes\Raleigh\gtk-2.0\" "gtkrc"
 
-${SetOutPath} "$INSTDIR\lib\pango"
-${SetOutPath} "$INSTDIR\lib\pango\1.6.0"
-${SetOutPath} "$INSTDIR\lib\pango\1.6.0\modules"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-arabic-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-arabic-lang.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-basic-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-basic-win32.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-hangul-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-hebrew-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-indic-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-indic-lang.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-khmer-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-syriac-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-thai-fc.dll"
-${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-tibetan-fc.dll"
+;${SetOutPath} "$INSTDIR\lib\pango"
+;${SetOutPath} "$INSTDIR\lib\pango\1.6.0"
+;${SetOutPath} "$INSTDIR\lib\pango\1.6.0\modules"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-arabic-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-arabic-lang.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-basic-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-basic-win32.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-hangul-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-hebrew-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-indic-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-indic-lang.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-khmer-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-syriac-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-thai-fc.dll"
+;${File} "..\..\..\lib\pango\1.6.0\modules\" "pango-tibetan-fc.dll"
 !endif    
     SetShellVarContext all
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]