3.1.2-2 (patches unapplied)HEAD import/3.1.2-2 ubuntu/resolute-devel ubuntu/resolute ubuntu/questing-devel ubuntu/questing ubuntu/plucky-proposed ubuntu/plucky-devel ubuntu/plucky ubuntu/devel debian/sid

Imported using git-ubuntu import.
author: Ben Finney <bignose@debian.org> 2025-03-08 14:44:43 +1100
committer: git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> 2025-03-08 10:44:16 +0000
commit: 3c7bdcfdb2ce59882e983e1e0cd7a0e65ab67890 (patch)
tree: 011ee900117d591d08bc30d5f9957ae7db7413e4
parent: faff797d2371d43adb1863c3bef6645511241f0d (diff)
11 files changed, 30 insertions, 193 deletions
diff --git a/debian/README.source b/debian/README.source
index cec76dc..459befa 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -97,7 +97,7 @@ Build the source package from VCS
 
 
 ..
-    Copyright © 2015–2024 Ben Finney <bignose@debian.org>
+    Copyright © 2015–2025 Ben Finney <bignose@debian.org>
     This is free software: you may copy, modify, and/or distribute this work
     under the terms of the GNU General Public License as published by the
     Free Software Foundation; version 3 of that license or any later version.
@@ -107,7 +107,7 @@ Build the source package from VCS
 ..
     Local variables:
     coding: utf-8
-    mode: rst
     mode: text
+    mode: rst
     End:
     vim: fileencoding=utf-8 filetype=rst :
