diff -Nru redland-bindings-1.0.17.1+dfsg/debian/changelog redland-bindings-1.0.17.1+dfsg/debian/changelog --- redland-bindings-1.0.17.1+dfsg/debian/changelog 2023-03-01 00:43:17.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/changelog 2023-12-14 08:34:03.000000000 +0000 @@ -1,14 +1,18 @@ -redland-bindings (1.0.17.1+dfsg-4build2) lunar; urgency=medium +redland-bindings (1.0.17.1+dfsg-6) unstable; urgency=medium - * Rebuild to drop Python 3.10 extension + * QA upload. + * Drop the autopkg test (Python only). - -- Jeremy Bicha Tue, 28 Feb 2023 19:43:17 -0500 + -- Matthias Klose Thu, 14 Dec 2023 09:34:03 +0100 -redland-bindings (1.0.17.1+dfsg-4build1) lunar; urgency=medium +redland-bindings (1.0.17.1+dfsg-5) unstable; urgency=medium - * No-change upload to remove support for ruby3.0. + * QA upload. + * Stop building python3-librdf. Closes: #1055550, #1056518, #476717. + * Bump standards version. + * Consider to remove that package entirely ... - -- Lucas Kanashiro Fri, 03 Feb 2023 10:37:15 -0300 + -- Matthias Klose Wed, 13 Dec 2023 08:29:16 +0100 redland-bindings (1.0.17.1+dfsg-4) unstable; urgency=medium diff -Nru redland-bindings-1.0.17.1+dfsg/debian/control redland-bindings-1.0.17.1+dfsg/debian/control --- redland-bindings-1.0.17.1+dfsg/debian/control 2022-11-18 14:43:58.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/control 2023-12-13 07:30:33.000000000 +0000 @@ -3,20 +3,18 @@ Priority: optional Maintainer: Debian QA Group Build-Depends: debhelper-compat (= 13), - dh-python, gem2deb, librdf0-dev, libtool, perl, pkg-config, - python3-all-dev, ruby, ruby-dev, swig, Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/debian/redland-bindings.git Vcs-Browser: https://salsa.debian.org/debian/redland-bindings -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Homepage: https://librdf.org/ Package: librdf-perl @@ -31,18 +29,6 @@ the RDF::Redland package. Homepage: https://librdf.org/docs/perl.html -Package: python3-librdf -Architecture: any -Section: python -Depends: ${misc:Depends}, - ${python3:Depends}, - ${shlibs:Depends}, -Provides: ${python3:Provides}, -Description: Python language bindings for the Redland RDF library - This package contains the files needed to use the Redland Resource - Description Framework (RDF) library in Python programs. -Homepage: https://librdf.org/docs/python.html - Package: ruby-librdf Architecture: any Section: ruby diff -Nru redland-bindings-1.0.17.1+dfsg/debian/patches/0003-python3.patch redland-bindings-1.0.17.1+dfsg/debian/patches/0003-python3.patch --- redland-bindings-1.0.17.1+dfsg/debian/patches/0003-python3.patch 2022-11-18 15:29:15.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/patches/0003-python3.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Jann Haber -Date: Sun, 30 Aug 2020 10:38:06 +0200 -Subject: python3 - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 9cb6398..62aa934 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ LT_INIT - AC_CHECK_PROGS(TAR, gnutar gtar tar) - - AC_CHECK_PROGS(LUA, lua) --AC_CHECK_PROGS(PYTHON, python) -+AC_CHECK_PROGS(PYTHON, python3) - AC_CHECK_PROGS(PERL, perl) - AC_CHECK_PROGS(PHP, php) - AC_CHECK_PROGS(RUBY, ruby) diff -Nru redland-bindings-1.0.17.1+dfsg/debian/patches/0004-Update-example-to-be-Python-3-compliant.patch redland-bindings-1.0.17.1+dfsg/debian/patches/0004-Update-example-to-be-Python-3-compliant.patch --- redland-bindings-1.0.17.1+dfsg/debian/patches/0004-Update-example-to-be-Python-3-compliant.patch 2022-11-18 15:29:15.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/patches/0004-Update-example-to-be-Python-3-compliant.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -From: Håvard F. Aasen -Date: Tue, 26 Jul 2022 18:30:46 +0200 -Subject: Update example to be Python 3 compliant - ---- - python/example.py | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/python/example.py b/python/example.py -index cc93402..d772156 100644 ---- a/python/example.py -+++ b/python/example.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # - # example.py - Redland Python 2.0 example code - # -@@ -44,11 +44,11 @@ model.add_statement(statement) - - # Match against an empty statement - find everything - for s in model.find_statements(RDF.Statement()): -- print "found statement:",s -+ print("found statement:",s) - - test_file='../data/dc.rdf' - --print "Parsing URI (file)", test_file -+print("Parsing URI (file)", test_file) - uri=RDF.Uri(string="file:"+test_file) - - parser=RDF.Parser('raptor') -@@ -60,27 +60,27 @@ for s in parser.parse_as_stream(uri,uri): - model.add_statement(s) - count=count+1 - --print "Parsing added",count,"statements" -+print("Parsing added",count,"statements") - --print "Printing all statements" -+print("Printing all statements") - for s in model.as_stream(): -- print "Statement:",s -+ print("Statement:",s) - - q = RDF.Query("PREFIX dc: SELECT ?a ?c WHERE {?a dc:title ?c}") --print "Querying for dc:titles:" -+print("Querying for dc:titles:") - for result in q.execute(model): -- print "{" -+ print("{") - for k in result: -- print " "+k+" = "+str(result[k]) -- print "}" -+ print(" "+k+" = "+str(result[k])) -+ print("}") - --print "Writing model to test-out.rdf as rdf/xml" -+print("Writing model to test-out.rdf as rdf/xml") - - # Use any rdf/xml parser that is available - serializer=RDF.Serializer() - serializer.set_namespace("dc", RDF.Uri("http://purl.org/dc/elements/1.1/")) - serializer.serialize_model_to_file("test-out.rdf", model) - --print "Serialized to ntriples as a string size",len(model.to_string(name="ntriples", base_uri="http://example.org/base#")),"bytes" -+print("Serialized to ntriples as a string size",len(model.to_string(name="ntriples", base_uri="http://example.org/base#")),"bytes") - --print "Done" -+print("Done") diff -Nru redland-bindings-1.0.17.1+dfsg/debian/patches/series redland-bindings-1.0.17.1+dfsg/debian/patches/series --- redland-bindings-1.0.17.1+dfsg/debian/patches/series 2022-11-18 15:29:15.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/patches/series 2023-12-06 10:46:51.000000000 +0000 @@ -1,4 +1,2 @@ 0001-Don-t-undef-bool-it-s-needed.patch 0002-Fix-the-ruby-SO-suffix.patch -0003-python3.patch -0004-Update-example-to-be-Python-3-compliant.patch diff -Nru redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.examples redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.examples --- redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.examples 2022-11-18 14:43:58.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.examples 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -data/dc.rdf -python/example.py diff -Nru redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.install redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.install --- redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.install 2022-11-18 14:43:58.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/python3-librdf.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/python*/ diff -Nru redland-bindings-1.0.17.1+dfsg/debian/rules redland-bindings-1.0.17.1+dfsg/debian/rules --- redland-bindings-1.0.17.1+dfsg/debian/rules 2022-11-18 15:50:17.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/rules 2023-12-06 10:47:02.000000000 +0000 @@ -6,40 +6,23 @@ export PERL := perl export RUBY := ruby -PYVERS= $(shell py3versions --supported) -PYDEF= $(shell py3versions --default) - PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}') %: - dh $@ --with python3 --with ruby + dh $@ --with ruby override_dh_auto_configure: dh_auto_configure -- \ --enable-release \ - --with-python=python3 \ + --without-python \ --with-perl-makemaker-args="INSTALLDIRS=vendor" \ - for python in $(PYVERS); do \ - cp -a python $$python; \ - done - override_dh_auto_build: dh_auto_build -Dperl dh_auto_build -Druby - for python in $(PYVERS); do \ - pylib=$$($$python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'); \ - PYTHON=$$(echo $$python | sed "s/$(PYDEF)/python3/"); \ - pylibext=$$($$python -c 'from distutils import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))'); \ - PYTHON=$$PYTHON dh_auto_build -D$$python -- pythondir=$$pylib PYTHON_INCLUDES=-I/usr/include/$$python PYTHON_LIBEXT=$$pylibext; \ - done override_dh_auto_clean: dh_auto_clean -Dperl - dh_auto_clean -Dpython - for python in $(PYVERS); do \ - rm -rf $$python; \ - done dh_auto_clean -Druby dh_auto_clean @@ -49,17 +32,3 @@ mv $(CURDIR)/debian/tmp$(PERL_ARCHLIB)/RDF $(CURDIR)/debian/tmp/usr/share/perl5/RDF dh_auto_install -Druby - - for python in $(PYVERS); do \ - pylib=$$($$python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'); \ - PYTHON=$$(echo $$python | sed "s/$(PYDEF)/python3/"); \ - pylibext=$$($$python -c 'from distutils import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))'); \ - PYTHON=$$PYTHON dh_auto_install -D$$python -- pythondir=$$pylib PYTHON_INCLUDES=-I/usr/include/$$python PYTHON_LIBEXT=$$pylibext; \ - done - -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - for python in $(PYVERS); do \ - $(MAKE) -C $$python check-local PYTHON=$$python || exit $?; \ - done -endif diff -Nru redland-bindings-1.0.17.1+dfsg/debian/salsa-ci.yml redland-bindings-1.0.17.1+dfsg/debian/salsa-ci.yml --- redland-bindings-1.0.17.1+dfsg/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/salsa-ci.yml 2023-12-13 07:49:29.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml diff -Nru redland-bindings-1.0.17.1+dfsg/debian/tests/control redland-bindings-1.0.17.1+dfsg/debian/tests/control --- redland-bindings-1.0.17.1+dfsg/debian/tests/control 2022-11-18 15:50:17.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Tests: run-unit-test -Depends: @, python3-all diff -Nru redland-bindings-1.0.17.1+dfsg/debian/tests/run-unit-test redland-bindings-1.0.17.1+dfsg/debian/tests/run-unit-test --- redland-bindings-1.0.17.1+dfsg/debian/tests/run-unit-test 2022-11-18 15:50:17.000000000 +0000 +++ redland-bindings-1.0.17.1+dfsg/debian/tests/run-unit-test 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -#!/bin/sh -set -e - -pkg=redland-bindings - -export LC_ALL=C.UTF-8 -if [ "${AUTOPKGTEST_TMP}" = "" ] ; then - AUTOPKGTEST_TMP=$(mktemp -d /tmp/${pkg}-test.XXXXXX) - trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM -fi - -cd "${AUTOPKGTEST_TMP}" - -echo "Test 1 - Check Redland and rdf import" -for py in `py3versions -s`; do \ - $py -c "import Redland" ; \ - $py -c "import RDF" ; \ -done - -echo "Test 2 - Run example script" - -# Preparing pre-condition for test 2 -mkdir -p data - -cp /usr/share/doc/python3-librdf/examples/example.py data/ -cp -a /usr/share/doc/python3-librdf/examples/dc.rdf data/ -cd data/ - -for py in `py3versions -s`; do \ - echo "Running with python: $py"; \ - $py example.py; \ -done - -# Cleanup -cd "${AUTOPKGTEST_TMP}" -rm -rf data