diff -Nru pygobject-3.36.0/debian/changelog pygobject-3.36.0/debian/changelog --- pygobject-3.36.0/debian/changelog 2020-07-16 16:40:41.000000000 +0000 +++ pygobject-3.36.0/debian/changelog 2020-07-23 17:03:44.000000000 +0000 @@ -1,3 +1,13 @@ +pygobject (3.36.0-4+rpi1) bullseye-staging; urgency=medium + + * Revert python 2 removal until jackd2 is fixed. + * Drop build-depends on python-cairo-dev and python-cairo-dbg + * Drop python-gi-cairo binary package. + * Hack setup.py so python 2 builds build without cairo + * Fix clean target + + -- Peter Michael Green Thu, 23 Jul 2020 17:03:44 +0000 + pygobject (3.36.0-4) unstable; urgency=medium * Team upload diff -Nru pygobject-3.36.0/debian/control pygobject-3.36.0/debian/control --- pygobject-3.36.0/debian/control 2020-07-16 16:40:41.000000000 +0000 +++ pygobject-3.36.0/debian/control 2020-07-23 17:03:44.000000000 +0000 @@ -23,6 +23,9 @@ libgirepository1.0-dev (>= 1.62.0-4~), libglib2.0-dev (>= 2.48.0), locales, + python-all-dbg, + python-all-dev (>= 2.6.6-3~), + python-setuptools, python3-all-dbg, python3-all-dev, python3-cairo-dbg, @@ -39,6 +42,24 @@ Vcs-Git: https://salsa.debian.org/gnome-team/pygobject.git Homepage: https://wiki.gnome.org/Projects/PyGObject +Package: python-gi +Architecture: any +Depends: gir1.2-glib-2.0 (>= 1.48.0), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Provides: ${python:Provides} +Breaks: python-aptdaemon (<< 1.0), + software-center (<= 5.6.0-0ubuntu2) +Description: Python 2.x bindings for gobject-introspection libraries + GObject is an abstraction layer that allows programming with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python 2.x binding generator for libraries that + support gobject-introspection, i. e. which ship a gir1.2-- + package. With these packages, the libraries can be used from Python. + Package: python3-gi Architecture: any Depends: gir1.2-glib-2.0 (>= 1.48.0), @@ -54,6 +75,23 @@ support gobject-introspection, i. e. which ship a gir1.2-- package. With these packages, the libraries can be used from Python 3. +Package: python-gi-dbg +Section: debug +Architecture: any +Depends: python-gi (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Python bindings for the GObject library (debug extension) + GObject is an abstraction layer that allows programming with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python bindings for GObject. It is mostly + used by other bindings to map their GObjects to Python objects. + . + This package contains the extensions built for the Python debug interpreter. + Package: python3-gi-dbg Section: debug Architecture: any diff -Nru pygobject-3.36.0/debian/control.in pygobject-3.36.0/debian/control.in --- pygobject-3.36.0/debian/control.in 2020-07-16 16:40:41.000000000 +0000 +++ pygobject-3.36.0/debian/control.in 2020-07-23 17:03:44.000000000 +0000 @@ -19,6 +19,9 @@ libgirepository1.0-dev (>= 1.62.0-4~), libglib2.0-dev (>= 2.48.0), locales, + python-all-dbg, + python-all-dev (>= 2.6.6-3~), + python-setuptools, python3-all-dbg, python3-all-dev, python3-cairo-dbg, @@ -35,6 +38,24 @@ Vcs-Git: https://salsa.debian.org/gnome-team/pygobject.git Homepage: https://wiki.gnome.org/Projects/PyGObject +Package: python-gi +Architecture: any +Depends: gir1.2-glib-2.0 (>= 1.48.0), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Provides: ${python:Provides} +Breaks: python-aptdaemon (<< 1.0), + software-center (<= 5.6.0-0ubuntu2) +Description: Python 2.x bindings for gobject-introspection libraries + GObject is an abstraction layer that allows programming with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python 2.x binding generator for libraries that + support gobject-introspection, i. e. which ship a gir1.2-- + package. With these packages, the libraries can be used from Python. + Package: python3-gi Architecture: any Depends: gir1.2-glib-2.0 (>= 1.48.0), @@ -50,6 +71,23 @@ support gobject-introspection, i. e. which ship a gir1.2-- package. With these packages, the libraries can be used from Python 3. +Package: python-gi-dbg +Section: debug +Architecture: any +Depends: python-gi (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends}, + ${shlibs:Depends} +Description: Python bindings for the GObject library (debug extension) + GObject is an abstraction layer that allows programming with an object + paradigm that is compatible with many languages. It is a part of Glib, + the core library used to build GTK+ and GNOME. + . + This package contains the Python bindings for GObject. It is mostly + used by other bindings to map their GObjects to Python objects. + . + This package contains the extensions built for the Python debug interpreter. + Package: python3-gi-dbg Section: debug Architecture: any diff -Nru pygobject-3.36.0/debian/patches/no-cairo-py2.patch pygobject-3.36.0/debian/patches/no-cairo-py2.patch --- pygobject-3.36.0/debian/patches/no-cairo-py2.patch 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/patches/no-cairo-py2.patch 2020-07-23 17:03:44.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Hack setup.py so python 2 builds build without cairo +Author: Peter Michael Green + +--- pygobject-3.36.0.orig/setup.py ++++ pygobject-3.36.0/setup.py +@@ -52,6 +52,10 @@ WITH_CAIRO = not bool(os.environ.get("PY + cairo/pycairo support. Note that this option might get removed in the future. + """ + ++#hack, we no longer have pycairo in bullseye. ++if sys.version_info[0] == 2: ++ WITH_CAIRO = False ++ + + def is_dev_version(): + version = tuple(map(int, PYGOBJECT_VERSION.split("."))) diff -Nru pygobject-3.36.0/debian/patches/series pygobject-3.36.0/debian/patches/series --- pygobject-3.36.0/debian/patches/series 2020-07-16 16:40:41.000000000 +0000 +++ pygobject-3.36.0/debian/patches/series 2020-07-23 17:03:44.000000000 +0000 @@ -0,0 +1 @@ +no-cairo-py2.patch diff -Nru pygobject-3.36.0/debian/python-gi-cairo.install pygobject-3.36.0/debian/python-gi-cairo.install --- pygobject-3.36.0/debian/python-gi-cairo.install 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/python-gi-cairo.install 2020-04-19 02:44:55.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/python2*/*-packages/gi/_gi_cairo.*so diff -Nru pygobject-3.36.0/debian/python-gi-dbg.install pygobject-3.36.0/debian/python-gi-dbg.install --- pygobject-3.36.0/debian/python-gi-dbg.install 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/python-gi-dbg.install 2020-04-19 02:44:55.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/python2*/*-packages/gi/_gi*_d.so diff -Nru pygobject-3.36.0/debian/python-gi.install pygobject-3.36.0/debian/python-gi.install --- pygobject-3.36.0/debian/python-gi.install 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/python-gi.install 2020-04-19 02:44:55.000000000 +0000 @@ -0,0 +1,5 @@ +usr/lib/python2*/*-packages/gi/_gi.*so +usr/lib/python2*/*-packages/gi/*.py +usr/lib/python2*/*-packages/gi/*/*.py +usr/lib/python2*/*-packages/*.egg-info +usr/lib/python2*/*-packages/pygtkcompat/*.py diff -Nru pygobject-3.36.0/debian/rules pygobject-3.36.0/debian/rules --- pygobject-3.36.0/debian/rules 2020-07-16 16:40:41.000000000 +0000 +++ pygobject-3.36.0/debian/rules 2020-07-23 17:03:44.000000000 +0000 @@ -1,8 +1,9 @@ #!/usr/bin/make -f include /usr/share/dpkg/default.mk +include /usr/share/python/python.mk -PYVERS := $(shell py3versions --supported -v) +PYVERS := $(shell pyversions --requested -v debian/control) $(shell py3versions --supported -v) FLAVOURS := $(PYVERS) $(patsubst %,%-dbg,$(PYVERS)) TESTSUITE_FAIL_CMD=exit 1 @@ -13,12 +14,14 @@ endif export PYBUILD_BEFORE_TEST = {interpreter} {dir}/setup.py build_tests +export PYBUILD_DISABLE_python2=test +export PYBUILD_DISABLE=test/python2-dbg export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --with python3,gnome --buildsystem=pybuild + dh $@ --with python2,python3,gnome --buildsystem=pybuild # don't run the tests under fakeroot, otherwise they will try to connect to # root's session D-BUS @@ -60,6 +63,8 @@ dh_install override_dh_strip-arch: + dh_strip -ppython-gi --dbg-package=python-gi-dbg + #dh_strip -ppython-gi-cairo --dbg-package=python-gi-dbg dh_strip -ppython3-gi --dbg-package=python3-gi-dbg dh_strip -a --remaining-packages --no-automatic-dbgsym @@ -73,3 +78,13 @@ override_dh_missing: dh_missing --fail-missing + +override_dh_auto_clean: + dh_auto_clean + rm -f config.h + find . -name '*.so' -delete + find . -name '*.typelib' -delete + find . -name '*.compiled' -delete + find . -name '*.gir' -delete + rm -rf .pytest_cache + diff -Nru pygobject-3.36.0/debian/tests/build2 pygobject-3.36.0/debian/tests/build2 --- pygobject-3.36.0/debian/tests/build2 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/tests/build2 2020-04-19 02:44:55.000000000 +0000 @@ -0,0 +1,41 @@ +#!/bin/sh +# autopkgtest check: Build and run a program against pygobject, to verify that +# the headers and pkg-config file are installed correctly +# (C) 2012 Canonical Ltd. +# Author: Martin Pitt + +set -e + +WORKDIR=$(mktemp -d) +trap 'rm -rf "$WORKDIR"' 0 INT QUIT ABRT PIPE TERM +cd "$WORKDIR" + +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + +cat < pytest.c +#include +#include +#include + +int main() +{ + PyObject *gobject; + + Py_InitializeEx (FALSE); + gobject = pygobject_init (-1, -1, -1); + assert (gobject != NULL); + return 0; +} +EOF + +# Deliberately word-splitting, that's how pkg-config works: +# shellcheck disable=SC2046 +"${CROSS_COMPILE}gcc" -o pytest pytest.c $("${CROSS_COMPILE}pkg-config" --cflags --libs python2 pygobject-3.0) +echo "build: OK" +[ -x pytest ] +./pytest +echo "run: OK" diff -Nru pygobject-3.36.0/debian/tests/control pygobject-3.36.0/debian/tests/control --- pygobject-3.36.0/debian/tests/control 2020-07-16 16:40:41.000000000 +0000 +++ pygobject-3.36.0/debian/tests/control 2020-04-19 02:44:55.000000000 +0000 @@ -6,13 +6,17 @@ Restrictions: superficial Depends: build-essential, python-gi-dev, python3-dev -Tests: python3 +Tests: build2 Restrictions: superficial -Depends: python3-gi, gir1.2-glib-2.0 +Depends: build-essential, python-gi, python-gi-dev, python2-dev -Tests: python3-dbg +Tests: python2 python3 Restrictions: superficial -Depends: python3-gi-dbg, gir1.2-glib-2.0 +Depends: python-gi, python3-gi, gir1.2-glib-2.0 + +Tests: python2-dbg python3-dbg +Restrictions: superficial +Depends: python-gi-dbg, python3-gi-dbg, gir1.2-glib-2.0 Tests: python3-all Restrictions: superficial diff -Nru pygobject-3.36.0/debian/tests/python2 pygobject-3.36.0/debian/tests/python2 --- pygobject-3.36.0/debian/tests/python2 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/tests/python2 2020-04-19 02:44:55.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/sh -e +mydir="$(dirname "$0")" +python2 "$mydir/gitest.py" -v diff -Nru pygobject-3.36.0/debian/tests/python2-dbg pygobject-3.36.0/debian/tests/python2-dbg --- pygobject-3.36.0/debian/tests/python2-dbg 1970-01-01 00:00:00.000000000 +0000 +++ pygobject-3.36.0/debian/tests/python2-dbg 2020-04-19 02:44:55.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/sh -e +mydir="$(dirname "$0")" +python2-dbg "$mydir/gitest.py" -v 2>&1