Update distro-info.sh to include new Ubuntu 24.04, Debian Trixie, and…

… Fedora 40. (#133)

.github/workflows/canary.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Clone repo
         uses: actions/checkout@v3
       - name: Install deps
-        run: apt-get update && apt-get install -y gnome-common libnautilus-extension-dev libgtk-4-dev python3-gi python3-docutils
+        run: ./install-apt-deps.sh
       - name: Test build
         run: ./autogen.sh && make && make install
       - name: Run tests
@@ -35,7 +35,7 @@ jobs:
       - name: Clone repo
         uses: actions/checkout@v3
       - name: Install deps
-        run: apt-get update && apt-get install -y gnome-common libnautilus-extension-dev libgtk-4-dev python3-gi python3-docutils
+        run: ./install-apt-deps.sh
       - name: Test build
         run: ./autogen.sh && make && make install
       - name: Run tests
@@ -54,7 +54,7 @@ jobs:
       - name: Clone repo
         uses: actions/checkout@v3
       - name: Install deps
-        run: dnf install -y gnome-common nautilus-devel gtk4-devel python3-docutils python3-gobject
+        run: ./install-rpm-deps.sh
       - name: Test build
         run: ./autogen.sh && make && make install
       - name: Run tests

Dockerfile.debian

@@ -2,4 +2,4 @@ FROM debian:bookworm
 
 COPY install-apt-deps.sh .
 RUN ./install-apt-deps.sh
-WORKDIR /src
+WORKDIR /src

Dockerfile.debian_i386

@@ -2,4 +2,4 @@ FROM i386/debian:bookworm
 
 COPY install-apt-deps.sh .
 RUN ./install-apt-deps.sh
-WORKDIR /src
+WORKDIR /src

Dockerfile.fedora

@@ -1,5 +1,6 @@
-FROM fedora:37
+# Leading edge release.
+FROM fedora:latest
 
 COPY install-rpm-deps.sh .
 RUN ./install-rpm-deps.sh
-WORKDIR /src
+WORKDIR /src

Dockerfile.ubuntu

@@ -1,5 +1,8 @@
-FROM ubuntu:kinetic
+# TODO: update this to 24.04 once it's released. Ideally this should _always_
+# be the latest LTS release, but an interim release is used here because Jammy
+# doesn't have the minimum version of GNOME necessary to build the extension.
+FROM ubuntu:mantic
 
 COPY install-apt-deps.sh .
 RUN ./install-apt-deps.sh
-WORKDIR /src
+WORKDIR /src

build_packages.sh

@@ -18,4 +18,4 @@ docker run -u "$(id -u):$(id -g)" -v `pwd`:/src nautilus-dropbox/fedora ./genera
 make dropbox dist
 mkdir -p build/packages
 cp dropbox build/packages/dropbox.py
-cp nautilus-dropbox-*.tar.bz2 build/packages/
+cp nautilus-dropbox-*.tar.bz2 build/packages/

distro-info.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 # This file also gets execfile'd by python so don't do anything here besides set variables.
-UBUNTU_CODENAMES="kinetic lunar mantic"
-DEBIAN_CODENAMES="bookworm sid"
-FEDORA_CODENAMES="37 38 39"
+UBUNTU_CODENAMES="kinetic lunar mantic noble"
+DEBIAN_CODENAMES="bookworm trixie sid"
+FEDORA_CODENAMES="37 38 39 40"

install-apt-deps.sh

@@ -2,4 +2,4 @@
 
 apt-get update
 apt-get install -y gnome-common libgtk-4-dev libnautilus-extension-dev python3-gi python3-docutils \
-    debootstrap devscripts libnautilus-extension-dev cdbs debian-archive-keyring
+    debootstrap devscripts libnautilus-extension-dev cdbs debian-archive-keyring debhelper