From 5c42e4d241a8727ca2d0199372a9e56cc1bf10f7dd5fc8d1ec08868738b2fddd Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Wed, 3 May 2023 08:25:44 +0000 Subject: [PATCH 1/3] 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 8636cc6..98a32e6 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 5265e0f..32fca3f 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..66cb6c2 --- /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..2d2013c --- /dev/null +++ b/debian.manpages @@ -0,0 +1 @@ +osc.1 diff --git a/debian.rules b/debian.rules index d424447..2d615c0 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 778e0d1..c6083e3 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 From 611ca01e9d3927c499426a20657a494fdc766ca40789811be5bfda6a3b48556a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 3 May 2023 13:13:22 +0000 Subject: [PATCH 2/3] Accepting request 1084218 from home:dmach:branches:openSUSE:Tools - 1.1.2 - Command-line: - Add '--buildtool-opt' option passing options to underlying rpmbuild to the 'build' command - Fix 'diff' command to support diffing selected files only - Identify inherited packages in the 'dependson' command output - Bring the '--debug' option back to the 'buildinfo' command - Fix 'buildhistory' command by setting the type of the '--limit' option to int - Library: - Fix a traceback when failed to unlock a keyring - Don't retry on 400 HTTP status code in core.server_diff() - Clean-up the '.old' folder if an exception happens - Document 'popt' attribute in the _link template - Fix build.get_repo() to return only directory that contains 'repodata/repomd.xml' - Connection: - Retry on receiving the following HTTP status codes: 400, 500, 502, 503, 504 - Allow disabling retry on 400 HTTP status code - Fix urlgrab to skip mirrors with invalid scheme OBS-URL: https://build.opensuse.org/request/show/1084218 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=395 --- PKGBUILD | 2 +- debian.changelog | 2 +- osc-1.1.1.tar.gz | 3 --- osc-1.1.2.tar.gz | 3 +++ osc.changes | 21 +++++++++++++++++++++ osc.dsc | 2 +- osc.spec | 2 +- 7 files changed, 28 insertions(+), 7 deletions(-) delete mode 100644 osc-1.1.1.tar.gz create mode 100644 osc-1.1.2.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 9904388..e22f323 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=0 pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') diff --git a/debian.changelog b/debian.changelog index 98a32e6..0db57dd 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (1.1.1-1) unstable; urgency=low +osc (1.1.2-1) unstable; urgency=low * Placeholder diff --git a/osc-1.1.1.tar.gz b/osc-1.1.1.tar.gz deleted file mode 100644 index 53b6490..0000000 --- a/osc-1.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05cb090487dc099f5cdfe4327cfd4d7bbf532a0b6a380c3cf83b29923b763ea1 -size 328704 diff --git a/osc-1.1.2.tar.gz b/osc-1.1.2.tar.gz new file mode 100644 index 0000000..e548979 --- /dev/null +++ b/osc-1.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2df7f9514175428a82e636365fa10c5dfed7497d742aff380e22c517064ee6a +size 329844 diff --git a/osc.changes b/osc.changes index f358e1f..63369bc 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed May 3 08:12:22 UTC 2023 - Daniel Mach + +- 1.1.2 + - Command-line: + - Add '--buildtool-opt' option passing options to underlying rpmbuild to the 'build' command + - Fix 'diff' command to support diffing selected files only + - Identify inherited packages in the 'dependson' command output + - Bring the '--debug' option back to the 'buildinfo' command + - Fix 'buildhistory' command by setting the type of the '--limit' option to int + - Library: + - Fix a traceback when failed to unlock a keyring + - Don't retry on 400 HTTP status code in core.server_diff() + - Clean-up the '.old' folder if an exception happens + - Document 'popt' attribute in the _link template + - Fix build.get_repo() to return only directory that contains 'repodata/repomd.xml' + - Connection: + - Retry on receiving the following HTTP status codes: 400, 500, 502, 503, 504 + - Allow disabling retry on 400 HTTP status code + - Fix urlgrab to skip mirrors with invalid scheme + ------------------------------------------------------------------- Tue Apr 11 12:04:56 UTC 2023 - Daniel Mach diff --git a/osc.dsc b/osc.dsc index c6083e3..a08b351 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.1.1-1 +Version: 1.1.2-1 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index fc3b1e3..2f4c26e 100644 --- a/osc.spec +++ b/osc.spec @@ -49,7 +49,7 @@ %endif Name: osc -Version: 1.1.1 +Version: 1.1.2 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later From 0ccd3c2bd5ad1dd74e50cb3a1d5a13db69d5c6386eae846ba5d7953f0a7fe872 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 4 May 2023 16:59:16 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=396 --- debian.lintian-overrides | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian.lintian-overrides diff --git a/debian.lintian-overrides b/debian.lintian-overrides deleted file mode 100644 index 66cb6c2..0000000 --- a/debian.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -osc: shell-script-fails-syntax-check *