From ff748f1a41dce87655b67cf4deff05974b906828 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Fri, 25 Apr 2008 22:49:18 +0000
Subject: [PATCH] Updated Symbian UIDs. Added .pkg files for creating .sis
 packages.

---
 packages/Makefile.am               |  3 ++-
 packages/Symbian/group/curl.iby    |  2 ++
 packages/Symbian/group/curl.mmp    |  2 +-
 packages/Symbian/group/curl.pkg    | 26 ++++++++++++++++++++++++++
 packages/Symbian/group/libcurl.iby |  2 ++
 packages/Symbian/group/libcurl.mmp |  2 +-
 packages/Symbian/group/libcurl.pkg | 22 ++++++++++++++++++++++
 packages/Symbian/readme.txt        |  2 +-
 8 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 packages/Symbian/group/curl.pkg
 create mode 100644 packages/Symbian/group/libcurl.pkg

diff --git a/packages/Makefile.am b/packages/Makefile.am
index 04b29ed85..32f9c8b2a 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -6,4 +6,5 @@ OS400/make-lib.sh OS400/make-src.sh OS400/make-tests.sh OS400/os400sys.c      \
 OS400/os400sys.h OS400/README.OS400 \
 Symbian/bwins/libcurlu.def Symbian/eabi/libcurlu.def Symbian/group/bld.inf \
 Symbian/group/curl.iby Symbian/group/curl.mmp Symbian/group/libcurl.iby    \
-Symbian/group/libcurl.mmp Symbian/readme.txt
+Symbian/group/libcurl.mmp Symbian/group/curl.pkg Symbian/group/libcurl.pkg \
+Symbian/readme.txt
diff --git a/packages/Symbian/group/curl.iby b/packages/Symbian/group/curl.iby
index 33eac4ad6..141986e0b 100644
--- a/packages/Symbian/group/curl.iby
+++ b/packages/Symbian/group/curl.iby
@@ -1,5 +1,7 @@
 // 
 // curl file transfer utility command-line utility
+//
+// Use this file with buildrom to add curl to a device ROM
 // 
 
 #ifndef CURL_IBY
diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index 55dea716e..b00937ef1 100644
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -4,7 +4,7 @@
 
 TARGET        curl.exe
 TARGETTYPE    exe
-UID           0x00000000 0x10206442
+UID           0x00000000 0xF0206442
 
 SOURCEPATH	..\..\..\src
 SOURCE \
diff --git a/packages/Symbian/group/curl.pkg b/packages/Symbian/group/curl.pkg
new file mode 100644
index 000000000..3454496ea
--- /dev/null
+++ b/packages/Symbian/group/curl.pkg
@@ -0,0 +1,26 @@
+; curl package defintion file
+; Use with makesis to create a Symbian .sis package
+
+;Language - standard language definitions
+&EN
+
+;Header - standard sis file header including version number
+;Version scheme: curl's major, curl's minor, curl's subminor*100 + build number
+; e.g. The third Symbian package of curl ver. 7.18.2 would have a SIS package
+; version of 7, 18, 203
+#{"curl"}, (0xF0206442), 7, 18, <please_update_version>, TYPE=SA
+
+; Vendor name
+%{"Standard libcurl package"}
+:"Standard libcurl package"
+
+; Embedded component
+@"libcurl.sis",(0xF0206D00)
+
+; A dependency on P.I.P.S. and the stdio server are probably good to have here
+;(0x20009A80), *, *, *, {"P.I.P.S. for Series 60 3rd ed."}
+;(0x20009A81), *, *, *, {"P.I.P.S. for UIQ 3"}
+;(0x20009AA2), *, *, *, {"Symbian OS STDIOSERVER"}
+
+;Files - standard file specifications
+"epoc32\release\armv5\urel\curl.exe" - "$:\sys\bin\curl.exe"
diff --git a/packages/Symbian/group/libcurl.iby b/packages/Symbian/group/libcurl.iby
index 6ea4fbb9f..b59af680e 100644
--- a/packages/Symbian/group/libcurl.iby
+++ b/packages/Symbian/group/libcurl.iby
@@ -1,6 +1,8 @@
 //
 // libcurl file transfer DLL
 //
+// Use this file with buildrom to add libcurl to a device ROM
+//
 
 #ifndef LIBCURL_IBY
 #define LIBCURL_IBY
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 3c62c5aaf..22a58fc49 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -4,7 +4,7 @@
 
 TARGET        libcurl.dll
 TARGETTYPE    dll
-UID    0x1000008d 0x10206D00
+UID    0x1000008d 0xF0206D00
 
 MACRO		BUILDING_LIBCURL=1
 
diff --git a/packages/Symbian/group/libcurl.pkg b/packages/Symbian/group/libcurl.pkg
new file mode 100644
index 000000000..ab01ba1f1
--- /dev/null
+++ b/packages/Symbian/group/libcurl.pkg
@@ -0,0 +1,22 @@
+; libcurl package defintion file
+; Use with makesis to create a Symbian .sis package
+
+;Language - standard language definitions
+&EN
+
+;Header - standard sis file header including version number
+;Version scheme: curl's major, curl's minor, curl's subminor*100 + build number
+; e.g. The third Symbian package of curl ver. 7.18.2 would have a SIS package
+; version of 7, 18, 203
+#{"libcurl"}, (0xF0206D00), 7, 18, <please_update_version>, TYPE=SA
+
+; Vendor name
+%{"Standard curl package"}
+:"Standard curl package"
+
+; A dependency on P.I.P.S. is probably a good idea to add here
+;(0x20009A80), *, *, *, {"P.I.P.S. for Series 60 3rd ed."}
+;(0x20009A81), *, *, *, {"P.I.P.S. for UIQ 3"}
+
+;Files - standard file specifications
+"epoc32\release\armv5\urel\libcurl.dll" - "$:\sys\bin\libcurl.dll"
diff --git a/packages/Symbian/readme.txt b/packages/Symbian/readme.txt
index c64d1fa70..f7fec1017 100644
--- a/packages/Symbian/readme.txt
+++ b/packages/Symbian/readme.txt
@@ -45,7 +45,7 @@ All screen output disappears after curl exits, so after a transfer completes,
 curl waits by default for Enter to pressed before exiting.  This behaviour
 is suppressed when the -s option is given.
 
-The "home directory" in Symbian is C:\Private\10206442\. The .curlrc is read
+The "home directory" in Symbian is C:\Private\f0206442\. The .curlrc is read
 from this directory on startup.
 
 libcurl notes