--- a/calendarwidget.pkg	Wed Aug 18 09:37:48 2010 +0300
+++ b/calendarwidget.pkg	Thu Sep 02 20:15:01 2010 +0300
@@ -1,29 +1,20 @@
 
-; Language
+; Language - standard language definitions
 &EN
 
-; SIS header: name, uid, version
-#{"calendarwidget"},(0x2002C35A),1,0,0
+; Standard SIS file header
+#{"calendarwidget"},(0x2002C35A),1,0,0, TYPE=PU
 
-; Localised Vendor name
-%{"Vendor"}
-
-; Unique Vendor name
-:"Vendor"
+; Non-localised vendor name
+:"Nokia Corporation"
 
-; Manual PKG pre-rules from PRO files
-; Default HW/platform dependencies
-[0x101F7961],0,0,0,{"S60ProductID"}
-[0x102032BE],0,0,0,{"S60ProductID"}
-[0x102752AE],0,0,0,{"S60ProductID"}
-[0x1028315F],0,0,0,{"S60ProductID"}
+; Localised vendor names
+%{"Nokia Corporation"}
 
-"/epoc32/release/armv5/urel/calendarwidgetplugin.dll"  - "c:/sys/bin/calendarwidgetplugin.dll"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.qtplugin"  - "c:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.qtplugin"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.manifest"  - "c:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.manifest"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.png"       - "c:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.png"
-"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.xml"       - "c:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.xml"
-
-"/epoc32/release/armv5/urel/calendarwidgetinstaller.exe"                                  - "c:/sys/bin/calendarwidgetinstaller.exe", FR, RB, RW
+"/epoc32/release/armv5/urel/calendarwidgetplugin.dll"  - "$:/sys/bin/calendarwidgetplugin.dll"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.qtplugin"  - "$:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.qtplugin"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.manifest"  - "$:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.manifest"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/qtg_large_calendar.png"       - "$:/private/20022F35/import/widgetregistry/2002C35A/qtg_large_calendar.png"
+"/epoc32/data/z/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.xml"       - "$:/private/20022F35/import/widgetregistry/2002C35A/calendarwidgetplugin.xml"