Upgrading default repository packages to normal structure.

git-svn-id: http://svn.telesphoreo.org/trunk@607 514c082c-b64e-11dc-b46d-3d985efe055d

7 files changed, 41 insertions, 38 deletions

diff --git a/data/ste/_metadata/extrainst_ b/data/ste/_metadata/extrainst_
new file mode 100755
index 000000000..eaede8332
--- /dev/null
+++ b/data/ste/_metadata/extrainst_
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [[ $1 == install || $1 == upgrade ]]; then
+    /usr/bin/apt-key add /usr/share/keyrings/ste-keyring.gpg
+fi
diff --git a/data/ste/_metadata/postinst b/data/ste/_metadata/postinst
deleted file mode 100755
index 73c703b4f..000000000
--- a/data/ste/_metadata/postinst
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/apt-key add /usr/share/keyrings/ste-keyring.gpg
diff --git a/data/ste/_metadata/prerm b/data/ste/_metadata/prerm
index a8f9ccc8a..22c5758e4 100755
--- a/data/ste/_metadata/prerm
+++ b/data/ste/_metadata/prerm
@@ -1,6 +1,4 @@
 #!/bin/sh
-case "$1" in
-    (remove|purge)
-        /usr/bin/apt-key del 78A6D152
-    ;;
-esac
+if [[ $1 == remove ]]; then
+    /usr/bin/apt-key del 78A6D152
+fi
diff --git a/data/ste/_metadata/replaces b/data/ste/_metadata/replaces
new file mode 100644
index 000000000..2e46ddf54
--- /dev/null
+++ b/data/ste/_metadata/replaces
@@ -0,0 +1 @@
+cydia (<< 1.0.2908-52)
diff --git a/data/ste/stepkg_key_2008.asc b/data/ste/jay
index e93c57afa..dea20cefe 100644
--- a/data/ste/stepkg_key_2008.asc
+++ b/data/ste/jay
@@ -1,30 +1,30 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-mQGiBEfdgLsRBADpMb9R9/L7Lt9jxAXLYpKIR83xG+Rbrfb/jqZCOKDomqY1/fGF
-Y5YcdhMknWXM++eVGY+hpLLq7pYQcaPbWAb/ssqcUYTXg0XsZXPxC7VYlewuUvx6
-nH1P1JSPeUFM8NMtWHADiSdO5TXdt6xtuC4hDlZIP2jU1XmwaowA9/UikwCgg5Y0
-iDmvvvJe4i9t9Xt7CF4TwT8D/3c7k+zdgEcdARuYMOKduZSCGN8F6+lSu+DTHNnQ
-nyE3/108ZIl2owi+yhzkouK8u3swYT9qvqkZzreYlmO8s28DFCgiNojxQKV20t1b
-ygyPGGopdGBDTNDs3Sss7MwS3dpuxAgvrM3YRu3dgIi6uIPEJh8X6mb+SUkENDVr
-vYdNBAC7ySl7V7WjRkQknZeTYKcugRQbrWi2TVWDiP3Dc67Vk40r+BWCV/SZAr2O
-I3pF9/jPzrwThcY5LSReNYvape40UGeGE4Wnlzj1Og6Fe5H23HFNI3Gpg2rrMiN/
-JvpWmRjZxym8ovVaHuYRsVVZDVomeXwlvYUFzaztNgUxfErS8rQwU2hhdW4gVC4g
-RXJpY2tzb24gKFN0ZSBQYWNrYWdpbmcpIDxzdGVAc214eS5vcmc+iGYEExECACYF
-AkfdgLsCGwMFCQHhM4AGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRD8ihW7eKbR
-UsyfAJ4qy/CQqcnYeVv3/YVmHfaCadZH8wCfZunaKH+8oAV3yXFk6MzJ/7Z1aje5
-Ag0ER92AyRAIAOEkuD9X3d2foKFWz8E0oPP3Lw+j0l0U5zS+GEv+jGdzrQutdXSa
-FrBI4BZQj+Z8QzyKoSfDYDLMDI4CDjuLrfy9g6mzJEb0AiUXSOWvaojoy1UgzHHw
-Qe5DJ1OVHSM5K0wdwxklpCvAWiT/AoU8l4vFL1cE71p4Kck8A5hbNUX30yApGydY
-qfXZtE+vr8bT+JstwU/IFm6/32GsP1d5v3orm2PlVoOYwOo0WbgBguKTkeJVc5pv
-5HU4KV+nhnlsuSL5k+1v6PngmdFadSOt3SMto0VVIX7YYfkAWMrFjQtjR7GwauO3
-2sRyiQHHxKwu/dLW46El4hDfM7K2M4DLi88AAwUH/ims23ThTygHKi1wi7RXtWOs
-WEEG9b8JP4wN+9OCHeOnxWVhu5nf4Dopzj1iussXJGoxhgqux7EfHLiqJR96CH6/
-AFUWsSB+WFR/0cuRdEVwNYf0MoXR+266oYz+eqCuQ6pxk8ez7YW/iqqxxIUxDzcF
-AH+TzbqxUWiwHNjUEZj0dJ4oVBY9iCdHqe3XDcNs/8aBTqmHw1XWGrezrZXA2uig
-vMZX+RBleGtDQR2G7lbgv5ktqardM8lnMfcaQL6y+YAyT9dM9ZBShu1plHqX7PN8
-Q9Itj8BpyhTpwmaHmAkf8R1SpWzkHJD9Lc0jDp1gFmJ8JdWR3YtIFW0i95VZsD6I
-TwQYEQIADwUCR92AyQIbDAUJAeEzgAAKCRD8ihW7eKbRUo/mAJoC+BI/SQSTjiUM
-rx0H39bmrnS+HwCfQYdWL5eyl9KjzxX4+ZEnTYKmBX0=
-=72L6
------END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----

