curl.4-common: New common package

7 files changed, 15 insertions, 4 deletions

diff --git a/changelog b/changelog
index 9f31b00..c1ed20e 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,9 @@ curl (7.74.0-1) trunk
   * Organize packages into sections.
   * Reword package descriptions.
   * curl-doc: Rename to curl.4-doc.
+  * curl.4-common: New common package.  This is necessary because
+    curl.4-doc is Architecture:all and therefore can't depend on
+    libcurl.4:${Host-Arch}.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sat, 26 Dec 2020 21:01:49 -0500
 
diff --git a/curl.4-common.pkg/control b/curl.4-common.pkg/control
new file mode 100644
index 0000000..bf1cc43
--- /dev/null
+++ b/curl.4-common.pkg/control
@@ -0,0 +1,8 @@
+Architecture: all
+Platform: all
+Section: doc
+Description: curl command-line tool and library - common files
+ ${Both-Description}
+ .
+ This package provides source package documentation for the curl command-line
+ tool and library.
diff --git a/libcurl.4.pkg/docs b/curl.4-common.pkg/docs
index e2abcb0..e2abcb0 100644
--- a/libcurl.4.pkg/docs
+++ b/curl.4-common.pkg/docs
diff --git a/curl.4-doc.pkg/control b/curl.4-doc.pkg/control
index e107171..66c5d51 100644
--- a/curl.4-doc.pkg/control
+++ b/curl.4-doc.pkg/control
@@ -1,7 +1,7 @@
 Architecture: all
 Platform: all
 Section: doc
-Depends: libcurl.4 (>= ${Source-Version})
+Depends: curl.4-common (= ${Source-Version})
 Description: curl command-line tool and library - documentation
  ${Both-Description}
  .
diff --git a/curl.pkg/control b/curl.pkg/control
index 281c6ec..8f055f1 100644
--- a/curl.pkg/control
+++ b/curl.pkg/control
@@ -1,6 +1,6 @@
 Architecture: any
 Platform: all
 Section: util
-Depends: libcurl.4 (= ${Binary-Version}), libz.1
+Depends: curl.4-common (= ${Source-Version}), libz.1
 Description: Command-line tool for transferring data with URL syntax
  ${Curl-Description}
diff --git a/libcurl.4-dev.pkg/control b/libcurl.4-dev.pkg/control
index 0008f37..1086003 100644
--- a/libcurl.4-dev.pkg/control
+++ b/libcurl.4-dev.pkg/control
@@ -1,7 +1,7 @@
 Architecture: any
 Platform: all
 Section: libdev
-Depends: libcurl.4 (= ${Binary-Version})
+Depends: curl.4-common (= ${Source-Version}), libcurl.4 (= ${Binary-Version})
 Description: Client-side URL transfer library - development files
  ${Libcurl-Description}
  .
diff --git a/libcurl.4.pkg/control b/libcurl.4.pkg/control
index d84f4f5..af4fb17 100644
--- a/libcurl.4.pkg/control
+++ b/libcurl.4.pkg/control
@@ -1,6 +1,6 @@
 Architecture: any
 Platform: all
 Section: lib
-Depends: libz.1
+Depends: curl.4-common (= ${Source-Version}), libz.1
 Description: Client-side URL transfer library
  ${Libcurl-Description}