diff options
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/control | 21 | ||||
| -rw-r--r-- | debian/git-buildpackage-bb.install | 4 | ||||
| -rw-r--r-- | debian/git-buildpackage-common.docs | 1 | ||||
| -rw-r--r-- | debian/not-installed | 7 | ||||
| -rwxr-xr-x | debian/rules | 6 |
5 files changed, 23 insertions, 16 deletions
diff --git a/debian/control b/debian/control index 34cc0978..5d13d2f4 100755 --- a/debian/control +++ b/debian/control @@ -4,20 +4,21 @@ Priority: optional Maintainer: Guido Günther <agx@sigxcpu.org> Build-Depends: bash-completion, + dh-python, debhelper (>= 9~), docbook-utils, gtk-doc-tools, openjade, perl, - python (>> 2.6.6-3~), + python3, python-epydoc | pydoctor | python-pydoctor, - python-nose, - python-pkg-resources, - python-setuptools, + python3-nose, + python3-pkg-resources, + python3-setuptools, sgml2x, librpm-tizen, # For rpm (epydoc) - python-rpm + python3-rpm Standards-Version: 3.9.4 Vcs-Git: git://honk.sigxcpu.org/git/git-buildpackage.git Vcs-Browser: https://honk.sigxcpu.org/gitweb/?p=git-buildpackage.git @@ -27,12 +28,12 @@ X-Python-Version: >= 2.6 Package: git-buildpackage-common Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, git (>= 1:1.7.9.1-1~), man-db, - python-pkg-resources, + python3-pkg-resources, #unittest need zipmerge Recommends: pristine-tar (>= 0.5) @@ -42,7 +43,7 @@ Description: Suite to help with packaging in Git repositories Package: git-buildpackage Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, devscripts, @@ -62,7 +63,7 @@ Description: Suite to help with Debian packages in Git repositories Package: git-buildpackage-rpm Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-rpm, @@ -80,7 +81,7 @@ Description: Suite to help with rpm packages in Git repositories Package: git-buildpackage-bb Architecture: all -Depends: ${python:Depends}, +Depends: ${python3:Depends}, ${misc:Depends}, git-buildpackage-common (= ${binary:Version}), git-buildpackage-rpm (= ${binary:Version}), diff --git a/debian/git-buildpackage-bb.install b/debian/git-buildpackage-bb.install index 39b39afa..c76b64bb 100644 --- a/debian/git-buildpackage-bb.install +++ b/debian/git-buildpackage-bb.install @@ -1,2 +1,2 @@ -usr/lib/python2.?/dist-packages/gbp/bb/ -usr/lib/python2.?/dist-packages/gbp/scripts/*bb*.py* +usr/lib/python*/dist-packages/gbp/bb/ +usr/lib/python*/dist-packages/gbp/scripts/*bb*.py* diff --git a/debian/git-buildpackage-common.docs b/debian/git-buildpackage-common.docs index ce06068d..7fdec518 100644 --- a/debian/git-buildpackage-common.docs +++ b/debian/git-buildpackage-common.docs @@ -1,3 +1,2 @@ README docs/manual-html/ -build/apidocs/ diff --git a/debian/not-installed b/debian/not-installed new file mode 100644 index 00000000..e5804d04 --- /dev/null +++ b/debian/not-installed @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/deb/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/git/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/pkg/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/rpm/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/common/__pycache__ +debian/tmp/usr/lib/python3.*/dist-packages/gbp/scripts/__pycache__ diff --git a/debian/rules b/debian/rules index 434e58c2..91265d43 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ ZSH_COMPDIR = /usr/share/zsh/vendor-completions/ PYCHECKER_ARGS=-boptparse --no-override --no-shadowbuiltin %: - dh $@ --with python2 + dh $@ --with python3 --buildsystem=pybuild override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -28,7 +28,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) export GIT_COMMITTER_NAME=$$GIT_AUTHOR_NAME; \ export GIT_COMMITTER_EMAIL=$$GIT_AUTHOR_EMAIL; \ PYTHONPATH=. \ - python setup.py nosetests + python3 setup.py nosetests else @echo "Checks disabled via DEB_BUILD_OPTIONS" @@ -38,7 +38,7 @@ override_dh_auto_build: dh_auto_build make -C docs #generate apidocs - sh gen_apidocs.sh + #sh gen_apidocs.sh override_dh_auto_install: dh_auto_install dh_bash-completion |