From 4c7a4a4a7127259d370d3365ccbfb345a24fc31e Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Mon, 03 Aug 2020 02:23:10 -0400
Subject: Fix substvars in package control files

---
diff --git a/libwolfssl.24-client-dev.pkg/control b/libwolfssl.24-client-dev.pkg/control
index ca1427d..4cbcafe 100644
--- a/libwolfssl.24-client-dev.pkg/control
+++ b/libwolfssl.24-client-dev.pkg/control
@@ -2,9 +2,9 @@ Architecture: any
 Platform: all
 Section: libdev
 Depends:
- libwolfssl.${Abi-Ver}-common (>= ${Source-Version}),
- libwolfssl.${Abi-Ver}-client (= ${Binary-Version}),
-Conflicts: libwolfssl.${Abi-Ver}-full-dev
+ libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
+ libwolfssl.${Abi-Version}-client:${Host-Arch} (= ${Binary-Version}),
+Conflicts: libwolfssl.${Abi-Version}-full-dev:${Host-Arch}
 # NB: These libdev packages don't replace each other like the lib packages do.
 Description: Lightweight TLS library - client library - development files
  ${Common-Description}
diff --git a/libwolfssl.24-client.pkg/control b/libwolfssl.24-client.pkg/control
index a6d8f47..8723f8b 100644
--- a/libwolfssl.24-client.pkg/control
+++ b/libwolfssl.24-client.pkg/control
@@ -2,10 +2,10 @@ Architecture: any
 Platform: all
 Section: lib
 Depends:
- libwolfssl.${Abi-Ver}-common (>= ${Source-Version}),
- {Shlib-Depends},
-Conflicts: libwolfssl.${Abi-Ver}-full
-Replaces: libwolfssl.${Abi-Ver}-full
+ libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
+ ${Shlib-Depends},
+Conflicts: libwolfssl.${Abi-Version}-full:${Host-Arch}
+Replaces: libwolfssl.${Abi-Version}-full:${Host-Arch}
 Description: Lightweight TLS library - client library
  ${Common-Description}
  .
diff --git a/libwolfssl.24-dbg.pkg/control b/libwolfssl.24-dbg.pkg/control
index d2d2275..b2afbde 100644
--- a/libwolfssl.24-dbg.pkg/control
+++ b/libwolfssl.24-dbg.pkg/control
@@ -2,7 +2,7 @@ Architecture: any
 Platform: all
 Section: dbg
 Depends:
- libwolfssl.${Abi-Ver}-common (>= ${Source-Version}),
+ libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
 Description: Lightweight TLS library - debugging library
  ${Common-Description}
  .
diff --git a/libwolfssl.24-full-dev.pkg/control b/libwolfssl.24-full-dev.pkg/control
index 124e238..4a43aac 100644
--- a/libwolfssl.24-full-dev.pkg/control
+++ b/libwolfssl.24-full-dev.pkg/control
@@ -2,9 +2,9 @@ Architecture: any
 Platform: all
 Section: libdev
 Depends:
- libwolfssl.${Abi-Ver}-common (>= ${Source-Version}),
- libwolfssl.${Abi-Ver}-full (= ${Binary-Version}),
-Conflicts: libwolfssl.${Abi-Ver}-client-dev
+ libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
+ libwolfssl.${Abi-Version}-full:${Host-Arch} (= ${Binary-Version}),
+Conflicts: libwolfssl.${Abi-Version}-client-dev:${Host-Arch}
 # NB: These libdev packages don't replace each other like the lib packages do.
 Description: Lightweight TLS library - client/server library - development files
  ${Common-Description}
diff --git a/libwolfssl.24-full.pkg/control b/libwolfssl.24-full.pkg/control
index a913233..66a9e34 100644
--- a/libwolfssl.24-full.pkg/control
+++ b/libwolfssl.24-full.pkg/control
@@ -2,10 +2,10 @@ Architecture: any
 Platform: all
 Section: lib
 Depends:
- libwolfssl.${Abi-Ver}-common (>= ${Source-Version}),
- {Shlib-Depends},
-Conflicts: libwolfssl.${Abi-Ver}-client
-Replaces: libwolfssl.${Abi-Ver}-client
+ libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
+ ${Shlib-Depends},
+Conflicts: libwolfssl.${Abi-Version}-client:${Host-Arch}
+Replaces: libwolfssl.${Abi-Version}-client:${Host-Arch}
 Description: Lightweight TLS library - client/server library
  ${Common-Description}
  .
--
cgit v0.9.1