Merge ~paelzer/ubuntu/+source/freeradius:avoid-collectd-component-mismatch into ubuntu/+source/freeradius:ubuntu/devel

[Christian Ehrhardt ]

[Sergio Durigan Junior (sergiodj)]

From what I've seen, this MP seems fine :-). I'm not officially reviewing it because I'd like someone more experienced to double check.

[Lucas Kanashiro (lucaskanashiro)]

* Changelog:
  - [-] old content and logical tag match as expected
  - [√] changelog entry correct version and targeted codename
  - [√] changelog entries correct
  - [√] update-maintainer has been run

* Actual changes:
  - [√] no upstream changes to consider
  - [√] no further upstream version to consider
  - [√] debian changes look safe

* Old Delta:
  - [-] dropped changes are ok to be dropped
  - [-] nothing else to drop
  - [-] changes forwarded upstream/debian (if appropriate)

* New Delta:
  - [√] no new patches added
  - [-] patches match what was proposed upstream
  - [-] patches correctly included in debian/patches/series
  - [-] patches have correct DEP3 metadata

* Build/Test:
  - [√] build is ok
  - [-] verified PPA package installs/uninstalls
  - [-] autopkgtest against the PPA package passes
  - [√] sanity checks test fine

+1. I agree with Sergio, LGTM. There is no PPA but I built it locally and it seems fine.

review: Approve

[Christian Ehrhardt  (paelzer)]

He, I had the PPA but the update to the MP pointing to it got a timeout and I didn't look for it again.

=> https://bileto.ubuntu.com/#/ticket/4064
=> https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4064/+packages

[Christian Ehrhardt  (paelzer)]

All teste except i386 are good.
https://bileto.ubuntu.com/excuses/4064/groovy.html

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/ubuntu/+source/freeradius
 * [new tag] upload/3.0.21+dfsg-1ubuntu1 -> upload/3.0.21+dfsg-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading freeradius_3.0.21+dfsg-1ubuntu1.dsc: done.
  Uploading freeradius_3.0.21+dfsg.orig.tar.xz: done.
  Uploading freeradius_3.0.21+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading freeradius_3.0.21+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading freeradius_3.0.21+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 1d56a48..6e85a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+freeradius (3.0.21+dfsg-1ubuntu1) groovy; urgency=medium
+
+  * d/control: Drop collectd integration for being in universe (LP: #1878778)
+  * Merging this will also satisfy (LP: #1870340) asking for 3.0.21+dfsg-1
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 15 May 2020 10:27:59 +0200
+
 freeradius (3.0.21+dfsg-1) unstable; urgency=medium
 
   [ Bernhard Schmidt ]
diff --git a/debian/control b/debian/control
index 9f2f926..d8bc1d7 100644
--- a/debian/control
+++ b/debian/control
@@ -29,13 +29,13 @@ Build-Depends: debhelper (>= 10.6),
  python3-dev,
  samba-dev | samba4-dev,
  libpcre3-dev,
- libcollectdclient-dev,
  snmp,
  dh-autoreconf,
  freetds-dev
 Section: net
 Priority: optional
-Maintainer: Debian FreeRADIUS Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian FreeRADIUS Packaging Team <[e-mail]>
 Uploaders: Mark Hymers <[e-mail]>,
  Sam Hartman <[e-mail]>,
  Bernhard Schmidt <[e-mail]>