+Version: GnuPG v1.4.6 (GNU/Linux)

+

+mQGiBEfdgLsRBADpMb9R9/L7Lt9jxAXLYpKIR83xG+Rbrfb/jqZCOKDomqY1/fGF

+Y5YcdhMknWXM++eVGY+hpLLq7pYQcaPbWAb/ssqcUYTXg0XsZXPxC7VYlewuUvx6

+nH1P1JSPeUFM8NMtWHADiSdO5TXdt6xtuC4hDlZIP2jU1XmwaowA9/UikwCgg5Y0

+iDmvvvJe4i9t9Xt7CF4TwT8D/3c7k+zdgEcdARuYMOKduZSCGN8F6+lSu+DTHNnQ

+nyE3/108ZIl2owi+yhzkouK8u3swYT9qvqkZzreYlmO8s28DFCgiNojxQKV20t1b

+ygyPGGopdGBDTNDs3Sss7MwS3dpuxAgvrM3YRu3dgIi6uIPEJh8X6mb+SUkENDVr

+vYdNBAC7ySl7V7WjRkQknZeTYKcugRQbrWi2TVWDiP3Dc67Vk40r+BWCV/SZAr2O

+I3pF9/jPzrwThcY5LSReNYvape40UGeGE4Wnlzj1Og6Fe5H23HFNI3Gpg2rrMiN/

+JvpWmRjZxym8ovVaHuYRsVVZDVomeXwlvYUFzaztNgUxfErS8rQwU2hhdW4gVC4g

+RXJpY2tzb24gKFN0ZSBQYWNrYWdpbmcpIDxzdGVAc214eS5vcmc+iGYEExECACYC

+GwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCScAkOQUJA8PW/gAKCRD8ihW7eKbR

+UnT8AJ9Sk+a6GeqiF/ZJXrP4OmKr41OhnwCeKm4qW7DXv/pebDoAZ8yXgv3oruK5

+Ag0ER92AyRAIAOEkuD9X3d2foKFWz8E0oPP3Lw+j0l0U5zS+GEv+jGdzrQutdXSa

+FrBI4BZQj+Z8QzyKoSfDYDLMDI4CDjuLrfy9g6mzJEb0AiUXSOWvaojoy1UgzHHw

+Qe5DJ1OVHSM5K0wdwxklpCvAWiT/AoU8l4vFL1cE71p4Kck8A5hbNUX30yApGydY

+qfXZtE+vr8bT+JstwU/IFm6/32GsP1d5v3orm2PlVoOYwOo0WbgBguKTkeJVc5pv

+5HU4KV+nhnlsuSL5k+1v6PngmdFadSOt3SMto0VVIX7YYfkAWMrFjQtjR7GwauO3

+2sRyiQHHxKwu/dLW46El4hDfM7K2M4DLi88AAwUH/ims23ThTygHKi1wi7RXtWOs

+WEEG9b8JP4wN+9OCHeOnxWVhu5nf4Dopzj1iussXJGoxhgqux7EfHLiqJR96CH6/

+AFUWsSB+WFR/0cuRdEVwNYf0MoXR+266oYz+eqCuQ6pxk8ez7YW/iqqxxIUxDzcF

+AH+TzbqxUWiwHNjUEZj0dJ4oVBY9iCdHqe3XDcNs/8aBTqmHw1XWGrezrZXA2uig

+vMZX+RBleGtDQR2G7lbgv5ktqardM8lnMfcaQL6y+YAyT9dM9ZBShu1plHqX7PN8

+Q9Itj8BpyhTpwmaHmAkf8R1SpWzkHJD9Lc0jDp1gFmJ8JdWR3YtIFW0i95VZsD6I

+TwQYEQIADwUCR92AyQIbDAUJAeEzgAAKCRD8ihW7eKbRUo/mAJoC+BI/SQSTjiUM

+rx0H39bmrnS+HwCfQYdWL5eyl9KjzxX4+ZEnTYKmBX0=

+=T4yb

+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/data/ste/make.sh b/data/ste/make.sh
index 0d58dedae..2d09dfec4 100644
--- a/data/ste/make.sh
+++ b/data/ste/make.sh
@@ -1,4 +1,6 @@
 pkg: mkdir -p /etc/apt/sources.list.d
 pkg: cp -a %/ste.list /etc/apt/sources.list.d
 pkg: mkdir -p /usr/share/keyrings
-pkg: cp -a %/stepkg_key_2008.asc /usr/share/keyrings/ste-keyring.gpg
+pkg: cp -a %/jay /usr/share/keyrings/ste-keyring.gpg
+pkg: mkdir -p /Applications/Cydia.app/Sources
+pkg: cp -a %/repo.smxy.org.png /Applications/Cydia.app/Sources/repo.smxy.org.png
diff --git a/data/ste/repo.smxy.org.png b/data/ste/repo.smxy.org.png
new file mode 100644
index 000000000..26c965508
--- /dev/null
+++ b/data/ste/repo.smxy.org.png