3 files changed, 93 insertions, 5 deletions
diff --git a/equivs/.gitignore b/equivs/.gitignore
new file mode 100644
index 0000000..54fccd6
--- /dev/null
+++ b/equivs/.gitignore
@@ -0,0 +1,5 @@
+*
+! rak-meta/debian/control
+! rak-meta/debian/copyright
+! rak-meta/debian/rules
+! rak-meta/debian/source
diff --git a/equivs/rak-meta/debian/changelog b/equivs/rak-meta/debian/changelog
index ff5bcbb..a829bd8 100644
--- a/equivs/rak-meta/debian/changelog
+++ b/equivs/rak-meta/debian/changelog
@@ -1,3 +1,64 @@
+rak-meta (0.22) unstable; urgency=medium
+
+  * git merge
+
+ -- Ryan Kavanagh <rak@debian.org>  Thu, 08 May 2025 16:37:18 -0400
+
+rak-meta (0.21-koios) unstable; urgency=medium
+
+  * rak-sysadmin: systemd-resolved dropped by Debian, use resolvconf instead
+
+ -- Ryan Kavanagh <rak@debian.org>  Mon, 31 Mar 2025 13:46:25 -0400
+
+rak-meta (0.21-asteria) unstable; urgency=medium
+
+  * rak-rlang: R packages 
+  * bunch of other manual packages now auto
+
+ -- Ryan Kavanagh <rak@debian.org>  Sat, 08 Mar 2025 12:21:28 -0500
+
+rak-meta (0.20) unstable; urgency=medium
+
+  * rak-textproc: zathura used by auctex for pdf viewing
+
+ -- Ryan Kavanagh <rak@debian.org>  Thu, 13 Feb 2025 14:54:52 -0500
+
+rak-meta (0.19) unstable; urgency=medium
+
+  * rak-sway: python3-dbsu-next is a dependency of assign-cgroups.py
+
+ -- Ryan Kavanagh <rak@debian.org>  Tue, 14 Jan 2025 10:39:04 -0500
+
+rak-meta (0.18) unstable; urgency=medium
+
+  * rak-sysadmin: block installation of ppp and network-manager
+
+ -- Ryan Kavanagh <rak@debian.org>  Thu, 26 Dec 2024 18:09:28 -0500
+
+rak-meta (0.17) unstable; urgency=medium
+
+  * rak-multimedia: block installation of fluidsynth 
+
+ -- Ryan Kavanagh <rak@debian.org>  Thu, 26 Dec 2024 17:16:23 -0500
+
+rak-meta (0.16) unstable; urgency=medium
+
+  * rak-sway: swaysome now packaged 
+
+ -- Ryan Kavanagh <rak@debian.org>  Tue, 24 Dec 2024 18:07:30 -0500
+
+rak-meta (0.15) unstable; urgency=medium
+
+  * rak-sysadmin: drop sleepd, no longer exists‽
+
+ -- Ryan Kavanagh <rak@debian.org>  Tue, 24 Dec 2024 17:55:04 -0500
+
+rak-meta (0.14) unstable; urgency=medium
+
+  * rak-mail: add isync 
+
+ -- Ryan Kavanagh <rak@debian.org>  Tue, 24 Dec 2024 17:33:03 -0500
+
 rak-meta (0.13) unstable; urgency=medium
 
   * rak-mail: add mu4e/msmtp/libsasl2-modules-kdexoauth2 to rak-mail
diff --git a/equivs/rak-meta/debian/control b/equivs/rak-meta/debian/control
index fdc36f2..c6eb5a1 100644
--- a/equivs/rak-meta/debian/control
+++ b/equivs/rak-meta/debian/control
@@ -47,6 +47,7 @@ Recommends:
  ocaml,
  opam,
  polyml,
+ rak-rlang,
  rustc,
  smlnj,
  ${misc:Depends},
@@ -55,15 +56,16 @@ Architecture: all
 
 Package: rak-debian
 Depends:
+ dh-golang,
+ dh-python,
  build-essential,
  debcargo,
  devscripts,
- dh-golang,
- dh-python,
  dput-ng | dput,
  equivs,
  git-buildpackage,
  libsoap-lite-perl,
+ piuparts,
  reportbug,
  sbuild-debian-developer-setup,
  signing-party,
@@ -142,6 +144,7 @@ Architecture: all
 
 Package: rak-mail
 Depends:
+ isync,
  lbdb,
  libsasl2-modules-kdexoauth2,
  msmtp,
@@ -149,7 +152,7 @@ Depends:
  muttprint,
  neomutt,
  opensmtpd,
- opensmtpd-extras,
+ opensmtpd-table-passwd,
  s-nail,
  sieve-connect,
  urlscan,
@@ -177,6 +180,8 @@ Depends:
  whipper,
  yt-dlp,
  ${misc:Depends},
+Conflicts:
+ fluidsynth,
 Description: rak - multimedia
 Architecture: all
 
@@ -202,6 +207,17 @@ Depends:
 Description: rak - hamradio
 Architecture: all
 
+Package: rak-rlang
+Depends:
+ r-base,
+ r-cran-dplyr,
+ r-cran-ggplot2,
+ r-cran-purrr,
+ r-cran-tibble,
+ ${misc:Depends},
+Description: rak - R packages
+Architecture: all
+
 Package: rak-shell
 Depends:
  antiword,
@@ -260,11 +276,13 @@ Depends:
  jq,
  kanshi,
  light,
+ python3-dbus-next,
  seatd,
  slurp,
  sway,
  swayidle,
  swaylock,
+ swaysome,
  waybar,
  wdisplays,
  wlgreet,
@@ -301,11 +319,10 @@ Depends:
  pmount,
  rfkill,
  sanoid,
- sleepd,
  smartmontools,
  sshfs,
  sudo,
- systemd-resolved,
+ systemd-resolved | resolvconf,
  systemd-timesyncd,
  task-ssh-server,
  tlp,
@@ -316,6 +333,9 @@ Depends:
  zfs-initramfs,
  zfsutils-linux,
  ${misc:Depends},
+Conflicts:
+ network-manager,
+ ppp,
 Description: rak - system administration packages
 Architecture: all
 
@@ -330,6 +350,7 @@ Architecture: amd64
 Package: rak-textproc
 Depends:
  asciidoctor,
+ auto-multiple-choice,
  biber,
  bibtool,
  docx2txt,
@@ -362,6 +383,7 @@ Depends:
  texlive-xetex,
  tikzit,
  ttf-mscorefonts-installer,
+ zathura,
  ${misc:Depends},
 Recommends:
  rak-dicts,