Skip to content

Commit

Permalink
debian: Switch to quilt format
Browse files Browse the repository at this point in the history
Switch to quilt package format, and use `dpkg-buildpackage -b` to build
the new Python package.
  • Loading branch information
apyrgio committed Feb 5, 2025
1 parent 3c80b2d commit f646155
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 37 deletions.
2 changes: 1 addition & 1 deletion debian/source/format
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0 (native)
3.0 (quilt)
43 changes: 7 additions & 36 deletions install/linux/build-deb.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,6 @@ 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"

Expand All @@ -46,28 +30,15 @@ def main():
if os.path.exists(deb_dist_path):
shutil.rmtree(deb_dist_path)

print("* Building DEB package")
if args.distro is None:
deb_ver = "1"
else:
deb_ver = args.distro

run(
[
"dpkg-buildpackage",
]
)
print("* Building binary-only DEB package")
run(["dpkg-buildpackage", "-b"])

os.makedirs(deb_dist_path, exist_ok=True)
print("")
print("* To install run:")

# dpkg-buildpackage produces a .deb file in the parent folder
# 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}")
print("The following files have been created:")
for src in root.parent.glob(f"dangerzone_{version}*"):
dest = deb_dist_path / src.name
shutil.move(src, dest)
print(f"{dest}")


if __name__ == "__main__":
Expand Down

0 comments on commit f646155

Please sign in to comment.