diff --git a/debian/changelog b/debian/changelog
index f7253dd..8cd27f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+python-daemon (3.1.2-2) unstable; urgency=medium
+
+  * Declare conformance to “Standards-Version: 4.7.2”.
+    No additional changes required.
+  * Declare “Build-Depends-Indep: python3-changelog-chug”.
+    Upstream build system uses this to determine package version.
+  * debian/patches/pyproject-avoid-changelog-chug.patch:
+    * Remove patch; the dependency is now in Debian.
+  * debian/patches/series:
+    * Remove, no patches are currently applied.
+  * debian/salsa-ci.yaml:
+    * Configure Continuous Integration pipeline for Salsa forge.
+
+ -- Ben Finney <bignose@debian.org>  Sat, 08 Mar 2025 14:44:43 +1100
+
 python-daemon (3.1.2-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index a0f063d..149681b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Maintainer: Ben Finney <bignose@debian.org>
 Section: python
 Priority: optional
 Build-Depends-Indep:
+    python3-changelog-chug,
     python3-testtools <!nocheck>,
     python3-testscenarios (>= 0.4) <!nocheck>,
     python3-lockfile,
@@ -13,7 +14,7 @@ Build-Depends:
     pybuild-plugin-pyproject,
     python3-setuptools,
     debhelper-compat (= 13)
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Homepage: https://pagure.io/python-daemon/
 VCS-Git: https://salsa.debian.org/debian/pkg-python-daemon.git
 VCS-Browser: https://salsa.debian.org/debian/pkg-python-daemon/
diff --git a/debian/copyright b/debian/copyright
index f4995a5..c934dd7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,7 +29,7 @@ License-Grant:
 
 Files: debian/*
 Copyright:
-    © 2008–2024 Ben Finney <bignose@debian.org>
+    © 2008–2025 Ben Finney <bignose@debian.org>
 License: GPL-3+
 License-Grant:
     This is free software; you may copy, modify, and/or distribute this work
diff --git a/debian/patches/pyproject-avoid-changelog-chug.patch b/debian/patches/pyproject-avoid-changelog-chug.patch
deleted file mode 100644
index b3890b2..0000000
--- a/debian/patches/pyproject-avoid-changelog-chug.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Description: Avoid use of ‘changelog-chug’, not yet in Debian.
- .
- The upstream dependency ‘changelog-chug’ is not yet in Debian. It is used in
- the upstream build system to determine the version string for the package.
- .
- We alter the build parameters to hard code the version string, and remove the
- ‘changelog-chug’ dependency.
-Bug-Debian: https://bugs.debian.org/1086018
-Author: Ben Finney <bignose@debian.org>
-Last-Update: 2024-12-05
-
-diff --git old/pyproject.toml new/pyproject.toml
---- old/pyproject.toml
-+++ new/pyproject.toml
-@@ -10,6 +10,10 @@
- # Name of the Python distribution to build.
- name = "python-daemon"
- 
-+# Debian bug#1086018: This should be determined dynamically by using
-+# ‘changelog-chug’.
-+version = "3.1.2"
-+
- # Keywords to categorise this project.
- keywords = ["daemon", "fork", "unix"]
- 
-@@ -48,7 +52,6 @@ authors = [
- dynamic = [
-     "description",
-     "readme",
--    "version",
-     "maintainers",
-     ]
- 
-diff --git old/setup.py new/setup.py
---- old/setup.py
-+++ new/setup.py
-@@ -26,19 +26,14 @@ import util.packaging  # noqa: E402
- sys.path.insert(0, str(package_root_dir / "src"))
- main_module = util.packaging.main_module_by_name('daemon')
- 
--changelog_infile_path = package_root_dir.joinpath("ChangeLog")
--latest_changelog_entry = util.metadata.get_latest_changelog_entry(
--    changelog_infile_path)
- (maintainer_name, maintainer_email) = util.metadata.parse_person_field(
--    latest_changelog_entry.maintainer)
-+    "Ben Finney <ben+python@benfinney.id.au>")
- 
- description_fields = util.metadata.description_fields_from_docstring(
-     util.metadata.docstring_from_object(main_module))
- 
- 
- setup_kwargs = dict(
--        version=latest_changelog_entry.version,
--
-         # PyPI metadata.
-         description=description_fields.synopsis,
-         long_description=description_fields.long_description,
-diff --git old/test/test_util_metadata.py new/test/test_util_metadata.py
---- old/test/test_util_metadata.py
-+++ new/test/test_util_metadata.py
-@@ -12,8 +12,6 @@ import textwrap
- import testscenarios
- import testtools
- 
--import chug.model
--
- import util.metadata
- 
- from .scaffold import mock_builtin_open_for_fake_files
-@@ -288,59 +286,6 @@ class synopsis_and_description_from_docstring_TestCase(
-         expected_result = (self.expected_synopsis, self.expected_description)
-         self.assertEqual(expected_result, result)
- 
--
--class get_latest_changelog_entry_TestCase(testtools.TestCase):
--    """ Test cases for ‘get_latest_changelog_entry’ function. """
--
--    function_to_test = staticmethod(util.metadata.get_latest_changelog_entry)
--
--    def setUp(self):
--        """ Set up fixtures for this test case. """
--        super().setUp()
--
--        self.test_document_path = "/example/path/ChangeLog"
--        self.setup_mock_changelog_file(path=self.test_document_path)
--
--        self.test_args = [self.test_document_path]
--
--    def setup_mock_changelog_file(self, path):
--        fake_changelog_file_text = textwrap.dedent("""\
--            Change Log
--            ##########
--
--            Version 1.7.2
--            =============
--
--            :Released: 2020-01-10
--            :Maintainer: Cathy Morris <cathy.morris@example.com>
--
--            …
--
--            Version 1.5
--            ===========
--
--            :Released: 2019-08-04
--            :Maintainer: Luis Flores <ayalaian@example.org>
--
--            …
--            """)
--        mock_builtin_open_for_fake_files(
--            self,
--            fake_file_content_by_path={
--                path: fake_changelog_file_text,
--            })
--
--    def test_returns_expected_result(self):
--        """ Should return expected result. """
--        result = self.function_to_test(*self.test_args)
--        expected_result = chug.model.ChangeLogEntry(
--            version="1.7.2",
--            release_date="2020-01-10",
--            maintainer="Cathy Morris <cathy.morris@example.com>",
--            body="…",
--        )
--        self.assertEqual(expected_result, result)
--
- 
- # Copyright © 2008–2024 Ben Finney <ben+python@benfinney.id.au>
- #
-diff --git old/util/metadata.py new/util/metadata.py
---- old/util/metadata.py
-+++ new/util/metadata.py
-@@ -16,8 +16,6 @@ import inspect
- import pydoc
- import re
- 
--import chug.parsers.rest
--
- 
- rfc822_person_regex = re.compile(
-         r"^(?P<name>[^<]+) <(?P<email>[^>]+)>$")
-@@ -110,21 +108,6 @@ def synopsis_and_description_from_docstring(docstring):
-     (synopsis, long_description) = pydoc.splitdoc(docstring)
-     return (synopsis, long_description)
- 
--
--def get_latest_changelog_entry(infile_path):
--    """ Get the latest entry data from the changelog at `infile_path`.
--
--        :param infile_path: The filesystem path (text) from which to read the
--            change log document.
--        :return: The most recent change log entry, as a `chug.ChangeLogEntry`.
--        """
--    document_text = chug.parsers.get_changelog_document_text(infile_path)
--    document = chug.parsers.rest.parse_rest_document_from_text(document_text)
--    entries = chug.parsers.rest.make_change_log_entries_from_document(
--        document)
--    latest_entry = entries[0]
--    return latest_entry
--
- 
- # Copyright © 2008–2024 Ben Finney <ben+python@benfinney.id.au>
- #
-
-Local variables:
-coding: utf-8
-mode: diff
-time-stamp-format: "%:y-%02m-%02d"
-time-stamp-start: "^Last-Update:[ 	]+"
-time-stamp-end: "$"
-time-stamp-line-limit: 20
-End:
-vim: fileencoding=utf-8 filetype=diff :
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c864b9b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# debian/patches/series
-# Patch file names to be applied when extracting Debian source package.
-# Manual page: ‘dpkg-source(1)’, ‘quilt(1)’.
-
-pyproject-avoid-changelog-chug.patch
-
-
-# Local variables:
-# coding: utf-8
-# mode: conf
-# End:
-# vim: fileencoding=utf-8 filetype=conf :
diff --git a/debian/rules b/debian/rules
index 6cdca58..edcf34d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_auto_test:
 	dh_auto_test --buildsystem=makefile
 
 
-# Copyright © 2008–2024 Ben Finney <bignose@debian.org>
+# Copyright © 2008–2025 Ben Finney <bignose@debian.org>
 #
 # This is free software; you may copy, modify, and/or distribute this work
 # under the terms of the GNU General Public License, version 3 or later.
diff --git a/debian/salsa-ci.yaml b/debian/salsa-ci.yaml
new file mode 100644
index 0000000..23b375a
--- /dev/null
+++ b/debian/salsa-ci.yaml
@@ -0,0 +1,6 @@
+# debian/salsa-ci.yaml
+# Pipeline definition for Salsa Continuous Integration.
+# Documentation: <URL:https://salsa.debian.org/salsa-ci-team/pipeline>.
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
diff --git a/debian/tests/control b/debian/tests/control
index 5c3afe0..99b9b2c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -15,7 +15,7 @@ Depends:
     @
 
 
-# Copyright © 2016–2024 Ben Finney <bignose@debian.org>
+# Copyright © 2016–2025 Ben Finney <bignose@debian.org>
 # This is free software: you may copy, modify, and/or distribute this work
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation; version 3 of that license or any later version.
diff --git a/debian/tests/smoke-python3 b/debian/tests/smoke-python3
index 74779ef..d087ff1 100755
--- a/debian/tests/smoke-python3
+++ b/debian/tests/smoke-python3
@@ -38,7 +38,7 @@ for py in $(py3versions --supported) ; do
 done
 
 
-# Copyright © 2016–2024 Ben Finney <bignose@debian.org>
+# Copyright © 2016–2025 Ben Finney <bignose@debian.org>
 # This is free software: you may copy, modify, and/or distribute this work
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation; version 3 of that license or any later version.
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index db02d92..2b7c6b9 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -19,7 +19,7 @@ Changelog: https://pagure.io/python-daemon/blob/master/f/ChangeLog
 FAQ: https://pagure.io/python-daemon/blob/master/f/doc/FAQ
 
 
-# Copyright © 2018–2024 Ben Finney <bignose@debian.org>
+# Copyright © 2018–2025 Ben Finney <bignose@debian.org>
 #
 # This is free software; you may copy, modify, and/or distribute this work
 # under the terms of the GNU General Public License, version 3 or later.
author	Ben Finney <bignose@debian.org>	2025-03-08 14:44:43 +1100
committer	git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>	2025-03-08 10:44:16 +0000
commit	3c7bdcfdb2ce59882e983e1e0cd7a0e65ab67890 (patch)
tree	011ee900117d591d08bc30d5f9957ae7db7413e4
parent	faff797d2371d43adb1863c3bef6645511241f0d (diff)