14 files changed, 31 insertions, 87 deletions
diff --git a/changelog b/changelog
index 227dcfb..3dd5390 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,15 @@
 wolfssl.24 (4.4.0-2) trunk
 
+  * Drop variants.  On amd64-linux-glibc for example, libwolfssl.24-client was
+    only 28 KiB smaller than libwolfssl.24-full was.  These changes are safe
+    without transitions because no other packages in ProteanOS depend on these
+    packages.
+    - Rename libwolfssl.24-full to libwolfssl.24.
+    - Rename libwolfssl.24-full-dev to libwolfssl.24-dev.
+    - Remove libwolfssl.24-client, libwolfssl.24-client-dev, and
+      libwolfssl.24-common.
+    - Make libwolfssl.24-dbg depend on libwolfssl.24, instead of conflicting
+      with, replacing, and providing it.
   * libwolfssl.24-dbg: Include debugging symbols, as well as debugging
     messages which can be enabled by applications using
     wolfSSL_Debugging_ON().
diff --git a/libwolfssl.24-client-dev.pkg/control b/libwolfssl.24-client-dev.pkg/control
deleted file mode 100644
index e9e049f..0000000
--- a/libwolfssl.24-client-dev.pkg/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Architecture: any
-Platform: all
-Section: libdev
-Depends:
- libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
- libwolfssl.${Abi-Version}-client:${Host-Arch} (= ${Binary-Version}),
-Conflicts: libwolfssl.${Abi-Version}-full-dev
-# NB: These libdev packages don't replace each other like the lib packages do.
-Description: Lightweight TLS library - client library - development files
- ${Common-Description}
- .
- This package provides development files for the wolfSSL TLS library configured
- for client applications only.
diff --git a/libwolfssl.24-client.pkg/control b/libwolfssl.24-client.pkg/control
deleted file mode 100644
index 7859e95..0000000
--- a/libwolfssl.24-client.pkg/control
+++ /dev/null
@@ -1,17 +0,0 @@
-Architecture: any
-Platform: all
-Section: lib
-Depends:
- libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
- ${Shlib-Depends},
-Conflicts:
- libwolfssl.${Abi-Version}-full:${Host-Arch},
- libwolfssl.${Abi-Version}-dbg:${Host-Arch},
-Replaces:
- libwolfssl.${Abi-Version}-full:${Host-Arch},
- libwolfssl.${Abi-Version}-dbg:${Host-Arch},
-Description: Lightweight TLS library - client library
- ${Common-Description}
- .
- This package provides the wolfSSL TLS library configured for client
- applications only.
diff --git a/libwolfssl.24-common.pkg/control b/libwolfssl.24-common.pkg/control
deleted file mode 100644
index 9ea793f..0000000
--- a/libwolfssl.24-common.pkg/control
+++ /dev/null
@@ -1,8 +0,0 @@
-Architecture: all
-Platform: all
-Section: share
-Description: Lightweight TLS library - common files
- ${Common-Description}
- .
- This package provides source package documentation files for the wolfSSL TLS
- library.
diff --git a/libwolfssl.24-dbg.pkg/control b/libwolfssl.24-dbg.pkg/control
index 1793cdf..0f6a852 100644
--- a/libwolfssl.24-dbg.pkg/control
+++ b/libwolfssl.24-dbg.pkg/control
@@ -2,19 +2,10 @@ Architecture: any
 Platform: all
 Section: dbg
 Depends:
- libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
+ libwolfssl.${Abi-Version}:${Host-Arch} (= ${Binary-Version}),
  ${Shlib-Depends},
-Conflicts:
- libwolfssl.${Abi-Version}-client:${Host-Arch},
- libwolfssl.${Abi-Version}-full:${Host-Arch},
-Replaces:
- libwolfssl.${Abi-Version}-client:${Host-Arch},
- libwolfssl.${Abi-Version}-full:${Host-Arch},
-Provides:
- libwolfssl.${Abi-Version}-client:${Host-Arch},
- libwolfssl.${Abi-Version}-full:${Host-Arch},
 Description: Lightweight TLS library - debugging library
  ${Common-Description}
  .
