Merging debian version 20211009-29.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 28 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index 66c7a2e..6409cc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+bfh-metapackages (20211009-29) sid; urgency=medium
+
+  * Uploading to sid.
+  * Moving from knot-resolver to systemd-resolved.
+  * Removing repends to inkscape-symbols in bfh-desktop depends.
+  * Re-including thunderbird on i386 in bfh-desktop depends.
+  * Removing virtualbox-qt in bfh-desktop suggests.
+  * Adding pavucontrol in bfh-gnome-desktop depends.
+  * Moving gnome-shell-extensions-extra from bfh-gnome-desktop suggests to
+    depends.
+  * Adding vim-nftables to bfh-base-system suggests.
+  * Removing plymouth from bfh-base-system depends.
+  * Adding intel firmware packages to bfh-host suggests.
+  * Wrap and sorting control file.
+
+ -- Daniel Baumann <daniel.baumann@progress-linux.org>  Fri, 04 Oct 2024 09:41:42 +0200
+
 bfh-metapackages (20211009-28~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 1935665..84e7c5c 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Depends:
  needrestart,
 # knot
  knot-dnsutils,
- knot-dnssecutils,
  knot-host,
 # ldap
  sssd,
@@ -45,6 +44,7 @@ Depends:
  zutils,
 # systemd
  libpam-systemd,
+ systemd-resolved,
  systemd-oomd,
 # other
  acl,
@@ -76,12 +76,8 @@ Depends:
  wget,
  whois,
  zstd,
-Conflicts:
- resolvconf,
-Recommends:
-# knot-resolver
- knot-resolver [amd64 arm64 armhf armel i386],
- socat,
+Suggests:
+ vim-nftables,
 Description: BFH - Base System Metapackage
  Bern University of Applied Sciences (BFH) provides Debian-based images and
  systems to its users and everyone else interested in the form of a Debian
@@ -124,16 +120,13 @@ Depends:
 # cryptsetup
  cryptsetup-bin,
  keyutils,
- plymouth,
 # firmware-free
  firmware-linux-free,
-# knot-resolver
- knot-resolver [amd64 arm64 armhf armel i386],
- socat,
 # monitoring
  spectre-meltdown-checker,
 # other
- dmidecode [amd64 arm64 armhf i386],
+ console-setup,
+ dmidecode [amd64 arm64],
  ethtool,
  gpm,
  hdparm,
@@ -155,6 +148,8 @@ Suggests:
  intel-microcode,
 # other (third-party)
  supermicro-ipmicfg,
+ intel-x710-firmware,
+ intel-e810-firmware,
 Enhances:
  bfh-base-system,
 Description: BFH - Host Metapackage
@@ -193,7 +188,6 @@ Depends:
  gimp-plugin-registry,
 # inkscape
  inkscape,
- inkscape-open-symbols,
 # liferea
  liferea,
  gir1.2-gstreamer-1.0,
@@ -202,7 +196,7 @@ Depends:
  network-manager-config-connectivity-debian,
  network-manager-ssh,
 # thunderbird
- thunderbird [amd64 arm64 i386],
+ thunderbird [amd64 arm64],
 # zip
  unzip,
  zip,
@@ -217,7 +211,6 @@ Suggests:
  virtualbox,
  virtualbox-dkms,
  virtualbox-ext-pack,
- virtualbox-qt,
 Enhances:
  bfh-base-system,
 Description: BFH - Desktop Metapackage
@@ -234,14 +227,15 @@ Depends:
  ${misc:Depends},
  bfh-desktop,
  task-gnome-desktop,
+# gnome
+ pavucontrol,
 # gnome-shell-extensions
+ gnome-shell-extensions-extra,
  gnome-shell-extension-impatience,
 # nautilus
  nautilus-admin,
 # network-manager
  network-manager-ssh-gnome,
-Suggests:
- gnome-shell-extensions-extra,
 Enhances:
  bfh-base-system,
  bfh-desktop,