Commit df7f0289 authored by Guido Günther's avatar Guido Günther

Switch Debian packaging to python3

For now we disable epydoc since it isn't available for python3.
We also drop dh_auto_test to not run the test suite twice since pybuild
would run it as well.

Closes: #810854
parent b40cb258
......@@ -11,17 +11,16 @@ Build-Depends:
gtk-doc-tools,
libdistro-info-perl,
perl,
python (>> 2.7.3),
python-coverage,
python-dateutil,
python-epydoc,
python-mock,
python-nose,
python-nosexcover,
python-pkg-resources,
python-rpm,
python-six,
python-setuptools,
python3 (>= 3.5),
python3-coverage,
python3-dateutil,
python3-mock,
python3-nose,
python3-nosexcover,
python3-pkg-resources,
python3-rpm,
python3-six,
python3-setuptools,
sgml2x,
# For the testsuite
bzip2,
......@@ -34,28 +33,28 @@ Build-Depends:
zipmerge,
# For the network tests
curl,
python-requests,
python3-requests,
Standards-Version: 3.9.8
Vcs-Git: https://git.sigxcpu.org/cgit/git-buildpackage/
Vcs-Browser: https://git.sigxcpu.org/cgit/git-buildpackage/
Homepage: https://honk.sigxcpu.org/piki/projects/git-buildpackage/
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.5
Package: git-buildpackage
Architecture: all
Depends: ${python:Depends},
Depends: ${python3:Depends},
${shlibs:Depends},
${misc:Depends},
devscripts (>= 2.13.5~),
git (>= 1:1.7.9.1-1~),
man-db,
python-dateutil,
python-pkg-resources,
python-six,
python3-dateutil,
python3-pkg-resources,
python3-six,
Recommends: pristine-tar (>= 0.5),
cowbuilder | pbuilder | sbuild,
python-requests
Suggests: python-notify, unzip, sudo
python3-requests
Suggests: python3-notify, unzip, sudo
Description: Suite to help with Debian packages in Git repositories
This package contains the following tools:
* gbp import-{dsc,dscs}: import existing Debian source packages into a git
......@@ -70,14 +69,14 @@ Description: Suite to help with Debian packages in Git repositories
Package: git-buildpackage-rpm
Architecture: all
Depends: ${python:Depends},
Depends: ${python3:Depends},
${misc:Depends},
cpio,
git-buildpackage (= ${binary:Version}),
python-rpm,
python3-rpm,
rpm,
Recommends: pristine-tar (>= 0.5)
Suggests: python-notify, unzip, zipmerge, mock
Suggests: python3-notify, unzip, zipmerge, mock
Description: Suite to help with RPM packages in Git repositories
This package contains the following tools:
* gbp buildpackage-rpm: build a package out of a git repository, check for
......
usr/bin/gbp-builder-mock /usr/share/git-buildpackage/
usr/lib/python2.?/dist-packages/gbp/rpm/
usr/lib/python2.7/dist-packages/gbp/scripts/import_srpm.py
usr/lib/python2.7/dist-packages/gbp/scripts/pq_rpm.py
usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage_rpm.py
usr/lib/python2.7/dist-packages/gbp/scripts/rpm_ch.py
usr/lib/python3.?/dist-packages/gbp/rpm usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?//dist-packages/gbp/scripts/import_srpm.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/pq_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/buildpackage_rpm.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/rpm_ch.py usr/lib/python3/dist-packages/gbp/scripts/
usr/bin/gbp
usr/bin/git-pbuilder
usr/lib/python2.?/dist-packages/gbp-*
usr/lib/python2.?/dist-packages/gbp/command_wrappers.py
usr/lib/python2.?/dist-packages/gbp/config.py
usr/lib/python2.?/dist-packages/gbp/dch.py
usr/lib/python2.?/dist-packages/gbp/deb/
usr/lib/python2.?/dist-packages/gbp/errors.py
usr/lib/python2.?/dist-packages/gbp/format.py
usr/lib/python2.?/dist-packages/gbp/git/
usr/lib/python2.?/dist-packages/gbp/__init__.py
usr/lib/python2.?/dist-packages/gbp/log.py
usr/lib/python2.?/dist-packages/gbp/notifications.py
usr/lib/python2.?/dist-packages/gbp/patch_series.py
usr/lib/python2.?/dist-packages/gbp/pkg/
usr/lib/python2.?/dist-packages/gbp/scripts/buildpackage.py
usr/lib/python2.?/dist-packages/gbp/scripts/clone.py
usr/lib/python2.?/dist-packages/gbp/scripts/common/
usr/lib/python2.?/dist-packages/gbp/scripts/config.py
usr/lib/python2.?/dist-packages/gbp/scripts/create_remote_repo.py
usr/lib/python2.?/dist-packages/gbp/scripts/dch.py
usr/lib/python2.?/dist-packages/gbp/scripts/import_dsc.py
usr/lib/python2.?/dist-packages/gbp/scripts/import_dscs.py
usr/lib/python2.?/dist-packages/gbp/scripts/import_orig.py
usr/lib/python2.?/dist-packages/gbp/scripts/__init__.py
usr/lib/python2.?/dist-packages/gbp/scripts/pq.py
usr/lib/python2.?/dist-packages/gbp/scripts/pristine_tar.py
usr/lib/python2.?/dist-packages/gbp/scripts/pull.py
usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
usr/lib/python2.?/dist-packages/gbp/tmpfile.py
usr/lib/python2.?/dist-packages/gbp/tristate.py
usr/lib/python2.?/dist-packages/gbp/version.py
usr/lib/python3.?/dist-packages/gbp-* usr/lib/python3/dist-packages/
usr/lib/python3.?/dist-packages/gbp/command_wrappers.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/config.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/dch.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/deb/ usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/errors.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/format.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/git/ usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/__init__.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/log.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/notifications.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/paths.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/patch_series.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/pkg/ usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/scripts/buildpackage.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/clone.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/common/ usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/config.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/create_remote_repo.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/dch.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/import_dsc.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/import_dscs.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/import_orig.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/__init__.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/pq.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/pristine_tar.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/pull.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/scripts/supercommand.py usr/lib/python3/dist-packages/gbp/scripts/
usr/lib/python3.?/dist-packages/gbp/tmpfile.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/tristate.py usr/lib/python3/dist-packages/gbp/
usr/lib/python3.?/dist-packages/gbp/version.py usr/lib/python3/dist-packages/gbp/
usr/share/git-buildpackage/gbp.conf etc/git-buildpackage/
/usr/share/doc/git-buildpackage/manual-html/gbp.html /usr/share/doc/git-buildpackage/manual-html/index.html
/usr/share/man/man1/gbp.1.gz /usr/share/man/man1/git-buildpackage.1.gz
/usr/lib/python2.7/dist-packages/gbp/scripts/supercommand.py /usr/bin/gbp
/usr/lib/python3/dist-packages/gbp/scripts/supercommand.py /usr/bin/gbp
......@@ -14,11 +14,10 @@ ZSH_COMPDIR = /usr/share/zsh/vendor-completions/
PYCHECKER_ARGS=-boptparse --no-override --no-shadowbuiltin
%:
dh $@ --with python2 --buildsystem=python_distutils
dh $@ --with python3 --buildsystem=pybuild
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
dh_auto_test
make
else
@echo "Checks disabled via DEB_BUILD_OPTIONS"
......@@ -26,7 +25,7 @@ endif
override_dh_auto_build:
dh_auto_build
make apidocs docs
make docs
override_dh_auto_install:
dh_auto_install
......@@ -34,7 +33,7 @@ override_dh_auto_install:
mkdir -p debian/git-buildpackage/$(ZSH_COMPDIR)
install -m644 debian/git-buildpackage.zsh-completion \
debian/git-buildpackage/$(ZSH_COMPDIR)/_gbp
chmod a+x debian/tmp/usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
chmod a+x debian/tmp/usr/lib/python3.?/dist-packages/gbp/scripts/supercommand.py
override_dh_auto_clean:
dh_auto_clean
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment