diff options
| author | Sam Bingner <sam@bingner.com> | 2018-12-13 15:12:38 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-12-13 15:12:38 -1000 |
| commit | 452b3e82384c1b9c5b4effe10d919e3c50275038 (patch) | |
| tree | fbaf560f8720ef532d75ea34ca56e7aa4503809e | |
| parent | 957aa75d05c00731d7112bed7b68ce4568667d0c (diff) | |
Fix some package versions and conflicts
| l--------- | data/aptitude/_metadata/apt7-lib.dep | 1 | ||||
| l--------- | data/aptitude/_metadata/libapt.dep | 1 | ||||
| -rw-r--r-- | data/ldid/_metadata/version | 2 | ||||
| -rw-r--r-- | data/libapt-pkg5.0/_metadata/conflicts | 2 | ||||
| -rw-r--r-- | data/libapt/_metadata/conflicts | 2 | ||||
| l--------- | data/nail/_metadata/libssl0.9.8.dep | 1 | ||||
| l--------- | data/nail/_metadata/libssl1.0.dep | 1 | ||||
| -rw-r--r-- | data/rdesktop/make.sh | 2 | ||||
| -rw-r--r-- | data/sm/make.sh | 1 |
9 files changed, 6 insertions, 7 deletions
diff --git a/data/aptitude/_metadata/apt7-lib.dep b/data/aptitude/_metadata/apt7-lib.dep deleted file mode 120000 index 78dc2609b..000000000 --- a/data/aptitude/_metadata/apt7-lib.dep +++ /dev/null @@ -1 +0,0 @@ -../../apt7-lib
\ No newline at end of file diff --git a/data/aptitude/_metadata/libapt.dep b/data/aptitude/_metadata/libapt.dep new file mode 120000 index 000000000..280bf477b --- /dev/null +++ b/data/aptitude/_metadata/libapt.dep @@ -0,0 +1 @@ +../../libapt
\ No newline at end of file diff --git a/data/ldid/_metadata/version b/data/ldid/_metadata/version index 646ccf7c7..eced4a247 100644 --- a/data/ldid/_metadata/version +++ b/data/ldid/_metadata/version @@ -1 +1 @@ -1:2.0.0 +2:2.0.0 diff --git a/data/libapt-pkg5.0/_metadata/conflicts b/data/libapt-pkg5.0/_metadata/conflicts index d8164dce9..77c98489a 100644 --- a/data/libapt-pkg5.0/_metadata/conflicts +++ b/data/libapt-pkg5.0/_metadata/conflicts @@ -1 +1 @@ -apt7-lib (>=1.0) +apt7-lib (<<1:0) diff --git a/data/libapt/_metadata/conflicts b/data/libapt/_metadata/conflicts index c299ef9e1..77c98489a 100644 --- a/data/libapt/_metadata/conflicts +++ b/data/libapt/_metadata/conflicts @@ -1 +1 @@ -apt7-lib +apt7-lib (<<1:0) diff --git a/data/nail/_metadata/libssl0.9.8.dep b/data/nail/_metadata/libssl0.9.8.dep new file mode 120000 index 000000000..5b4cc423e --- /dev/null +++ b/data/nail/_metadata/libssl0.9.8.dep @@ -0,0 +1 @@ +../../libssl0.9.8
\ No newline at end of file diff --git a/data/nail/_metadata/libssl1.0.dep b/data/nail/_metadata/libssl1.0.dep deleted file mode 120000 index a501d00a8..000000000 --- a/data/nail/_metadata/libssl1.0.dep +++ /dev/null @@ -1 +0,0 @@ -../../libssl1.0
\ No newline at end of file diff --git a/data/rdesktop/make.sh b/data/rdesktop/make.sh index 1fae0d2f8..bddf845fa 100644 --- a/data/rdesktop/make.sh +++ b/data/rdesktop/make.sh @@ -1,5 +1,5 @@ pkg:setup cp ${PKG_BASE}/config.sub . -pkg:configure --with-openssl="$(PKG_DEST_ openssl)/usr" --with-sound=no +pkg:configure --with-openssl="$(PKG_DEST_ _openssl1.0)/usr" --with-sound=no make -j8 pkg:install diff --git a/data/sm/make.sh b/data/sm/make.sh index 9362b0640..fbc999151 100644 --- a/data/sm/make.sh +++ b/data/sm/make.sh @@ -2,4 +2,3 @@ pkg:setup pkg:configure make -j8 pkg:install -pkg: find /usr/lib -name '*.la' | xargs rm |