diff --git a/debian.changelog b/debian.changelog index 58adfe8..ba40f40 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,7 +1,7 @@ osc (0.167.2) unstable; urgency=low - - Update to 0.161.1 + - Package for Python3 - -- Marco Strigl Thu, 26 Oct 2017 14:42:00 +0200 + -- Nick Brown Wed, 30 Jan 2020 14:49:30 +0000 osc (0.161.0-0) unstable; urgency=low - Install bash completion diff --git a/debian.compat b/debian.compat index 7ee83b6..4511376 100644 --- a/debian.compat +++ b/debian.compat @@ -1 +1 @@ -8 +9 diff --git a/debian.control b/debian.control index c0a38a2..9e657dd 100644 --- a/debian.control +++ b/debian.control @@ -1,15 +1,15 @@ Source: osc Priority: extra Maintainer: Adrian Schroeter , Rene Engelhard -Build-Depends: debhelper (>= 4.0.0), python-dev +Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools Standards-Version: 3.7.1 Section: devel Package: osc Section: devel Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>=2.5) | python-celementtree, python-m2crypto, python-rpm, build | obs-build -Recommends: python-progressbar -Suggests: python-keyring, sudo +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3, build | obs-build +Recommends: python3-progressbar +Suggests: python3-keyring, sudo Description: Open Build Service Commander Commandline client for the Open Build Service. diff --git a/debian.rules b/debian.rules index 84c668c..e87c12c 100644 --- a/debian.rules +++ b/debian.rules @@ -1,116 +1,14 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export PYBUILD_NAME=osc +%: + dh $@ --with python3 --buildsystem=pybuild - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -# shared library versions, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - # Add here commands to compile the package. - #$(MAKE) - python setup.py build - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - rm -rf build - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - #$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - #python setup.py install --install-layout=deb - # --prefix=$(CURDIR)/debian/tmp/usr - # try also without --install-layout=deb for older distros - python setup.py install --root=debian/tmp --no-compile --install-layout=deb || \ - python setup.py install --root=debian/tmp --no-compile +override_dh_auto_install: + dh_auto_install install -Dm0644 dist/complete.csh debian/tmp/etc/profile.d/osc.csh install -Dm0644 dist/complete.sh debian/tmp/etc/bash_completion.d/osc.sh install -Dm0755 dist/osc.complete debian/tmp/usr/lib/osc/complete - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_auto_install - dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/osc.dsc b/osc.dsc index 1ecf88c..f46bac4 100644 --- a/osc.dsc +++ b/osc.dsc @@ -5,4 +5,4 @@ Binary: osc Maintainer: Adrian Schroeter Architecture: any Standards-Version: 3.7.1 -Build-Depends: debhelper (>= 4.0.0), python-dev, python-setuptools +Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools diff --git a/osc.spec b/osc.spec index 50294db..b29d668 100644 --- a/osc.spec +++ b/osc.spec @@ -1,7 +1,7 @@ # # spec file for package osc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed