diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2021-03-01 22:29:12 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2021-03-01 22:29:12 +0100 |
| commit | 757304ce49f7b9335132be53e8162cce89e85033 (patch) | |
| tree | 59f317fb7fabbfff52fdd041c614f9156fdc74c7 /debian | |
| parent | db391379e175aa742e390aab24dcf224a8a97e88 (diff) | |
| parent | 16b905aabc9b8700b937dd1541d52ea0df2f3a0e (diff) | |
Merge tag '2.2.1'
apt Debian release 2.2.1
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 9d3113009..b5d79119d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +apt (2.2.1) unstable; urgency=medium + + [ Julian Andres Klode ] + * Do not require force-loopbreak on Protected packages (Closes: #983014) + * Branch of as 2.2.y for bullseye + * configuration: Add missing #include <array> + * Remove .travis.yml, we are using GitLab CI these days + * RunScripts: Do not reset SIGQUIT and SIGINT to SIG_DFL (LP: #1898026) + * regression fix: do require force-loopbreak for Conflicts + + [ Алексей Шилин ] + * Russian translation update (Closes: #983348) + + -- Julian Andres Klode <jak@debian.org> Mon, 01 Mar 2021 22:27:55 +0100 + apt (2.2.0) unstable; urgency=medium * The "Happy soft freeze" release diff --git a/debian/gbp.conf b/debian/gbp.conf index a5e885896..6c85f91b1 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,7 +3,7 @@ ;preexport = ./prepare-release pre-export prebuild = ./prepare-release pre-build postbuild = ./prepare-release post-build -debian-branch = master +debian-branch = 2.2.y debian-tag = %(version)s export-dir = ../build-area sign-tags = True |