Fix: update package list for Debian bookworm

diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp
index 936a21fa3c8d616acc590f13eca094ad3ef5f72d..2f6309454d186912601f73799aa53330f6ea7b7a 100644 (file)
--- a/manifests/base/physical.pp
+++ b/manifests/base/physical.pp
@@ -5,7 +5,19 @@ class nodo::base::physical inherits nodo::base::host {
     class { 'smartmontools': }
   }
 
-  package { [ 'lm-sensors', 'hddtemp' ]:
+  package { [ 'lm-sensors', ]:
     ensure => present,
   }
+
+  # Deprecated
+  package { [
+    'hddtemp',
+  ]:
+    ensure => $::lsbdistcodename ? {
+      'wheezy'   => present,
+      'buster'   => present,
+      'bullseye' => present,
+      default  => absent,
+    }
+  }
 }

diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp
index 05d16b89da7d1d5282aa9114adb642bc09bc875a..4f0831b14df5a4df16b2ea3cc49dfd541848a61e 100644 (file)
--- a/manifests/utils/development/debian.pp
+++ b/manifests/utils/development/debian.pp
@@ -16,7 +16,6 @@ class nodo::utils::development::debian (
     'build-essential',
     'dh-buildinfo',
     'quilt',
-    'dpatch',
     'dput',
     'debian-goodies',
     'gem2deb',
@@ -34,4 +33,16 @@ class nodo::utils::development::debian (
   ]:
     ensure => $ensure,
   }
+
+  # Deprecated
+  package { [
+    'dpatch',
+  ]:
+    ensure => $::lsbdistcodename ? {
+      'wheezy'   => present,
+      'buster'   => present,
+      'bullseye' => present,
+      default  => absent,
+    }
+  }
 }

diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp
index 996d457b3e3fb141192b3fbc78a921fb88156fe6..57d6e46d0d1f1e3cb035b6c242799de92b537f30 100644 (file)
--- a/manifests/utils/office/console.pp
+++ b/manifests/utils/office/console.pp
@@ -2,7 +2,7 @@ class nodo::utils::office::console (
   $ensure = 'installed',
 ) {
   package { [
-    'vim-gtk',
+    'vim-gtk3',
     'neovim',
     'wyrd',
     'sc',
@@ -21,4 +21,20 @@ class nodo::utils::office::console (
   ]:
     ensure => $ensure,
   }
+
+  # Deprecated
+  package { [
+    'pandoc-citeproc',
+  ]:
+    ensure => $::lsbdistcodename ? {
+      'wheezy'   => present,
+      'buster'   => present,
+      'bullseye' => present,
+      # Instead of removing this package, we'll let it stay
+      # for now on systems that were upgraded from previous
+      # Debian versions
+      #default => absent,
+      default  => undef,
+    }
+  }
 }

diff --git a/manifests/utils/virtual.pp b/manifests/utils/virtual.pp
index 294406054bab57385326a4eef4568e26580d90a3..f58ac057c45a6a11772bb42f4ea847a7e2940f02 100644 (file)
--- a/manifests/utils/virtual.pp
+++ b/manifests/utils/virtual.pp
@@ -3,9 +3,8 @@ class nodo::utils::virtual (
 ) {
   package { [
     # For running virtual machines
-    'qemu',
-    #'qemu-kvm',
-    'qemu-system-x86',
+    'qemu-kvm',
+    #'qemu-system-x86',
     'libguestfs-tools',
     #'virtualbox-guest-additions-iso',