Dependency improvements.

Author: dreibh

CMakeLists.txt

@@ -21,7 +21,7 @@ PROJECT(nornet LANGUAGES C)
 
 SET(BUILD_MAJOR "1")
 SET(BUILD_MINOR "5")
-SET(BUILD_PATCH "27~rc3")
+SET(BUILD_PATCH "27~rc3.2")
 SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH})
 
 

debian/changelog

@@ -1,8 +1,8 @@
-nornet (1.5.27~rc3-1ubuntu1) questing; urgency=medium
+nornet (1.5.27~rc3.2-1ubuntu1) resolute; urgency=medium
 
   * New upstream release.
 
- -- Thomas Dreibholz <dreibh@simula.no>  Mon, 24 Nov 2025 12:27:44 +0100
+ -- Thomas Dreibholz <dreibh@simula.no>  Thu, 27 Nov 2025 09:02:33 +0100
 
 nornet (1.5.26-1ubuntu1) questing; urgency=medium
 

debian/control

@@ -24,73 +24,64 @@ Rules-Requires-Root: no
 
 Package: nornet-management
 Architecture: all
-Depends: anacron,
+Depends: acl,
          apt-file,
-         apt-show-versions,
-         autofs,
+         bash,
          bash-completion,
-         bc,
          bridge-utils,
-         btrfs-progs | btrfs-tools,
          bwm-ng,
-         colordiff,
-         cron,
-         cron-apt,
+         bzip2,
+         chrpath,
+         cloud-guest-utils,
          curl,
-         eatmydata,
+         dnsutils,
          ethtool,
          fail2ban,
-         gawk,
+         gdisk,
          git,
+         gnupg,
          gpm,
          htop,
          idn,
-         ifupdown,
-         inotify-tools,
+         iproute2,
+         iptables,
+         iputils-ping,
          joe,
          jq,
-         libfile-fcntllock-perl,
-         lksctp-tools,
+         less,
          make,
-         mlocate | plocate,
+         man,
          net-tools,
          netperfmeter,
          nmap,
-         pigz,
+         openssh-server,
+         openssl,
+         parallel,
          pwgen,
          python3,
+         qt6-linguist | qtbase5-dev,
+         qt6-qtbase-devel | qtbase5-dev,
          rsplib-tools,
-         smartmontools,
-         snmp,
-         software-properties-common,
+         rsync,
          subnetcalc,
+         sudo,
          tcpdump,
-         td-system-configure-grub  (>= 1.1.1),
-         td-system-info (>= 1.1.1),
-         td-system-maintenance (>= 1.1.1),
-         tftp | tftp-hpa,
          traceroute,
          tree,
+         tsctp,
+         tshark,
+         unzip,
+         uuid,
          virt-what,
-         vlan,
-         whois,
-         xmlstarlet,
-         xz-utils (>= 5.2.0) | pxz,
-         yamllint,
+         wget,
+         zip,
          ${misc:Depends}
-Recommends: apport-retrace,
-            grub2-common,
-            ipsec-tools,
+Recommends: grub2-common,
             language-pack-de-base,
             language-pack-en-base,
             language-pack-nb-base,
-            reiserfsprogs,
-            tshark
-Conflicts: landscape-common,
-           minidlna,
-           tntnet,
-           webfs
-Replaces: landscape-common
+            td-system-configure-grub,
+            td-system-tools
 Description: Management tools for the NorNet system environment
  This metapackage contains basic software nor NorNet node management. The
  software installed provides a common working environment.
@@ -119,51 +110,54 @@ Depends: autoconf,
          automake,
          bc,
          bison,
+         build-essential,
          clang,
-         cmake (>= 3.3) | cmake3,
+         cmake,
          debhelper,
-         debian-archive-keyring,
-         debian-ports-archive-keyring,
          devscripts,
+         distro-info,
+         dpkg-dev,
+         extra-cmake-modules,
          flex,
          fonts-dejavu,
-         fonts-noto-cjk,
-         fonts-noto-hinted,
+         fonts-noto,
+         fonts-open-sans,
+         fonts-urw-base35,
          g++,
          gcc,
          gdb,
          ghostscript,
-         gnupg,
+         git-lfs,
          graphicsmagick,
          gsfonts,
          libboost-all-dev,
          libbz2-dev,
-         libcpprspserver-dev,
-         libglib2.0-dev,
+         libc-ares-dev,
+         libcurl4-openssl-dev,
+         libgeoip-dev,
          libimage-exiftool-perl,
-         libpcap-dev,
-         librsplib-dev,
+         liblzma-dev,
          libsctp-dev,
-         libtool,
+         libssl-dev,
          manpages-dev,
-         nornet-management,
          pbuilder,
-         python3-all,
+         pdf2svg,
+         pkg-config,
+         python3-distro,
+         python3-netifaces,
          python3-pip,
-         python3-psycopg2,
-         python3-pymongo,
-         qemu-user-static,
-         quilt,
          r-base,
-         r-cran-ggplot2,
-         r-cran-hmisc,
          reprepro,
-         rpm,
-         sysvbanner,
-         valgrind,
-         xmlstarlet,
+         shellcheck,
+         simulamet-management (= ${binary:Version}),
+         tidy,
+         zlib1g-dev,
          ${misc:Depends}
