Merge remote-tracking branch 'origin/pr/585'

* origin/pr/585:
  debian: sort dependencies alphabetically
  arch: sort dependencies alphabetically

Pull request description:

Make the archlinux and debian specs more maintainable by consistently sorting dependency lists alphabetically.

Includes #584

Author: marmarek

archlinux/PKGBUILD.in

@@ -10,17 +10,18 @@ license=('GPL-2.0-or-later')
 makedepends=(
     gcc
     make
-    pkg-config
+
+    desktop-file-utils
     libx11
-    python
-    python-setuptools
     lsb-release
     pandoc
+    pkg-config
+    python
+    python-setuptools
     shared-mime-info
-    desktop-file-utils
-    qubes-vm-utils
-    qubes-libvchan
     qubes-db-vm
+    qubes-libvchan
+    qubes-vm-utils
     qubes-vm-xen
 )
 _pkgnvr="${pkgname}-${pkgver}-${pkgrel}"
@@ -56,35 +57,42 @@ package_qubes-vm-core() {
     conflicts=('pulseaudio-qubes<4.2.0')
     release=${BASH_REMATCH[1]}.${BASH_REMATCH[2]}
     depends=(
-        qubes-vm-utils
-        qubes-libvchan
-        qubes-db-vm
-        'qubes-vm-qrexec>=4.2.19'
-        python
-        python-xdg
-        ntp
-        iproute2
+        dconf
+        fakeroot
+        gawk
         gnome-packagekit
         graphicsmagick
-        fakeroot
-        notification-daemon
-        dconf
-        zenity
         haveged
-        python-gobject
-        python-dbus
-        xdg-utils
-        gawk
-        sed
-        procps-ng
+        iproute2
         librsvg
-        socat
+        notification-daemon
+        ntp
         pacman-contrib
         parted
+        procps-ng
         # Block updating if there is a major python update as the python API will be in the wrong PYTHONPATH
         'python<3.14'
+        python-dbus
+        python-gobject
+        python-xdg
+        qubes-db-vm
+        qubes-libvchan
+        'qubes-vm-qrexec>=4.2.19'
+        qubes-vm-utils
+        sed
+        socat
+        xdg-utils
+        zenity
+    )
+    optdepends=(
+        gnome-keyring
+        gnome-settings-daemon
+        gpk-update-viewer
+        python-caja
+        python-nautilus
+        qubes-vm-keyring
+        qubes-vm-networking
     )
-    optdepends=(gnome-keyring gnome-settings-daemon python-caja python-nautilus gpk-update-viewer qubes-vm-networking qubes-vm-keyring)
     install="archlinux/PKGBUILD.install"
 
     cd "${_pkgnvr}"
@@ -154,16 +162,16 @@ EOF
 package_qubes-vm-networking() {
     pkgdesc="Qubes OS tools allowing to use a Qubes VM as a NetVM/ProxyVM"
     depends=(
-        qubes-vm-core
-        qubes-vm-utils
-        qubes-db-vm
-        python
+        conntrack-tools
         iproute2
         networkmanager
         network-manager-applet
-        tinyproxy
         nftables
-        conntrack-tools
+        python
+        qubes-db-vm
+        qubes-vm-core
+        qubes-vm-utils
+        tinyproxy
     )
     install="archlinux/PKGBUILD-networking.install"
 
@@ -216,10 +224,10 @@ package_qubes-vm-passwordless-root() {
 package_qubes-vm-dom0-updates() {
     pkgdesc="Qubes OS tools for fetching dom0 updates"
     depends=(
+        dnf5
+        python
         qubes-vm-core
         qubes-vm-networking
-        python
-        dnf5
     )
 
     cd "${_pkgnvr}"

debian/control

@@ -3,23 +3,23 @@ Section: admin
 Priority: extra
 Maintainer: unman <unman@thirdeyesecurity.org>
 Build-Depends:
+    config-package-dev,
     debhelper,
+    desktop-file-utils,
+    dh-python,
     libpam0g-dev,
     libqubes-pure-dev (>= 4.3.2),
     libqubes-rpc-filecopy-dev (>= 4.3.2),
     libvchan-xen-dev,
-    python3,
-    python3-setuptools,
-    quilt,
     libxen-dev,
-    pkg-config,
-    dh-python,
     lsb-release,
-    xserver-xorg-dev,
-    config-package-dev,
     pandoc,
+    pkg-config,
+    python3,
+    python3-setuptools,
+    quilt,
     shared-mime-info,
-    desktop-file-utils,
+    xserver-xorg-dev,
 Standards-Version: 4.4.0.1
 Homepage: https://www.qubes-os.org
 Vcs-Git: https://github.com/QubesOS/qubes-core-agent-linux
@@ -29,36 +29,36 @@ Architecture: any
 Depends:
     apt-transport-https,
     dconf-cli,
-    dmsetup,
     distro-info-data,
+    dmsetup,
+    e2fsprogs,
     gawk,
     graphicsmagick,
     init-system-helpers,
     initscripts | sysvinit-utils,
     librsvg2-bin,
     locales,
     ncurses-term,
-    psmisc,
-    procps,
-    util-linux,
-    e2fsprogs,
     parted,
-    python3-qubesdb,
+    procps,
+    psmisc,
+    python3-dbus,
     python3-gi,
+    python3-qubesdb,
     python3-xdg,
-    python3-dbus,
-    qubes-utils (>= 3.1.3),
     qubes-core-qrexec (>= 4.2.19),
+    qubes-utils (>= 3.1.3),
     qubesdb-vm,
     systemd,
+    util-linux,
     xdg-user-dirs,
     xdg-utils,
+    xenstore-utils,
     xen-utils-common,
     xen-utils-guest,
-    xenstore-utils,
     ${python3:Depends},
     ${shlibs:Depends},
-    ${misc:Depends}
+    ${misc:Depends},
 Recommends:
     cups,
     gnome-terminal,
@@ -68,20 +68,20 @@ Recommends:
     locales-all,
     mate-notification-daemon,
     ntpdate,
-    system-config-printer,
     qubes-core-agent-nautilus,
     qubes-core-agent-networking,
     qubes-core-agent-network-manager,
+    system-config-printer,
     x11-xserver-utils,
     xinit,
     xserver-xorg-core,
     xsettingsd,
-    xterm
+    xterm,
 Conflicts:
+    pulseaudio-qubes (<< 4.2.0-1),
     qubes-core-agent-linux,
     qubes-core-vm-sysvinit,
     qubes-gui-agent (<< 4.1.6-1),
-    pulseaudio-qubes (<< 4.2.0-1),
 Description: Qubes core agent
  This package includes various daemons necessary for qubes domU support,
  such as qrexec services.
@@ -119,13 +119,13 @@ Description: Qubes integration for Thunar
 Package: qubes-core-agent-dom0-updates
 Architecture: any
 Depends:
-    fakeroot,
-    rpm,
+    curl,
     dnf | yum,
     dnf | yum-utils,
-    curl,
+    fakeroot,
     qubes-core-qrexec,
     qubes-repo-templates,
+    rpm,
 Replaces: qubes-core-agent (<< 4.1.28-1)
 Breaks: qubes-core-agent (<< 4.1.28-1)
 Description: Scripts required to handle dom0 updates.
@@ -142,7 +142,7 @@ Depends:
     tinyproxy,
     iproute2,
     ${python3:Depends},
-    ${misc:Depends}
+    ${misc:Depends},
 Replaces: qubes-core-agent (<< 4.0.0-1)
 Breaks: qubes-core-agent (<< 4.0.0-1)
 Description: Networking support for Qubes VM