Merge ~lucaskanashiro/ubuntu/+source/pollinate:merge_4.33-3 into ubuntu/+source/pollinate:debian/sid

[Lucas Kanashiro]

Merge version 4.33-3 from Debian. Debian maintainer didn't introduce many changes in this release, so this is a quite straightforward merge. I dropped just the debian/watch file we have in our delta (it was added in Debian), the rest remains the same:

  * d/p/replace-lsb-release.patch: removed as it's Debian specific
  * Use the Ubuntu entropy server and certificate:
    - d/pollinate.default: use entropy.ubuntu.com and its certificate
    - d/pollinate.install: install the ubuntu.entropy.com certificate
  * d/control: add breaks/replaces on pollen 4.21-1 which is when the
    check_pollen script moved out of pollen. Case #9 of package transition.
    [Can be dropped after 20.04]

It built fine in this PPA: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-pollinate-merge

[Christian Ehrhardt  (paelzer)]

TBH I doubt this is worth the effort to merge it.
The source upload doesn't matter to us and d/watch addition isn't really important.

Well, you have done the work already, so we can as well make use of it and sponsor (if you want).

But going forward I'd ask you to require a certain minimum gain for Ubuntu in doing a merge.
I'd (personally) not have had an issue marking this "done - nothing important" without doing anything. Feel free to catch me on IRC to discuss if you want.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

I thought merging a version reducing a bit the delta would worth, but as you said the gain is minimal. I'll take more care next time. Regarding the sponsoring it's fine to leave as it is and mark as done.

Thanks anyway!

[Christian Ehrhardt  (paelzer)]

This is fine still, I was just saying if you have two options chose the one with more tech-debt to resolve :-) This never the less is a help as many small things sum up as well.
Thanks and sponsoring ...

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/pollinate
 * [new tag] upload/4.33-3ubuntu1 -> upload/4.33-3ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading pollinate_4.33-3ubuntu1.dsc: done.
  Uploading pollinate_4.33-3ubuntu1.debian.tar.xz: done.
  Uploading pollinate_4.33-3ubuntu1_source.buildinfo: done.
  Uploading pollinate_4.33-3ubuntu1_source.changes: done.
Successfully uploaded packages.

[Bryce Harrington (bryce)]

This has migrated to focal

diff --git a/debian/changelog b/debian/changelog
index e509c8b..f2001d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+pollinate (4.33-3ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/p/replace-lsb-release.patch: removed as it's Debian specific
+    - Use the Ubuntu entropy server and certificate:
+      + d/pollinate.default: use entropy.ubuntu.com and its certificate
+      + d/pollinate.install: install the ubuntu.entropy.com certificate
+    - d/control: add breaks/replaces on pollen 4.21-1 which is when the
+      check_pollen script moved out of pollen. Case #9 of package transition.
+      [Can be dropped after 20.04]
+  * Dropped:
+    - d/watch: add watch file pointing at launchpad
+      [Fixed upstream]
+
+ -- Lucas Kanashiro <[e-mail]>  Tue, 19 Nov 2019 18:34:55 -0300
+
 pollinate (4.33-3) unstable; urgency=medium
 
   * upload source package
@@ -5,6 +21,19 @@ pollinate (4.33-3) unstable; urgency=medium
 
  -- Thorsten Alteholz <[e-mail]>  Mon, 19 Aug 2019 22:20:00 +0000
 
+pollinate (4.33-2ubuntu1) eoan; urgency=medium
+
+  * d/p/replace-lsb-release.patch: removed as it's Debian specific
+  * Use the Ubuntu entropy server and certificate:
+    - d/pollinate.default: use entropy.ubuntu.com and its certificate
+    - d/pollinate.install: install the ubuntu.entropy.com certificate
+  * d/watch: add watch file pointing at launchpad
+  * d/control: add breaks/replaces on pollen 4.21-1 which is when the
+    check_pollen script moved out of pollen. Case #9 of package transition.
+    [Can be dropped after 20.04]
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 21 May 2019 10:42:07 -0300
+
 pollinate (4.33-2) unstable; urgency=medium
 
   * debian/control: add salsa VCS URLs
diff --git a/debian/control b/debian/control
index 2f81f34..94c8317 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: pollinate
 Section: admin
 Priority: optional
-Maintainer: Thorsten Alteholz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Thorsten Alteholz <[e-mail]>
 Build-Depends: debhelper (>= 11)
 Standards-Version: 4.3.0
 Homepage: http://launchpad.net/pollinate
@@ -11,6 +12,8 @@ Vcs-Git: https://salsa.debian.org/alteholz/pollinate.git
 Package: pollinate
 Architecture: all
 Depends: ${misc:Depends}, curl, adduser, xxd | vim-common
+Breaks: pollen (<< 4.21-1)
+Replaces: pollen (<< 4.21-1)
 Description: seed the pseudo random number generator
  This client will connect to one or more Pollen (entropy-as-a-service)
  servers over an (optionally) encrypted connection and retrieve a random
diff --git a/debian/patches/replace-lsb-release.patch b/debian/patches/replace-lsb-release.patch
deleted file mode 100644
index 9eb7218..0000000
--- a/debian/patches/replace-lsb-release.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: in Debian there is no /etc/lsb-release
-Author: Thorsten Alteholz <[e-mail]>
-Index: pollinate-4.33/pollinate
-===================================================================
---- pollinate-4.33.orig/pollinate	2018-05-29 22:13:20.000000000 +0200
-+++ pollinate-4.33/pollinate	2019-02-06 16:12:12.298990019 +0100
-@@ -187,7 +187,7 @@
- 	# Construct a user agent, with useful debug information
- 	# Very similar to Firefox and Chrome
- 	
--	. /etc/lsb-release
-+	DISTRIB_DESCRIPTION="Debian `cat /etc/debian_version`"
- 
- 	local pkg_info="" lsb="" platform="" cpu="" up="NA" idle="NA" uptime
- 	read_package_versions && pkg_info="$_RET"
diff --git a/debian/patches/series b/debian/patches/series
index f1852fe..a07d0a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 check-pollen-to-pollinate.patch
-replace-lsb-release.patch
diff --git a/debian/pollinate.default b/debian/pollinate.default
index 5bec75e..6b70433 100644
--- a/debian/pollinate.default
+++ b/debian/pollinate.default
@@ -5,9 +5,6 @@ BINARY=1
 QUIET=0
 WAIT=10
 DEVICE="/dev/urandom"
-#
-# plese use this SERVER only for testing 
-#SERVER="https://pollen.debian.alteholz.net/"
-SERVER="https://pollen.example.com/"
+SERVER="https://entropy.ubuntu.com/"
 POOL=""
-CURL_OPTS=""
+CURL_OPTS="--cacert /etc/pollinate/entropy.ubuntu.com.pem --capath /dev/null"
diff --git a/debian/pollinate.install b/debian/pollinate.install
index 7873cdc..4f32892 100644
--- a/debian/pollinate.install
+++ b/debian/pollinate.install
@@ -1,2 +1,3 @@
 pollinate /usr/bin/
+entropy.ubuntu.com.pem /etc/pollinate/
 check_pollen /usr/lib/nagios/plugins/