diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | debian/changelog | 71 | ||||
| -rw-r--r-- | docs/manpages/gbp-buildpackage.xml | 2 | ||||
| -rw-r--r-- | gbp/scripts/import_ref.py | 2 | ||||
| -rw-r--r-- | packaging/git-buildpackage.spec | 2 | ||||
| -rw-r--r-- | tests/11_test_dch_main.py | 6 | ||||
| -rw-r--r-- | tests/doctests/test_Changelog.py | 12 |
7 files changed, 84 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 90584be..4f567c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: python services: - docker -dist: bionic +dist: focal python: - "3.6" diff --git a/debian/changelog b/debian/changelog index 7304503..bf4d547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,74 @@ +git-buildpackage (0.9.21) unstable; urgency=medium + + [ Guido Günther ] + * [bd15730] docs: Drop --git- from dch invocation. + Thanks Pierre Equoy + * [7179893] docs: Clarify that only tarball creation is affected. + Thanks to Pierre Equoy + * [1d922d7] policy: Fix typos. + Thanks to Andrius Merkys (Closes: #966130) + * [16b8817] spec: Include the correct file + export_ref.py does not exist. + * [fd35de0] spec: Don't fail on empty cache dir + * [df9bae2] autopkgtest: Pass RPM macros on command line. + This avoids the need to modify files in the home directory. + * [53501b5] smoketest: Avoid writing to .. + Use a temporary directory to avoid 'allow-root'. + * [4e5fc40] autopkgtests: Depend on @builddep@ + Otherwise gbp is not able to build itself. + Thanks to Lukas Märdian for the detailed report + (Closes: #968982) + * [504dda3] test_import_orig: Fix typo + * [c09d629] test_import_orig: Drop unused variable. + This makes flake8 happy + * [73492e1] salsa-ci: Skip reprotest. + It triggers a test failure since a test can write to a + destination it should not be able to write too. + * [c02938f] docs: Add example for exporting the source tree. + See #969952 + * [657b005] buildpackage: Fix tests and test arch override + * [cc5e85b] import-ref: Fix help. + We want an upstream version, not path + * [680e9ec] gitlab-ci: Use a more recent Ubuntu LTS + * [e085ab9] tests: Fixup changelog test on Ubuntu. + The keys in os-release differ from lsb-release + + [ Marco Trevisan (Treviño) ] + * [9fc3f1b] import-orig: expose unpacked sources dir to the postunpack hook. + Use an $GBP_SOURCES_DIR to expose the post-unpack sources dir to the hook. + Include a test that checks that all the expected env variables are set. + * [297c5ff] import-orig: Allow the post-unpack hook to filter tarball files. + With post-unpack scripts is currently possible to filter out files that + are not needed from the upstream branch, however it is not possible to use it + to filter files that will end up in the orig file, and in some scenarios + this is not easily doable just using a filter list. + So, run the post-unpack hook just after unpacking and before repacking the + tar. (Closes: #812721) + + [ Richard Laager ] + * [0f8f550] import-orig: Fix a comment typo + * [707ebdf] import-orig: Refactor vcs_tag_parent. + This eliminates an indentation level. + * [064834b] import-orig: Refactor vcs_tag_parent. + This makes the "tag" variable just the tag. This improves the + human-readability of the error message if the tag cannot be found. + + [ Heiko Schlittermann ] + * [d9e4734] buildpackage: Honor --git-arch for GBP_CHANGES_FILE + (Closes: #941345) + + [ Chris Lamb ] + * [8734ed3] docs: Correct "option" typo in gbp-buildpackage manpage + (Closes: #972081) + + [ nicoo ] + * [a2a3085] tests/11_test_dch_main.py: Don't expect /etc/lsb-release on + Debian + * [0916529] doctests/test_Changelog: Don't expect /etc/lsb-release + (Closes: #976914) + + -- Guido Günther <agx@sigxcpu.org> Thu, 07 Jan 2021 11:28:00 +0100 + git-buildpackage (0.9.20) unstable; urgency=medium * [e513375] doctest: Ignore exception detail. diff --git a/docs/manpages/gbp-buildpackage.xml b/docs/manpages/gbp-buildpackage.xml index 073f0fb..972aa31 100644 --- a/docs/manpages/gbp-buildpackage.xml +++ b/docs/manpages/gbp-buildpackage.xml @@ -709,7 +709,7 @@ source formats. </para> <para> - This optios allows one to keep only the debian/ dir in the version + This option allows one to keep only the debian/ dir in the version control system. </para> </listitem> diff --git a/gbp/scripts/import_ref.py b/gbp/scripts/import_ref.py index fcc10bf..74f3a2e 100644 --- a/gbp/scripts/import_ref.py +++ b/gbp/scripts/import_ref.py @@ -59,7 +59,7 @@ def get_commit_and_version_to_merge(repo, options): def build_parser(name): try: parser = GbpOptionParserDebian(command=os.path.basename(name), prefix='', - usage='%prog [options] /path/to/upstream-version.tar.gz | --uscan') + usage='%prog [options] -u<upstream-version>') except GbpError as err: gbp.log.err(err) return None diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec index 577b89b..1d09c00 100644 --- a/packaging/git-buildpackage.spec +++ b/packaging/git-buildpackage.spec @@ -3,7 +3,7 @@ Name: git-buildpackage Summary: Build packages from git -Version: 0.9.20 +Version: 0.9.21 Release: 0 Group: Development/Tools/Building License: GPLv2 diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py index 14cf593..dbd8287 100644 --- a/tests/11_test_dch_main.py +++ b/tests/11_test_dch_main.py @@ -15,11 +15,11 @@ import re default_urgency = get_dch_default_urgency() # For Ubuntu compatibility -os_release = OsReleaseFile('/etc/lsb-release') +os_release = OsReleaseFile() # OS release codename and snapshot of version 0.9-2~1 -if os_release['DISTRIB_ID'] == 'Ubuntu': - os_codename = os_release['DISTRIB_CODENAME'] +if os_release['ID'] == 'Ubuntu': + os_codename = os_release['UBUNTU_CODENAME'] snap_header_0_9 = r'^test-package\s\(0.9-1ubuntu1~1\.gbp([0-9a-f]{6})\)\sUNRELEASED;\surgency=%s' % default_urgency new_version_0_9 = '0.9-1ubuntu1' else: diff --git a/tests/doctests/test_Changelog.py b/tests/doctests/test_Changelog.py index 1fb8a30..28138ae 100644 --- a/tests/doctests/test_Changelog.py +++ b/tests/doctests/test_Changelog.py @@ -262,7 +262,7 @@ def test_add_section(): >>> import shutil >>> import gbp.deb.changelog >>> from ..testutils import OsReleaseFile - >>> os_release = OsReleaseFile('/etc/lsb-release') + >>> os_release = OsReleaseFile() >>> olddir = os.path.abspath(os.path.curdir) >>> testdir = tempfile.mkdtemp(prefix='gbp-test-changelog-') >>> testdebdir = os.path.join(testdir, 'debian') @@ -277,12 +277,12 @@ def test_add_section(): >>> cl = gbp.deb.changelog.ChangeLog(filename=testclname) >>> cl.add_section(msg=["Test add section"], distribution=None, author="Debian Maintainer", email="maint@debian.org") >>> cl = gbp.deb.changelog.ChangeLog(filename=testclname) - >>> version = '0.5.32ubuntu1' if os_release['DISTRIB_ID'] == 'Ubuntu' else '0.5.33' + >>> version = '0.5.32ubuntu1' if os_release['ID'] == 'ubuntu' else '0.5.33' >>> cl.version == version True >>> cl.debian_version == version True - >>> distributions = ['UNRELEASED', os_release['DISTRIB_CODENAME'] or 'unstable'] + >>> distributions = ['UNRELEASED', os_release['VERSION_CODENAME'] or 'unstable'] >>> cl['Distribution'] in distributions True >>> 'Test add section' in cl['Changes'] @@ -309,7 +309,7 @@ def test_add_entry(): >>> import shutil >>> import gbp.deb.changelog >>> from ..testutils import OsReleaseFile - >>> os_release = OsReleaseFile('/etc/lsb-release') + >>> os_release = OsReleaseFile() >>> olddir = os.path.abspath(os.path.curdir) >>> testdir = tempfile.mkdtemp(prefix='gbp-test-changelog-') >>> testdebdir = os.path.join(testdir, 'debian') @@ -325,12 +325,12 @@ def test_add_entry(): >>> cl.add_section(msg=["Test add section"], distribution=None, author="Debian Maintainer", email="maint@debian.org") >>> cl.add_entry(msg=["Test add entry"], author="Debian Maintainer", email="maint@debian.org") >>> cl = gbp.deb.changelog.ChangeLog(filename=testclname) - >>> version = '0.5.32ubuntu1' if os_release['DISTRIB_ID'] == 'Ubuntu' else '0.5.33' + >>> version = '0.5.32ubuntu1' if os_release['ID'] == 'ubuntu' else '0.5.33' >>> cl.version == version True >>> cl.debian_version == version True - >>> distributions = ['UNRELEASED', os_release['DISTRIB_CODENAME'] or 'unstable'] + >>> distributions = ['UNRELEASED', os_release['VERSION_CODENAME'] or 'unstable'] >>> cl['Distribution'] in distributions True >>> 'Test add entry' in cl['Changes'] |