28 files changed, 72 insertions, 28 deletions
diff --git a/changelog b/changelog
index 166e1bd..5b2d9cd 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 ncurses (6.2+20210109-1) trunk
 
   * New upstream version.
+  * Organize packages into sections.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sun, 10 Jan 2021 03:18:06 -0500
 
diff --git a/control b/control
index b126db1..72c2085 100644
--- a/control
+++ b/control
@@ -1,3 +1,3 @@
 Maintainer: Patrick McDermott <patrick.mcdermott@libiquity.com>
-Build-Depends: opkbuild (>= 4.1.2), opkhelper-3.0 (>= 3.1.2), gpg, dirmngr
+Build-Depends: opkbuild (>= 4.2.0), opkhelper-3.0 (>= 3.1.4), gpg, dirmngr
 Homepage: https://invisible-island.net/ncurses/
diff --git a/libform.6.pkg/control b/libform.6.pkg/control
index 30d6452..a6af52a 100644
--- a/libform.6.pkg/control
+++ b/libform.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libform.6 (>= 1:1.0)
 Description: curses form library
  ${Common-Description}
  .
diff --git a/libformw.6.pkg/control b/libformw.6.pkg/control
index 3aadbb2..7f9fc0d 100644
--- a/libformw.6.pkg/control
+++ b/libformw.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libformw.6 (>= 1:1.0)
 Description: curses form library with wide character support
  ${Common-Description}
  .
diff --git a/libmenu.6.pkg/control b/libmenu.6.pkg/control
index a5e3dd3..4df4eba 100644
--- a/libmenu.6.pkg/control
+++ b/libmenu.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libmenu.6 (>= 1:1.0)
 Description: curses menu library
  ${Common-Description}
  .
diff --git a/libmenuw.6.pkg/control b/libmenuw.6.pkg/control
index d7ac1ae..9e5637b 100644
--- a/libmenuw.6.pkg/control
+++ b/libmenuw.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libmenuw.6 (>= 1:1.0)
 Description: curses menu library with wide character support
  ${Common-Description}
  .
diff --git a/libncurses++.5.pkg/control b/libncurses++.5.pkg/control
index a56e3bd..4757357 100644
--- a/libncurses++.5.pkg/control
+++ b/libncurses++.5.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncurses++.5 (>= 1:1.0)
 Description: curses C++ library (legacy ABI)
  ${Common-Description}
  .
diff --git a/libncurses++.6.pkg/control b/libncurses++.6.pkg/control
index 2edfd3d..be9af6a 100644
--- a/libncurses++.6.pkg/control
+++ b/libncurses++.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncurses++.6 (>= 1:1.0)
 Description: curses C++ library
  ${Common-Description}
  .
diff --git a/libncurses++w.5.pkg/control b/libncurses++w.5.pkg/control
index b15e453..8c7d397 100644
--- a/libncurses++w.5.pkg/control
+++ b/libncurses++w.5.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncurses++w.5 (>= 1:1.0)
 Description: curses C++ library with wide character support (legacy ABI)
  ${Common-Description}
  .
diff --git a/libncurses++w.6.pkg/control b/libncurses++w.6.pkg/control
index dcad21b..77dcb69 100644
--- a/libncurses++w.6.pkg/control
+++ b/libncurses++w.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncurses++w.6 (>= 1:1.0)
 Description: curses C++ library with wide character support
  ${Common-Description}
  .
diff --git a/libncurses.5-dev.pkg/control b/libncurses.5-dev.pkg/control
index 74a1f03..83d865f 100644
--- a/libncurses.5-dev.pkg/control
+++ b/libncurses.5-dev.pkg/control
@@ -1,11 +1,12 @@
 Architecture: any
 Platform: all
+Section: libdev
 Depends: ncurses-common (= ${Source-Version}),
- libncurses.5 (= ${Binary-Version}),
- libncursesw.5 (= ${Binary-Version}),
- libncurses++.5 (= ${Binary-Version}),
- libncurses++w.5 (= ${Binary-Version}),
- libtinfo.5 (= ${Binary-Version}),
+ libncurses.5:${Host-Arch} (= ${Binary-Version}),
+ libncursesw.5:${Host-Arch} (= ${Binary-Version}),
+ libncurses++.5:${Host-Arch} (= ${Binary-Version}),
+ libncurses++w.5:${Host-Arch} (= ${Binary-Version}),
+ libtinfo.5:${Host-Arch} (= ${Binary-Version}),
 # Should conflict with all other available versions:
 Conflicts: libncurses.6-dev
 Description: curses library (legacy ABI) - development files
diff --git a/libncurses.5.pkg/control b/libncurses.5.pkg/control
index 49fc3a6..e72d2fd 100644
--- a/libncurses.5.pkg/control
+++ b/libncurses.5.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncurses.5 (>= 1:1.0)
 Description: curses library (legacy ABI)
  ${Common-Description}
  .
diff --git a/libncurses.6-dev.pkg/control b/libncurses.6-dev.pkg/control
index 22444b9..147ab96 100644
--- a/libncurses.6-dev.pkg/control
+++ b/libncurses.6-dev.pkg/control
@@ -1,18 +1,19 @@
 Architecture: any
 Platform: all
+Section: libdev
 Depends: ncurses-common (= ${Source-Version}),
- libncurses.6 (= ${Binary-Version}),
- libncursesw.6 (= ${Binary-Version}),
- libncurses++.6 (= ${Binary-Version}),
- libncurses++w.6 (= ${Binary-Version}),
- libform.6 (= ${Binary-Version}),
- libformw.6 (= ${Binary-Version}),
- libmenu.6 (= ${Binary-Version}),
- libmenuw.6 (= ${Binary-Version}),
- libpanel.6 (= ${Binary-Version}),
- libpanelw.6 (= ${Binary-Version}),
- libtinfo.6 (= ${Binary-Version}),
- libtic.6 (= ${Binary-Version}),
+ libncurses.6:${Host-Arch} (= ${Binary-Version}),
+ libncursesw.6:${Host-Arch} (= ${Binary-Version}),
+ libncurses++.6:${Host-Arch} (= ${Binary-Version}),
+ libncurses++w.6:${Host-Arch} (= ${Binary-Version}),
+ libform.6:${Host-Arch} (= ${Binary-Version}),
+ libformw.6:${Host-Arch} (= ${Binary-Version}),
+ libmenu.6:${Host-Arch} (= ${Binary-Version}),
+ libmenuw.6:${Host-Arch} (= ${Binary-Version}),
+ libpanel.6:${Host-Arch} (= ${Binary-Version}),
+ libpanelw.6:${Host-Arch} (= ${Binary-Version}),
+ libtinfo.6:${Host-Arch} (= ${Binary-Version}),
+ libtic.6:${Host-Arch} (= ${Binary-Version}),
 # Should conflict with all other available versions:
 Conflicts: libncurses.5-dev
 Description: curses library - development files
diff --git a/libncurses.6.pkg/control b/libncurses.6.pkg/control
index f39ec77..2a89c7f 100644
--- a/libncurses.6.pkg/control
+++ b/libncurses.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncurses.6 (>= 1:1.0)
 Description: curses library
  ${Common-Description}
  .
diff --git a/libncursesw.5-dev.pkg/control b/libncursesw.5-dev.pkg/control
index 60be7a5..779a766 100644
--- a/libncursesw.5-dev.pkg/control
+++ b/libncursesw.5-dev.pkg/control
@@ -1,5 +1,6 @@
 Architecture: all
 Platform: all
+Section: share
 Depends: ncurses-common (= ${Source-Version}),
  libncurses.5-dev (>= ${Source-Version}),
 Description: curses library (legacy ABI) - development files (transitional package)
diff --git a/libncursesw.5.pkg/control b/libncursesw.5.pkg/control
index b820ad2..88cfb98 100644
--- a/libncursesw.5.pkg/control
+++ b/libncursesw.5.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncursesw.5 (>= 1:1.0)
 Description: curses library with wide character support (legacy ABI)
  ${Common-Description}
  .
diff --git a/libncursesw.6.pkg/control b/libncursesw.6.pkg/control
index 77c6f6e..cf3d272 100644
--- a/libncursesw.6.pkg/control
+++ b/libncursesw.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libncursesw.6 (>= 1:1.0)
 Description: curses library with wide character support
  ${Common-Description}
  .
diff --git a/libpanel.6.pkg/control b/libpanel.6.pkg/control
index d255261..798b6da 100644
--- a/libpanel.6.pkg/control
+++ b/libpanel.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libpanel.6 (>= 1:1.0)
 Description: curses panel library
  ${Common-Description}
  .
diff --git a/libpanelw.6.pkg/control b/libpanelw.6.pkg/control
index 09c26fc..7787d4f 100644
--- a/libpanelw.6.pkg/control
+++ b/libpanelw.6.pkg/control
@@ -1,6 +1,8 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
+Pre-Depends: libpanelw.6 (>= 1:1.0)
 Description: curses panel library with wide character support
  ${Common-Description}
  .
diff --git a/libtic.6.pkg/control b/libtic.6.pkg/control
index 93a5464..fbe9dfa 100644
--- a/libtic.6.pkg/control
+++ b/libtic.6.pkg/control
@@ -1,7 +1,9 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}), terminfo-linux [any-linux-any],
  ${Shlib-Depends}
+Pre-Depends: libtic.6 (>= 1:1.0)
 Description: curses terminfo compiler library
  ${Common-Description}
  .
diff --git a/libtinfo-dev.pkg/control b/libtinfo-dev.pkg/control
index d7375c0..00e1077 100644
--- a/libtinfo-dev.pkg/control
+++ b/libtinfo-dev.pkg/control
@@ -1,5 +1,6 @@
 Architecture: all
 Platform: all
