diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.gitattributes | 1 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rw-r--r-- | debian/salsa-ci.yml | 7 |
4 files changed, 20 insertions, 1 deletions
diff --git a/debian/.gitattributes b/debian/.gitattributes new file mode 100644 index 0000000..592f8c4 --- /dev/null +++ b/debian/.gitattributes @@ -0,0 +1 @@ +/changelog merge=dpkg-mergechangelogs diff --git a/debian/changelog b/debian/changelog index bffe46f..4cd7cca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +interimap (0.5.4-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + * d/gbp.conf: Set debian-branch=debian/buster-backports. + * d/salsa-ci.yml: Set RELEASE variable to "buster-backports" + and SALSA_CI_DISABLE_VERSION_BUMP to 1. + * d/.gitattributes: New file to merge d/changelog with + dpkg-mergechangelogs(1). + + -- Guilhem Moulin <guilhem@debian.org> Wed, 16 Dec 2020 14:13:06 +0100 + interimap (0.5.4-1) unstable; urgency=medium * New upstream release. This bumps the minimum libnet-ssleay-perl version diff --git a/debian/gbp.conf b/debian/gbp.conf index 692618f..ec669a5 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,6 +1,6 @@ [DEFAULT] upstream-branch = upstream -debian-branch = debian/latest +debian-branch = debian/buster-backports upstream-tag = v%(version)s debian-tag = debian/%(version)s pristine-tar = False diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml index bd7fce1..9a036d9 100644 --- a/debian/salsa-ci.yml +++ b/debian/salsa-ci.yml @@ -15,3 +15,10 @@ reprotest: extends: .test-reprotest variables: DEB_BUILD_OPTIONS: nocheck + +variables: + RELEASE: buster-backports + + # The '+salsaci' suffix makes lintian unhappy as the version number doesn't + # end in ~bpoX+N (tag 'backports-upload-has-incorrect-version-number') + SALSA_CI_DISABLE_VERSION_BUMP: 1 |