diff -Nru loggerhead-2.0.0/debian/changelog loggerhead-2.0.1+bzr541+ds/debian/changelog --- loggerhead-2.0.0/debian/changelog 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/changelog 2022-10-23 09:31:16.000000000 +0000 @@ -1,3 +1,22 @@ +loggerhead (2.0.1+bzr541+ds-2) unstable; urgency=medium + + * Drop running no longer installed testsuite in debian/tests/control. + Closes: #1016452 + + -- Jelmer Vernooij Sun, 23 Oct 2022 10:31:16 +0100 + +loggerhead (2.0.1+bzr541+ds-1) unstable; urgency=medium + + * Remove incorrect field Homepage from debian/upstream/metadata. + * Update standards version to 4.6.1, no changes needed. + * Update watch file format version to 4. + * d/t/control: Add missing dependency on python-pygments. Closes: + #1022140 + * New upstream snapshot. + + Fixes compatibility with newer versions of Breezy. + + -- Jelmer Vernooij Fri, 21 Oct 2022 00:11:09 +0100 + loggerhead (2.0.0-2) unstable; urgency=medium * Run tests from source since they are no longer installed. Closes: diff -Nru loggerhead-2.0.0/debian/control loggerhead-2.0.1+bzr541+ds/debian/control --- loggerhead-2.0.0/debian/control 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/control 2022-10-23 09:31:16.000000000 +0000 @@ -16,7 +16,7 @@ python3-simpletal, dh-python, debhelper-compat (= 13) -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 Vcs-Bzr: https://code.launchpad.net/~debian-bazaar/debian/sid/loggerhead/unstable Vcs-Browser: https://code.launchpad.net/~debian-bazaar/debian/sid/loggerhead/unstable Rules-Requires-Root: no diff -Nru loggerhead-2.0.0/debian/patches/series loggerhead-2.0.1+bzr541+ds/debian/patches/series --- loggerhead-2.0.0/debian/patches/series 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/patches/series 2022-10-23 09:31:16.000000000 +0000 @@ -1,2 +1 @@ static-path.patch -version.patch diff -Nru loggerhead-2.0.0/debian/patches/version.patch loggerhead-2.0.1+bzr541+ds/debian/patches/version.patch --- loggerhead-2.0.0/debian/patches/version.patch 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/patches/version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -=== modified file 'loggerhead/__init__.py' ---- old/loggerhead/__init__.py 2022-08-21 12:50:04 +0000 -+++ new/loggerhead/__init__.py 2022-08-21 13:25:06 +0000 -@@ -26,6 +26,9 @@ - __version__ = importlib_metadata.version("loggerhead") - except importlib_metadata.PackageNotFoundError: - # Support running tests from the build tree without installation. -- __version__ = None -+ import os -+ from setuptools.config import read_configuration -+ cfg = read_configuration(os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')) -+ __version__ = cfg['metadata']['version'] - __revision__ = None - required_breezy = (3, 1) - diff -Nru loggerhead-2.0.0/debian/prerm loggerhead-2.0.1+bzr541+ds/debian/prerm --- loggerhead-2.0.0/debian/prerm 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#!/bin/sh -#DEBHELPER# diff -Nru loggerhead-2.0.0/debian/rules loggerhead-2.0.1+bzr541+ds/debian/rules --- loggerhead-2.0.0/debian/rules 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/rules 2022-10-23 09:31:16.000000000 +0000 @@ -1,13 +1,5 @@ #!/usr/bin/make -f -PKD = $(abspath $(dir $(MAKEFILE_LIST))) -PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) -UVER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};') -REV = $(shell echo $(VER) | perl -ne 'print "$$1" if m/(?:git|svn|hg|bzr)(\d+)/;') -UURL = lp:loggerhead -DTYPE = +dfsg -VER ?= $(subst $(DTYPE),,$(UVER)) - %: dh $* --with python3 --buildsystem=pybuild @@ -28,11 +20,3 @@ override_dh_auto_build: dh_auto_build cd docs/ && PYTHONPATH=.. $(MAKE) html - -$(PKG)_$(VER)$(DTYPE).orig.tar.xz: - $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..)) - bzr export --revision=$(REV) $(PKG)-$(VER) $(UURL) \ - || $(RM) -r $(PKG)-$(VER) - @echo "# Packing..." - XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" "$(PKG)-$(VER)" \ - && $(RM) -r "$(PKG)-$(VER)" diff -Nru loggerhead-2.0.0/debian/tests/control loggerhead-2.0.1+bzr541+ds/debian/tests/control --- loggerhead-2.0.0/debian/tests/control 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Test-Command: python3 -m unittest loggerhead.tests.test_suite -Depends: @, brz, python3-breezy.tests, python3-subunit -Restrictions: allow-stderr diff -Nru loggerhead-2.0.0/debian/upstream/metadata loggerhead-2.0.1+bzr541+ds/debian/upstream/metadata --- loggerhead-2.0.0/debian/upstream/metadata 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/upstream/metadata 2022-10-23 09:31:16.000000000 +0000 @@ -2,4 +2,3 @@ Repository-Browse: https://code.launchpad.net/loggerhead Bug-Database: https://bugs.launchpad.net/loggerhead Bug-Submit: https://bugs.launchpad.net/loggerhead/+file-bug -Homepage: https://launchpad.net/loggerhead diff -Nru loggerhead-2.0.0/debian/watch loggerhead-2.0.1+bzr541+ds/debian/watch --- loggerhead-2.0.0/debian/watch 2022-09-11 01:05:36.000000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/debian/watch 2022-10-23 09:31:16.000000000 +0000 @@ -1,3 +1,2 @@ -version=3 -opts=dversionmangle=s/\.dfsg// \ -https://launchpad.net/loggerhead/+download https://launchpad.net/loggerhead/.*/loggerhead-(.+).tar.gz +version=4 +opts=dversionmangle=s/\.dfsg// https://launchpad.net/loggerhead/+download https://launchpad.net/loggerhead/.*/loggerhead-(.+).tar.gz diff -Nru loggerhead-2.0.0/__init__.py loggerhead-2.0.1+bzr541+ds/__init__.py --- loggerhead-2.0.0/__init__.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/__init__.py 2022-09-21 12:13:25.749000000 +0000 @@ -121,6 +121,9 @@ try: from .loggerhead.tests import test_suite except ImportError: - from loggerhead.tests import test_suite - basic_tests.addTest(test_suite()) + from breezy.trace import mutter + mutter( + 'loggerhead tests not installed, not registering tests') + else: + basic_tests.addTest(test_suite()) return basic_tests diff -Nru loggerhead-2.0.0/loggerhead/controllers/directory_ui.py loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/directory_ui.py --- loggerhead-2.0.0/loggerhead/controllers/directory_ui.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/directory_ui.py 2022-09-21 12:13:25.749000000 +0000 @@ -22,6 +22,11 @@ from breezy import branch, errors, urlutils +try: + from breezy.transport import NoSuchFile +except ImportError: + from breezy.errors import NoSuchFile + from .. import util from ..controllers import TemplatedBranchView @@ -77,7 +82,7 @@ try: if not stat.S_ISDIR(self.transport.stat(d).st_mode): continue - except errors.NoSuchFile: + except NoSuchFile: continue b = None else: diff -Nru loggerhead-2.0.0/loggerhead/controllers/download_ui.py loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/download_ui.py --- loggerhead-2.0.0/loggerhead/controllers/download_ui.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/download_ui.py 2022-09-21 12:13:25.749000000 +0000 @@ -22,10 +22,13 @@ import urllib from breezy.errors import ( - NoSuchFile, NoSuchId, NoSuchRevision, ) +try: + from breezy.transport import NoSuchFile +except ImportError: + from breezy.errors import NoSuchFile from breezy import osutils, urlutils from paste import httpexceptions from paste.request import path_info_pop @@ -59,7 +62,7 @@ self._branch.absolute_url('/changes')) revid = h.fix_revid(args[0]) try: - path, filename, content = h.get_file(args[1], revid) + path, filename, content = h.get_file("/".join(args[1:]), revid) except (NoSuchFile, NoSuchRevision): raise httpexceptions.HTTPNotFound() mime_type, encoding = mimetypes.guess_type(filename) diff -Nru loggerhead-2.0.0/loggerhead/controllers/filediff_ui.py loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/filediff_ui.py --- loggerhead-2.0.0/loggerhead/controllers/filediff_ui.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/filediff_ui.py 2022-09-21 12:13:25.749000000 +0000 @@ -5,6 +5,10 @@ errors, urlutils, ) +try: + from breezy.transport import NoSuchFile +except ImportError: + from breezy.errors import NoSuchFile from breezy.tree import find_previous_path from .. import util @@ -71,7 +75,7 @@ tree = repository.revision_tree(revid) try: lines[revid] = tree.get_file_lines(filename) - except errors.NoSuchFile: + except NoSuchFile: lines[revid] = [] lines[compare_revid] = compare_tree.get_file_lines(filename) else: diff -Nru loggerhead-2.0.0/loggerhead/controllers/view_ui.py loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/view_ui.py --- loggerhead-2.0.0/loggerhead/controllers/view_ui.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/controllers/view_ui.py 2022-09-21 12:13:25.749000000 +0000 @@ -21,10 +21,13 @@ from breezy.errors import ( BinaryFile, - NoSuchFile, NoSuchId, NoSuchRevision, ) +try: + from breezy.transport import NoSuchFile +except ImportError: + from breezy.errors import NoSuchFile from breezy import ( osutils, urlutils, diff -Nru loggerhead-2.0.0/loggerhead/history.py loggerhead-2.0.1+bzr541+ds/loggerhead/history.py --- loggerhead-2.0.0/loggerhead/history.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/history.py 2022-09-21 12:13:25.749000000 +0000 @@ -42,6 +42,11 @@ import breezy.osutils import breezy.revision +try: + from breezy.transport import NoSuchFile +except ImportError: + from breezy.errors import NoSuchFile + from . import search from . import util from .wholehistory import compute_whole_history_data @@ -123,7 +128,7 @@ return breezy.revision.NULL_REVISION try: return tree.get_file_revision(path) - except breezy.errors.NoSuchFile: + except NoSuchFile: return breezy.revision.NULL_REVISION def report(self, paths, versioned, renamed, copied, modified, diff -Nru loggerhead-2.0.0/loggerhead/__init__.py loggerhead-2.0.1+bzr541+ds/loggerhead/__init__.py --- loggerhead-2.0.0/loggerhead/__init__.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/__init__.py 2022-09-21 12:13:25.749000000 +0000 @@ -26,6 +26,9 @@ __version__ = importlib_metadata.version("loggerhead") except importlib_metadata.PackageNotFoundError: # Support running tests from the build tree without installation. - __version__ = None + import os + from setuptools.config import read_configuration + cfg = read_configuration(os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')) + __version__ = cfg['metadata']['version'] __revision__ = None required_breezy = (3, 1) diff -Nru loggerhead-2.0.0/loggerhead/load_test.py loggerhead-2.0.1+bzr541+ds/loggerhead/load_test.py --- loggerhead-2.0.0/loggerhead/load_test.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/load_test.py 2022-09-21 12:13:25.749000000 +0000 @@ -75,6 +75,11 @@ urlutils, ) +try: + from breezy.transport import NoSuchFile +except ImportError: + from breezy.errors import NoSuchFile + # This code will be doing multi-threaded requests against breezy.transport # code. We want to make sure to load everything ahead of time, so we don't get # lazy-import failures @@ -129,7 +134,7 @@ # blocking_timeout to decide when to stop trying to read # content content = t.get_bytes(path) - except (errors.TransportError, errors.NoSuchFile): + except (errors.TransportError, NoSuchFile): return False return True diff -Nru loggerhead-2.0.0/loggerhead/static/css/diff.css loggerhead-2.0.1+bzr541+ds/loggerhead/static/css/diff.css --- loggerhead-2.0.0/loggerhead/static/css/diff.css 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/static/css/diff.css 2022-09-21 12:13:25.749000000 +0000 @@ -71,7 +71,7 @@ padding: 0 1%; color: #000; font-size: 85%; - font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace; + font-family: 'Ubuntu Mono', monospace; } .unified .code { width: 87%; diff -Nru loggerhead-2.0.0/loggerhead/static/css/global.css loggerhead-2.0.1+bzr541+ds/loggerhead/static/css/global.css --- loggerhead-2.0.0/loggerhead/static/css/global.css 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/static/css/global.css 2022-09-21 12:13:25.749000000 +0000 @@ -26,7 +26,7 @@ } body { font-weight: normal; - font-family: UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; + font-family: Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif; color: #000; background: #fff; } diff -Nru loggerhead-2.0.0/loggerhead/static/css/view.css loggerhead-2.0.1+bzr541+ds/loggerhead/static/css/view.css --- loggerhead-2.0.0/loggerhead/static/css/view.css 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/static/css/view.css 2022-09-21 12:13:25.749000000 +0000 @@ -26,7 +26,7 @@ } .viewLine pre, .viewCont pre { - font-family: 'UbuntuBeta Mono', 'Ubuntu Mono', monospace; + font-family: 'Ubuntu Mono', monospace; line-height: 1.1; } .viewLine pre { diff -Nru loggerhead-2.0.0/loggerhead/templates/directory.pt loggerhead-2.0.1+bzr541+ds/loggerhead/templates/directory.pt --- loggerhead-2.0.0/loggerhead/templates/directory.pt 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/templates/directory.pt 2022-09-21 12:13:25.749000000 +0000 @@ -73,7 +73,7 @@ diff -Nru loggerhead-2.0.0/loggerhead/templates/inventory.pt loggerhead-2.0.1+bzr541+ds/loggerhead/templates/inventory.pt --- loggerhead-2.0.0/loggerhead/templates/inventory.pt 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/templates/inventory.pt 2022-09-21 12:13:25.749000000 +0000 @@ -157,8 +157,8 @@ - + Download File diff -Nru loggerhead-2.0.0/loggerhead/templates/macros.pt loggerhead-2.0.1+bzr541+ds/loggerhead/templates/macros.pt --- loggerhead-2.0.0/loggerhead/templates/macros.pt 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/templates/macros.pt 2022-09-21 12:13:25.749000000 +0000 @@ -46,7 +46,7 @@ diff -Nru loggerhead-2.0.0/loggerhead/tests/fixtures.py loggerhead-2.0.1+bzr541+ds/loggerhead/tests/fixtures.py --- loggerhead-2.0.0/loggerhead/tests/fixtures.py 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/loggerhead/tests/fixtures.py 2022-09-21 12:13:25.749000000 +0000 @@ -33,10 +33,10 @@ self.filecontents = ( 'some\nmultiline\ndata\n' 'with "3.5" certifi < 2022.5.18; python_version <= "3.5" fixtures < 4.0.0; python_version <= "3.5" +patiencediff < 0.2.3; python_version <= "3.5" diff -Nru loggerhead-2.0.0/setup.cfg loggerhead-2.0.1+bzr541+ds/setup.cfg --- loggerhead-2.0.0/setup.cfg 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/setup.cfg 2022-09-21 12:13:25.749000000 +0000 @@ -16,7 +16,7 @@ [metadata] name = loggerhead -version = 2.0.0 +version = 2.0.2.dev0 description = Loggerhead is a web viewer for projects in bazaar long_description = file: README.rst long_description_content_type = text/x-rst diff -Nru loggerhead-2.0.0/tox.ini loggerhead-2.0.1+bzr541+ds/tox.ini --- loggerhead-2.0.0/tox.ini 2022-08-19 10:06:49.213000000 +0000 +++ loggerhead-2.0.1+bzr541+ds/tox.ini 2022-09-21 12:13:25.749000000 +0000 @@ -3,7 +3,9 @@ skipsdist=True [testenv] -deps = -rrequirements.txt +deps = + -rrequirements.txt + . commands = brz selftest -v breezy.plugins.loggerhead --strict setenv = py35: VIRTUALENV_DOWNLOAD = 0