+Section: share
 Depends: ncurses-common (= ${Source-Version}),
  libncurses.5-dev (>= ${Source-Version}),
 Description: curses library - development files (transitional package)
diff --git a/libtinfo.5.pkg/control b/libtinfo.5.pkg/control
index 5840de7..9b011d7 100644
--- a/libtinfo.5.pkg/control
+++ b/libtinfo.5.pkg/control
@@ -1,8 +1,10 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}),
  terminfo-linux (>= ${Source-Version}) [any-linux-any],
  ${Shlib-Depends}
+Pre-Depends: libtinfo.5 (>= 1:1.0)
 Description: curses terminfo library (legacy ABI)
  ${Common-Description}
  .
diff --git a/libtinfo.6.pkg/control b/libtinfo.6.pkg/control
index e50b616..d663cdd 100644
--- a/libtinfo.6.pkg/control
+++ b/libtinfo.6.pkg/control
@@ -1,8 +1,10 @@
 Architecture: any
 Platform: all
+Section: lib
 Depends: ncurses-common (= ${Source-Version}),
  terminfo-linux (>= ${Source-Version}) [any-linux-any],
  ${Shlib-Depends}
+Pre-Depends: libtinfo.6 (>= 1:1.0)
 Description: curses terminfo library
  ${Common-Description}
  .
diff --git a/ncurses-bin.pkg/control b/ncurses-bin.pkg/control
index 81cfafe..33c7cef 100644
--- a/ncurses-bin.pkg/control
+++ b/ncurses-bin.pkg/control
@@ -1,5 +1,6 @@
 Architecture: any
 Platform: all
+Section: util
 Depends: ncurses-common (= ${Source-Version}), ${Shlib-Depends}
 Description: curses utilities
  ${Common-Description}
diff --git a/ncurses-common.pkg/control b/ncurses-common.pkg/control
index 44b2435..eac1460 100644
--- a/ncurses-common.pkg/control
+++ b/ncurses-common.pkg/control
@@ -1,5 +1,6 @@
 Architecture: all
 Platform: all
+Section: share
 Description: curses library - common files
  ${Common-Description}
  .
diff --git a/ncurses-dbg.pkg/control b/ncurses-dbg.pkg/control
index 6db42da..b3079a0 100644
--- a/ncurses-dbg.pkg/control
+++ b/ncurses-dbg.pkg/control
@@ -1,17 +1,18 @@
 Architecture: any
 Platform: all
+Section: dbg
 Depends: ncurses-common (= ${Source-Version}),
 Recommends:
- libncurses.5 (= ${Binary-Version}),
- libncursesw.5 (= ${Binary-Version}),
- libncurses++.5 (= ${Binary-Version}),
- libncurses++w.5 (= ${Binary-Version}),
- libtinfo.5 (= ${Binary-Version}),
- libncurses.6 (= ${Binary-Version}),
- libncursesw.6 (= ${Binary-Version}),
- libncurses++.6 (= ${Binary-Version}),
- libncurses++w.6 (= ${Binary-Version}),
- libtinfo.6 (= ${Binary-Version}),
+ libncurses.5:${Host-Arch} (= ${Binary-Version}),
+ libncursesw.5:${Host-Arch} (= ${Binary-Version}),
+ libncurses++.5:${Host-Arch} (= ${Binary-Version}),
+ libncurses++w.5:${Host-Arch} (= ${Binary-Version}),
+ libtinfo.5:${Host-Arch} (= ${Binary-Version}),
+ libncurses.6:${Host-Arch} (= ${Binary-Version}),
+ libncursesw.6:${Host-Arch} (= ${Binary-Version}),
+ libncurses++.6:${Host-Arch} (= ${Binary-Version}),
+ libncurses++w.6:${Host-Arch} (= ${Binary-Version}),
+ libtinfo.6:${Host-Arch} (= ${Binary-Version}),
  ncurses-bin (= ${Binary-Version}),
 Description: curses library - debugging symbols
  ${Common-Description}
diff --git a/terminfo-linux.pkg/control b/terminfo-linux.pkg/control
index 3656708..5961d15 100644
--- a/terminfo-linux.pkg/control
+++ b/terminfo-linux.pkg/control
@@ -1,5 +1,6 @@
 Architecture: all
 Platform: all
+Section: share
 Depends: ncurses-common (= ${Source-Version})
 Description: Linux terminal type definition
  ${Common-Description}
diff --git a/terminfo.pkg/control b/terminfo.pkg/control
index de7345c..3307ecb 100644
--- a/terminfo.pkg/control
+++ b/terminfo.pkg/control
@@ -1,5 +1,6 @@
 Architecture: all
 Platform: all
+Section: share
 Depends: ncurses-common (= ${Source-Version})
 Description: Terminal type definitions
  ${Common-Description}