Replace apt7-ssl with apt7-lib.

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

20 files changed, 4 insertions, 18 deletions

diff --git a/data/apt7-lib/_metadata/conflicts b/data/apt7-lib/_metadata/conflicts
new file mode 100644
index 000000000..905ea7f38
--- /dev/null
+++ b/data/apt7-lib/_metadata/conflicts
@@ -0,0 +1 @@
+apt7-ssl
diff --git a/data/apt7-lib/_metadata/provides b/data/apt7-lib/_metadata/provides
new file mode 100644
index 000000000..905ea7f38
--- /dev/null
+++ b/data/apt7-lib/_metadata/provides
@@ -0,0 +1 @@
+apt7-ssl
diff --git a/data/apt7-lib/_metadata/replaces b/data/apt7-lib/_metadata/replaces
index 29d98e7a0..7eb23c80d 100644
--- a/data/apt7-lib/_metadata/replaces
+++ b/data/apt7-lib/_metadata/replaces
@@ -1 +1 @@
-apt (<< 1:0-1), apt7 (<< 0.7.20.2-3)
+apt (<< 1:0-1), apt7 (<< 0.7.20.2-3), apt7-ssl
diff --git a/data/apt7-lib/make.sh b/data/apt7-lib/make.sh
index 2495661d3..ca48d2df0 100644
--- a/data/apt7-lib/make.sh
+++ b/data/apt7-lib/make.sh
@@ -4,3 +4,4 @@ cp -a "$(PKG_DEST_ _apt7)"/var "${PKG_DEST}"
 pkg: mkdir -p /usr
 cp -a "$(PKG_DEST_ _apt7)"/usr/lib "${PKG_DEST}"/usr
 pkg: rm -f /usr/lib/apt/methods/https
+pkg: ln -s http /usr/lib/apt/methods/https
diff --git a/data/apt7-ssl/_metadata/_apt7.dep b/data/apt7-ssl/_metadata/_apt7.dep
deleted file mode 120000
index 44cb23ede..000000000
--- a/data/apt7-ssl/_metadata/_apt7.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt7
\ No newline at end of file
diff --git a/data/apt7-ssl/_metadata/apt7-lib.dep b/data/apt7-ssl/_metadata/apt7-lib.dep
deleted file mode 120000
index 78dc2609b..000000000
--- a/data/apt7-ssl/_metadata/apt7-lib.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../apt7-lib
\ No newline at end of file
diff --git a/data/apt7-ssl/_metadata/apt7-lib.ver.iphoneos-arm b/data/apt7-ssl/_metadata/apt7-lib.ver.iphoneos-arm
deleted file mode 100644
index 138a91ba8..000000000
--- a/data/apt7-ssl/_metadata/apt7-lib.ver.iphoneos-arm
+++ /dev/null
@@ -1 +0,0 @@
-0.7.25.3-7
diff --git a/data/apt7-ssl/_metadata/curl.dep b/data/apt7-ssl/_metadata/curl.dep
deleted file mode 120000
index 9c4438112..000000000
--- a/data/apt7-ssl/_metadata/curl.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../curl
\ No newline at end of file
diff --git a/data/apt7-ssl/_metadata/description b/data/apt7-ssl/_metadata/description
deleted file mode 100644
index 2f49938a7..000000000
--- a/data/apt7-ssl/_metadata/description
+++ /dev/null
@@ -1 +0,0 @@
-advanced packaging from Debian /via SSL/
diff --git a/data/apt7-ssl/_metadata/license b/data/apt7-ssl/_metadata/license
deleted file mode 120000
index 9ceb986b6..000000000
--- a/data/apt7-ssl/_metadata/license
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt7/_metadata/license
\ No newline at end of file
diff --git a/data/apt7-ssl/_metadata/maintainer b/data/apt7-ssl/_metadata/maintainer
deleted file mode 120000
index 0f0b5d763..000000000
--- a/data/apt7-ssl/_metadata/maintainer
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt7/_metadata/maintainer
\ No newline at end of file
diff --git a/data/apt7-ssl/_metadata/name b/data/apt7-ssl/_metadata/name
deleted file mode 100644
index 781ebd307..000000000
--- a/data/apt7-ssl/_metadata/name
+++ /dev/null
@@ -1 +0,0 @@
-APT 0.7 HTTPS Method
diff --git a/data/apt7-ssl/_metadata/priority b/data/apt7-ssl/_metadata/priority
deleted file mode 100644
index 134d9bc32..000000000
--- a/data/apt7-ssl/_metadata/priority
+++ /dev/null
@@ -1 +0,0 @@
-optional
diff --git a/data/apt7-ssl/_metadata/replaces b/data/apt7-ssl/_metadata/replaces
deleted file mode 100644
index 29d98e7a0..000000000
--- a/data/apt7-ssl/_metadata/replaces
+++ /dev/null
@@ -1 +0,0 @@
-apt (<< 1:0-1), apt7 (<< 0.7.20.2-3)
diff --git a/data/apt7-ssl/_metadata/role b/data/apt7-ssl/_metadata/role
deleted file mode 100644
index 762113e87..000000000
--- a/data/apt7-ssl/_metadata/role
+++ /dev/null
@@ -1 +0,0 @@
-enduser
diff --git a/data/apt7-ssl/_metadata/section b/data/apt7-ssl/_metadata/section
deleted file mode 120000
index a2637624b..000000000
--- a/data/apt7-ssl/_metadata/section
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt7/_metadata/section
\ No newline at end of file
diff --git a/data/apt7-ssl/_metadata/tags b/data/apt7-ssl/_metadata/tags
deleted file mode 100644
index a8928cec8..000000000
--- a/data/apt7-ssl/_metadata/tags
+++ /dev/null
@@ -1 +0,0 @@
-purpose::library
diff --git a/data/apt7-ssl/_metadata/version b/data/apt7-ssl/_metadata/version
deleted file mode 120000
index ac4ae7e84..000000000
--- a/data/apt7-ssl/_metadata/version
+++ /dev/null
@@ -1 +0,0 @@
-../../_apt7/_metadata/version
\ No newline at end of file
diff --git a/data/apt7-ssl/make.sh b/data/apt7-ssl/make.sh
deleted file mode 100644
index e91c46f00..000000000
--- a/data/apt7-ssl/make.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-pkg: mkdir -p /usr/lib/apt/methods
-cp -a "$(PKG_DEST_ _apt7)"/usr/lib/apt/methods/https "${PKG_DEST}"/usr/lib/apt/methods
diff --git a/data/apt7/_metadata/apt7-ssl.dep b/data/apt7/_metadata/apt7-ssl.dep
deleted file mode 120000
index 94bf85bf9..000000000
--- a/data/apt7/_metadata/apt7-ssl.dep
+++ /dev/null
@@ -1 +0,0 @@
-../../apt7-ssl
\ No newline at end of file