-Recommends: ubuntu-dev-tools
+Recommends: qt6-base-dev,
+            qt6-l10n-tools,
+            ubuntu-dev-tools,
+            valgrind,
+            yamllint
 Description: Development tools for the NorNet system environment
  This metapackage contains basic software nor NorNet development. The
  software installed provides a common working environment.

rpm/nornet.spec

@@ -1,5 +1,5 @@
 Name: nornet
-Version: 1.5.27~rc3
+Version: 1.5.27~rc3.2
 Release: 1
 Summary: NorNet Control
 Group: Applications/Internet
@@ -73,56 +73,64 @@ mv %{buildroot}/usr/share/nornet-desktop/Splash/nornet-version %{buildroot}/etc/
 Summary: Management tools for the NorNet system environment
 Group: Applications/Internet
 BuildArch: noarch
+Requires: acl
+Requires: bash
 Requires: bash-completion
-Requires: bc
+Requires: bind-utils
 Requires: bridge-utils
-Requires: btrfs-progs
 Requires: bwm-ng
-Requires: colordiff
-Requires: cronie
+Requires: bzip2
+Requires: chrpath
+Requires: cloud-utils-growpart
+Requires: cmake
 Requires: curl
+Requires: dnf-automatic
 Requires: ethtool
 Requires: fail2ban
-Requires: gawk
-Requires: gcc
-Requires: gcc-c++
+Requires: gdisk
 Requires: git
+Requires: gpg
 Requires: gpm
-Requires: hping3
+Requires: hipercontracer
 Requires: htop
-Requires: inotify-tools
+Requires: iproute
+Requires: iproute-tc
+Requires: iptables
+Requires: iputils
 Requires: joe
 Requires: jq
+Requires: kernel-modules-extra
 Requires: libidn
-Requires: lksctp-tools
-Requires: (mlocate or plocate)
+Requires: make
+Requires: man
 Requires: netperfmeter
-Requires: net-snmp-utils
+Requires: netplan
 Requires: net-tools
 Requires: nmap
-Requires: pigz
+Requires: openssh-server
+Requires: openssl
+Requires: parallel
+Requires: plocate
 Requires: pwgen
-Requires: pxz
-Requires: rsplib-docs
-Requires: rsplib-services
+Requires: python3
 Requires: rsplib-tools
-Requires: smartmontools
+Requires: rsync
 Requires: subnetcalc
-Requires: td-system-tools-system-info >= 1.1.1
-Requires: td-system-tools-system-maintenance >= 1.1.1
-Requires: td-system-tools-configure-grub >= 1.1.1
+Requires: sudo
+Requires: tar
 Requires: tcpdump
-Requires: tftp
+Requires: td-system-tools
+Requires: td-system-tools-configure-grub
 Requires: traceroute
 Requires: tree
-Requires: vconfig
+Requires: tsctp
+Requires: unzip
+Requires: uuid
 Requires: virt-what
-Requires: whois
+Requires: wget
 Requires: wireshark-cli
-Requires: xmlstarlet
-Requires: yamllint
+Requires: zip
 Recommends: grub2-tools
-Recommends: ipsec-tools
 
 %description management
 This metapackage contains basic software nor NorNet node management. The
@@ -226,51 +234,52 @@ BuildArch: noarch
 Requires: %{name}-management = %{version}-%{release}
 Requires: autoconf
 Requires: automake
-Requires: banner
+Requires: bc
 Requires: bison
+Requires: boost-devel
 Requires: bzip2-devel
+Requires: c-ares-devel
 Requires: clang
 Requires: cmake
-Requires: (createrepo_c or createrepo)
-Requires: debhelper
-Requires: dejavu-sans-fonts
-Requires: dejavu-sans-mono-fonts
-Requires: dejavu-serif-fonts
-Requires: devscripts
+Requires: dejavu-fonts-all
+Requires: extra-cmake-modules
 Requires: flex
+Requires: g++
 Requires: gcc
-Requires: gcc-c++
 Requires: gdb
+Requires: GeoIP-devel
 Requires: ghostscript
-Requires: gimp
-Requires: glib2-devel
-Requires: gnupg
-Requires: google-noto-cjk-fonts
-Requires: google-noto-sans-fonts
-Requires: google-noto-serif-fonts
+Requires: git-lfs
+Requires: google-noto-fonts-all
 Requires: GraphicsMagick
 Requires: libcurl-devel
-Requires: libpcap-devel
 Requires: libtool
 Requires: lksctp-tools-devel
-Requires: make
 Requires: mock
+Requires: open-sans-fonts
 Requires: openssl-devel
 Requires: pbuilder
+Requires: pdf2svg
 Requires: perl-Image-ExifTool
+Requires: pkg-config
 Requires: python3
+Requires: python3-netifaces
 Requires: python3-pip
-Requires: python3-psycopg2
-Requires: python3-pymongo
 Requires: python3-setuptools
-Requires: qemu-user-static
-Requires: quilt
+Requires: qt6-linguist
+Requires: qt6-qtbase-devel
 Requires: R-base
 Requires: reprepro
-Requires: rpm
-Requires: texlive-epstopdf-bin
+Requires: rpm-build
+Requires: rsplib-libcpprspserver-devel
+Requires: rsplib-librsplib-devel
+Requires: shellcheck
+Requires: tidy
 Requires: urw-base35-fonts
-Requires: valgrind
+Requires: xz-devel
+Requires: zlib-devel
+Recommends: valgrind
+Recommends: yamllint
 
 %description development
 This metapackage contains basic software nor NorNet development. The