- This package provides the wolfSSL TLS library configured for client and server
- applications and with debugging symbols and error strings.
+ This package provides the wolfSSL TLS library with debugging symbols and error
+ strings.
diff --git a/libwolfssl.24-dev.pkg/control b/libwolfssl.24-dev.pkg/control
new file mode 100644
index 0000000..d749f20
--- /dev/null
+++ b/libwolfssl.24-dev.pkg/control
@@ -0,0 +1,9 @@
+Architecture: any
+Platform: all
+Section: libdev
+Depends:
+ libwolfssl.${Abi-Version}:${Host-Arch} (= ${Binary-Version}),
+Description: Lightweight TLS library - development files
+ ${Common-Description}
+ .
+ This package provides development files for the wolfSSL TLS library.
diff --git a/libwolfssl.24-client-dev.pkg/files b/libwolfssl.24-dev.pkg/files
index 6a0aaa8..6a0aaa8 100644
--- a/libwolfssl.24-client-dev.pkg/files
+++ b/libwolfssl.24-dev.pkg/files
diff --git a/libwolfssl.24-full-dev.pkg/control b/libwolfssl.24-full-dev.pkg/control
deleted file mode 100644
index 59e5c97..0000000
--- a/libwolfssl.24-full-dev.pkg/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Architecture: any
-Platform: all
-Section: libdev
-Depends:
- libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
- libwolfssl.${Abi-Version}-full:${Host-Arch} (= ${Binary-Version}),
-Conflicts: libwolfssl.${Abi-Version}-client-dev
-# 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}
- .
- This package provides development files for the wolfSSL TLS library configured
- for client and server applications.
diff --git a/libwolfssl.24-full-dev.pkg/files b/libwolfssl.24-full-dev.pkg/files
deleted file mode 100644
index 6a0aaa8..0000000
--- a/libwolfssl.24-full-dev.pkg/files
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/include/
-/usr/lib/*/libwolfssl.so
-/usr/lib/*/pkgconfig/wolfssl.pc
-/usr/bin/wolfssl-config
diff --git a/libwolfssl.24-full.pkg/control b/libwolfssl.24-full.pkg/control
deleted file mode 100644
index 8f99463..0000000
--- a/libwolfssl.24-full.pkg/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Architecture: any
-Platform: all
-Section: lib
-Depends:
- libwolfssl.${Abi-Version}-common (>= ${Source-Version}),
- ${Shlib-Depends},
-Conflicts:
- libwolfssl.${Abi-Version}-client:${Host-Arch},
- libwolfssl.${Abi-Version}-dbg:${Host-Arch},
-Replaces:
- libwolfssl.${Abi-Version}-client:${Host-Arch},
- libwolfssl.${Abi-Version}-dbg:${Host-Arch},
-Provides:
- libwolfssl.${Abi-Version}-client:${Host-Arch},
-Description: Lightweight TLS library - client/server library
- ${Common-Description}
- .
- This package provides the wolfSSL TLS library configured for client and server
- applications.
diff --git a/libwolfssl.24-full.pkg/files b/libwolfssl.24-full.pkg/files
deleted file mode 100644
index f2f486e..0000000
--- a/libwolfssl.24-full.pkg/files
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/*/libwolfssl.so.*
diff --git a/libwolfssl.24.pkg/control b/libwolfssl.24.pkg/control
new file mode 100644
index 0000000..2ea43a6
--- /dev/null
+++ b/libwolfssl.24.pkg/control
@@ -0,0 +1,9 @@
+Architecture: any
+Platform: all
+Section: lib
+Depends:
+ ${Shlib-Depends},
+Description: Lightweight TLS library
+ ${Common-Description}
+ .
+ This package provides the wolfSSL TLS library.
diff --git a/libwolfssl.24-client.pkg/docs b/libwolfssl.24.pkg/docs
index e69de29..e69de29 100644
--- a/libwolfssl.24-client.pkg/docs
+++ b/libwolfssl.24.pkg/docs
diff --git a/libwolfssl.24-client.pkg/files b/libwolfssl.24.pkg/files
index f2f486e..f2f486e 100644
--- a/libwolfssl.24-client.pkg/files
+++ b/libwolfssl.24.pkg/files