Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Python3 port of tklamq #1

Merged
merged 11 commits into from
Feb 16, 2022
Merged

Python3 port of tklamq #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b581d32
Rename cmd and lib files.
JedMeister Feb 7, 2022
4188d53
Move to pybuild Debian packaging.
JedMeister Feb 7, 2022
d50026a
Run 2to3 over code.
JedMeister Feb 7, 2022
5610ff0
Update copyright and python shebang.
JedMeister Feb 7, 2022
88ae008
Update dependency: pycrypto -> pycryptodome.
JedMeister Feb 7, 2022
b835cdd
Code layout tidy up.
JedMeister Feb 7, 2022
fafc5c8
Port to use argparse instead of getopt.
JedMeister Feb 7, 2022
35b0e70
Minor bugfix
JedMeister Feb 7, 2022
6710d47
Make packaging work (not sure why rename isn't working?).
JedMeister Feb 7, 2022
71c9ed7
Tweak build deps.
JedMeister Feb 7, 2022
b997e3c
more pkging tweaks.
JedMeister Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 0 additions & 83 deletions Makefile
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions cmd_consume.py
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions cmd_declare.py
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions cmd_publish.py
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
Source: tklamq
Section: misc
Priority: optional
Maintainer: Alon Swartz <alon@turnkeylinux.org>
Maintainer: Jeremy Davis <jeremy@turnkeylinux.org>
Build-Depends:
debhelper (>= 10),
dh-python,
python-all (>= 2.6.6-3~),
python3-all (>= 3.6~),
Standards-Version: 4.0.0

Package: tklamq
Architecture: any
Depends:
${misc:Depends},
${python:Depends},
python-amqplib,
python-kombu,
python-crypto,
python-simplejson,
${python3:Depends},
python3-amqplib,
python3-kombu,
python3-pycryptodome,
Description: TurnKey Linux Advanced Message Queue (AMQ) client
7 changes: 4 additions & 3 deletions debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ Author: Alon Swartz <alon@turnkeylinux.org>

License:

Copyright (C) 2010 Alon Swartz <alon@turnkeylinux.org>
Copyright (C) 2010-2021 Alon Swartz <alon@turnkeylinux.org>
Copyright (C) 2022 TurnKey GNU/Linux <admin@turnkeylinux.org>

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
Expand All @@ -19,4 +20,4 @@ License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

On Debian and Ubuntu systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL file.
License can be found in /usr/share/common-licenses/GPL-3 file.
9 changes: 3 additions & 6 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#! /usr/bin/make -f
#!/usr/bin/make -f

include /usr/share/dpkg/pkg-info.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all

%:
dh $@ --with python2 --buildsystem=makefile

override_dh_auto_install:
dh_auto_install -- prefix=debian/$(DEB_SOURCE)/usr
dh $@ --buildsystem=pybuild
3 changes: 3 additions & 0 deletions debian/tklamq.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tklamq-consume /usr/bin/
tklamq-declare /usr/bin/
tklamq-publish /usr/bin/