Compare commits

...

2 commits

Author SHA1 Message Date
Alex Pyrgiotis
f64615555b
debian: Switch to quilt format
Some checks failed
Tests / build-deb (debian trixie) (push) Has been cancelled
Tests / windows (push) Has been cancelled
Tests / macOS (arch64) (push) Has been cancelled
Tests / macOS (x86_64) (push) Has been cancelled
Tests / build-deb (debian bookworm) (push) Has been cancelled
Tests / build-deb (debian bullseye) (push) Has been cancelled
Tests / build-deb (ubuntu 20.04) (push) Has been cancelled
Tests / build-deb (ubuntu 22.04) (push) Has been cancelled
Tests / build-deb (ubuntu 24.04) (push) Has been cancelled
Tests / build-deb (ubuntu 24.10) (push) Has been cancelled
Tests / install-deb (debian bookworm) (push) Has been cancelled
Tests / install-deb (debian bullseye) (push) Has been cancelled
Tests / install-deb (debian trixie) (push) Has been cancelled
Tests / install-deb (ubuntu 20.04) (push) Has been cancelled
Tests / install-deb (ubuntu 22.04) (push) Has been cancelled
Tests / install-deb (ubuntu 24.04) (push) Has been cancelled
Tests / install-deb (ubuntu 24.10) (push) Has been cancelled
Tests / build-install-rpm (fedora 39) (push) Has been cancelled
Tests / build-install-rpm (fedora 40) (push) Has been cancelled
Tests / build-install-rpm (fedora 41) (push) Has been cancelled
Tests / run tests (debian bookworm) (push) Has been cancelled
Tests / run tests (debian bullseye) (push) Has been cancelled
Tests / run tests (debian trixie) (push) Has been cancelled
Tests / run tests (fedora 39) (push) Has been cancelled
Tests / run tests (fedora 40) (push) Has been cancelled
Tests / run tests (fedora 41) (push) Has been cancelled
Tests / run tests (ubuntu 20.04) (push) Has been cancelled
Tests / run tests (ubuntu 22.04) (push) Has been cancelled
Tests / run tests (ubuntu 24.04) (push) Has been cancelled
Tests / run tests (ubuntu 24.10) (push) Has been cancelled
Switch to quilt package format, and use `dpkg-buildpackage -b` to build
the new Python package.
2025-02-05 17:23:11 +02:00
Alex Pyrgiotis
3c80b2d2fb
Fix badly formatted Debian dates 2025-02-05 17:22:25 +02:00
3 changed files with 10 additions and 39 deletions

4
debian/changelog vendored
View file

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

View file

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

View file

@ -21,22 +21,6 @@ def run(cmd):
def main(): 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" dist_path = root / "dist"
deb_dist_path = root / "deb_dist" deb_dist_path = root / "deb_dist"
@ -46,28 +30,15 @@ def main():
if os.path.exists(deb_dist_path): if os.path.exists(deb_dist_path):
shutil.rmtree(deb_dist_path) shutil.rmtree(deb_dist_path)
print("* Building DEB package") print("* Building binary-only DEB package")
if args.distro is None: run(["dpkg-buildpackage", "-b"])
deb_ver = "1"
else:
deb_ver = args.distro
run(
[
"dpkg-buildpackage",
]
)
os.makedirs(deb_dist_path, exist_ok=True) os.makedirs(deb_dist_path, exist_ok=True)
print("") print("The following files have been created:")
print("* To install run:") for src in root.parent.glob(f"dangerzone_{version}*"):
dest = deb_dist_path / src.name
# dpkg-buildpackage produces a .deb file in the parent folder shutil.move(src, dest)
# that needs to be copied to the `deb_dist` folder manually print(f"{dest}")
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__": if __name__ == "__main__":