Control: tags 1066136 + pending Hi,
I've prepared an NMU for python-xapian-haystack (versioned as 2.1.1-1+deb12u0.1) and uploaded it to DELAYED/14-day. (The unusually long delay is since this is a stable upload.) NMU diff is attached. /* Steinar */ -- Homepage: https://www.sesse.net/
diff -Nru python-xapian-haystack-2.1.1/debian/changelog python-xapian-haystack-2.1.1/debian/changelog --- python-xapian-haystack-2.1.1/debian/changelog 2021-10-19 22:10:20.000000000 +0200 +++ python-xapian-haystack-2.1.1/debian/changelog 2024-03-19 23:35:19.000000000 +0100 @@ -1,3 +1,12 @@ +python-xapian-haystack (2.1.1-1+deb12u0.1) bookworm; urgency=medium + + * Non-maintainer upload, to stable. + * Remove dependency on the django.utils.six module, which no longer exists, + causing the package to be completely broken. Patch by Ole Peder Brandtzæg, + based on reducing a patch from upstream. (Closes: #1066136) + + -- Steinar H. Gunderson <se...@debian.org> Tue, 19 Mar 2024 23:35:19 +0100 + python-xapian-haystack (2.1.1-1) unstable; urgency=low [ Debian Janitor ] diff -Nru python-xapian-haystack-2.1.1/debian/patches/0002-Remove-dependency-on-six.patch python-xapian-haystack-2.1.1/debian/patches/0002-Remove-dependency-on-six.patch --- python-xapian-haystack-2.1.1/debian/patches/0002-Remove-dependency-on-six.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-xapian-haystack-2.1.1/debian/patches/0002-Remove-dependency-on-six.patch 2024-03-19 23:35:19.000000000 +0100 @@ -0,0 +1,32 @@ +Index: python-xapian-haystack-2.1.1/xapian_backend.py +=================================================================== +--- python-xapian-haystack-2.1.1.orig/xapian_backend.py ++++ python-xapian-haystack-2.1.1/xapian_backend.py +@@ -7,7 +7,6 @@ import re + import shutil + import sys + +-from django.utils import six + from django.conf import settings + from django.core.exceptions import ImproperlyConfigured + from django.utils.encoding import force_text +@@ -346,7 +345,7 @@ class XapianSearchBackend(BaseSearchBack + def _get_ngram_lengths(value): + values = value.split() + for item in values: +- for ngram_length in six.moves.range(NGRAM_MIN_LENGTH, NGRAM_MAX_LENGTH + 1): ++ for ngram_length in range(NGRAM_MIN_LENGTH, NGRAM_MAX_LENGTH + 1): + yield item, ngram_length + + for obj in iterable: +@@ -356,8 +355,8 @@ class XapianSearchBackend(BaseSearchBack + def ngram_terms(value): + for item, length in _get_ngram_lengths(value): + item_length = len(item) +- for start in six.moves.range(0, item_length - length + 1): +- for size in six.moves.range(length, length + 1): ++ for start in range(0, item_length - length + 1): ++ for size in range(length, length + 1): + end = start + size + if end > item_length: + continue diff -Nru python-xapian-haystack-2.1.1/debian/patches/series python-xapian-haystack-2.1.1/debian/patches/series --- python-xapian-haystack-2.1.1/debian/patches/series 2021-10-19 22:10:20.000000000 +0200 +++ python-xapian-haystack-2.1.1/debian/patches/series 2024-03-19 23:35:19.000000000 +0100 @@ -1 +1,2 @@ 0001-Use-io.open-to-read-UTF-8-encoded-README-file.patch +0002-Remove-dependency-on-six.patch
