From e1899beedda88a681ce97e472378e8973ebcce8a Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Wed, 3 May 2023 08:25:44 +0000 Subject: [PATCH] Accepting request 1084128 from home:nickbrown:branches:openSUSE:Tools Fixed the installation of the completion, which was missing. Create/Install a manpage. Fixed a few lintian warnings about the packaging. Adding this to the openSUSE:Tools prjconf would be useful so that lintian is automatically run on the built packages: https://github.com/openSUSE/obs-build/blob/master/build-recipe-dsc#L184 ``` %if 0%{?debian} support: lintian %endif ``` OBS-URL: https://build.opensuse.org/request/show/1084128 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=394 --- debian.changelog | 6 +++++- debian.control | 5 +++-- debian.lintian-overrides | 1 + debian.manpages | 1 + debian.rules | 18 ++++++++++++++---- osc.dsc | 3 ++- 6 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 debian.lintian-overrides create mode 100644 debian.manpages diff --git a/debian.changelog b/debian.changelog index 33a8e07..51417e6 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1 +1,5 @@ -osc (1.1.1-0) unstable; urgency=low +osc (1.1.1-1) unstable; urgency=low + + * Placeholder + + -- Adrian Schroeter Wed, 05 Apr 2023 12:34:56 +0000 diff --git a/debian.control b/debian.control index f102211..9c55102 100644 --- a/debian.control +++ b/debian.control @@ -1,10 +1,11 @@ Source: osc -Priority: extra +Priority: optional Maintainer: Adrian Schroeter Build-Depends: debhelper (>= 10), dh-python, python3-all (>=3.6), + python3-argparse-manpage, python3-cryptography, python3-setuptools, python3-urllib3 @@ -30,4 +31,4 @@ Recommends: sudo, xdg-utils Description: Command-line client for the Open Build Service - OpenSUSE Commander is a command-line client for the Open Build Service. + OpenSUSE Commander is a command-line client for the Open Build Service. diff --git a/debian.lintian-overrides b/debian.lintian-overrides new file mode 100644 index 0000000..8aa3e8b --- /dev/null +++ b/debian.lintian-overrides @@ -0,0 +1 @@ +osc: shell-script-fails-syntax-check * diff --git a/debian.manpages b/debian.manpages new file mode 100644 index 0000000..b7b6df3 --- /dev/null +++ b/debian.manpages @@ -0,0 +1 @@ +osc.1 diff --git a/debian.rules b/debian.rules index 8893b8a..41eba43 100644 --- a/debian.rules +++ b/debian.rules @@ -1,17 +1,27 @@ #!/usr/bin/make -f # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 export PYBUILD_NAME=osc %: dh $@ --with python3 --buildsystem=pybuild +override_dh_auto_build: + dh_auto_build + PYTHONPATH=. argparse-manpage \ + --output=osc.1 \ + --module=osc.commandline \ + --function=get_parser \ + --project-name=osc \ + --author="Contributors to the osc project. See the project's GIT history for the complete list." \ + --url="https://github.com/openSUSE/osc/" + override_dh_auto_install: dh_auto_install - install -Dm0644 contrib/complete.csh debian/tmp/etc/profile.d/osc.csh - install -Dm0644 contrib/complete.sh debian/tmp/etc/bash_completion.d/osc.sh - install -Dm0755 contrib/osc.complete debian/tmp/usr/lib/osc/complete + install -Dm0644 contrib/complete.csh debian/osc/etc/profile.d/osc.csh + install -Dm0644 contrib/complete.sh debian/osc/etc/bash_completion.d/osc.sh + install -Dm0755 contrib/osc.complete debian/osc/usr/lib/osc/complete override_dh_auto_test: diff --git a/osc.dsc b/osc.dsc index bcef520..02a994d 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.1.1-0 +Version: 1.1.1-1 Binary: osc Maintainer: Adrian Schroeter Architecture: any @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 10), dh-python, python3-all (>=3.6), + python3-argparse-manpage, python3-cryptography, python3-setuptools, python3-urllib3