debian/changelog

@@ -2,13 +2,13 @@ dangerzone (0.8.1-2) unstable; urgency=low
 
   * Released Trixie patch for Dangerzone 0.8.1
 
- -- Freedom of the Press Foundation   <info@freedom.press>  Tue, 4 Feb 2025 23:03:28 +0300
+ -- Freedom of the Press Foundation   <info@freedom.press>  Tue, 4 February 2025 23:03:28 +0300
 
 dangerzone (0.8.1) unstable; urgency=low
 
   * Released Dangerzone 0.8.1
 
- -- Freedom of the Press Foundation   <info@freedom.press>  Tue, 22 Dec 2024 22:03:28 +0300
+ -- Freedom of the Press Foundation   <info@freedom.press>  Tue, 22 December 2024 22:03:28 +0300
 
 dangerzone (0.8.0) unstable; urgency=low
 

debian/source/format

@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)

install/linux/build-deb.py

@@ -21,6 +21,22 @@ def run(cmd):
 
 
 def main():
+    parser = argparse.ArgumentParser(
+        prog=sys.argv[0],
+        description="Dev script for building Dangerzone debs",
+    )
+    # FIXME: The name of the distro is important, as it can help users who are upgrading
+    # from a distro version to another. If we *do* need to provide a name at some point,
+    # here's a suggestion on how we should tackle naming:
+    #
+    # https://github.com/freedomofpress/dangerzone/pull/322#issuecomment-1428665162
+    parser.add_argument(
+        "--distro",
+        required=False,
+        help="The name of the Debian-based distro",
+    )
+    args = parser.parse_args()
+
     dist_path = root / "dist"
     deb_dist_path = root / "deb_dist"
 
@@ -30,15 +46,28 @@ def main():
     if os.path.exists(deb_dist_path):
         shutil.rmtree(deb_dist_path)
 
-    print("* Building binary-only DEB package")
+    print("* Building DEB package")
-    run(["dpkg-buildpackage", "-b"])
+    if args.distro is None:
+        deb_ver = "1"
+    else:
+        deb_ver = args.distro
+
+    run(
+        [
+            "dpkg-buildpackage",
+        ]
+    )
 
     os.makedirs(deb_dist_path, exist_ok=True)
-    print("The following files have been created:")
+    print("")
-    for src in root.parent.glob(f"dangerzone_{version}*"):
+    print("* To install run:")
-        dest = deb_dist_path / src.name
+
-        shutil.move(src, dest)
+    # dpkg-buildpackage produces a .deb file in the parent folder
-        print(f"{dest}")
+    # that needs to be copied to the `deb_dist` folder manually
+    src = root.parent / f"dangerzone_{version}_amd64.deb"
+    destination = root / "deb_dist" / f"dangerzone_{version}-{deb_ver}_amd64.deb"
+    shutil.move(src, destination)
+    print(f"sudo dpkg -i {destination}")
 
 
 if __name__ == "__main__":