Merge ~mirespace/ubuntu/+source/freeipmi:merge-freeipmi_1.6.6-4-impish into ubuntu/+source/freeipmi:ubuntu/devel

[Miriam España Acebal]

** This is a SYNC, but doing the MP for documentation purposes... thanks in advance for your understanding and the teaching! **

Hi team, the PPA for this is here: https://launchpad.net/~mirespace/+archive/ubuntu/merge-freeipmi-1.6.6-4-impish .

The package has been built both in its merge-proposed version (uploaded to PPA) and in its direct debian upstream version (locally) and no issues have been found. The package has no tests.

Usual tags are also present:

logical/1.6.6-3ubuntu1
new/debian
old/debian
old/ubuntu
reconstruct/1.6.6-3ubuntu1
split/1.6.6-3ubuntu1

Anyway, this is a sync because we have no delta since the patch in 1.6.6-3ubuntu1 has been incorporated to 1.6.6-4 debian version. Checking the changelog for the latest:

- https://tracker.debian.org/news/1245218/accepted-freeipmi-166-4-source-into-unstable/
- https://bugs.launchpad.net/ubuntu/+source/freeipmi/+bug/1926299

 So, don't sponsor this upload : asking for a sync request instead... thanks!

[Christian Ehrhardt  (paelzer)]

Hi,
grabbing this review ...

[Christian Ehrhardt  (paelzer)]

So this is indeed a sync and I'll sync it after this, but we still can do the review to identify things to improve next time.

1. there was no review slot for anyone else but canonical-server, since reviewing consumes those that isn't enough. You'd usually want to also add one for canonical-server-packageset-reviewers or canonical-server-core-reviewers

2. target branch for a merge from Debian is debian/sid and not as done here ubuntu/devel
   That also explains the odd visualization in the LP preview

3. I checked the build in the PPA
   It is sadly only x86 (you'd usually want all arches we build on the real upload) and
   without proposed configured (so it built with glibc 2.33 instead of the new one).
   The build is good to be done, but the closer you are to the real build on an upload/sync the
   better.

The changelog is a common place for mistakes, but I must say if we would upload (and not sync) this it LGTM - thanks!

+1 to sync this

review: Approve

[Christian Ehrhardt  (paelzer)]

Synced

$ syncpackage -r impish-proposed -d unstable -v freeipmi --force
Source package freeipmi is temporarily blacklisted (blacklisted_current). Ubuntu ignores these for now. See also LP: #841372
Source freeipmi -> impish/Proposed: current version 1.6.6-3ubuntu1, new version 1.6.6-4
New changes:
freeipmi (1.6.6-4) unstable; urgency=medium

  [ Andreas Beckmann ]
  * Use absolute symlink targets for symlink_to_dir, the maintainer scripts in
    jessie converted the doc directories to absolute symlinks.
    (Closes: #991604)

  [ Fabio Fantoni ]
  * d/p/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
    incorrect sensor reading reported (LP: #1926299)

 -- Fabio Fantoni <email address hidden> Wed, 28 Jul 2021 16:41:51 +0200
Sync this package [y|N]? y
Request succeeded; you should get an e-mail once it is processed.

Please check build/migration in the next days/hours ...

[Utkarsh Gupta (utkarsh)]

On a quick look, something seems wrong, maybe needs a proper rebase or something. The web UI shows a lot of stuff that needs fixing but I guess Christian's gonna review so I'll leave it to him.

[Utkarsh Gupta (utkarsh)]

Aaaaah, he already commented. Okeydoke, sorry didn't refresh that.

[Utkarsh Gupta (utkarsh)]

Oh wait, I am so late. I can see Christian's comments on the mail but not here. Weird. But yay, already synced! \o/

[Miriam España Acebal (mirespace)]

Hello,

> So this is indeed a sync and I'll sync it after this, but we still can do the
> review to identify things to improve next time.
>
> 1. there was no review slot for anyone else but canonical-server, since
> reviewing consumes those that isn't enough. You'd usually want to also add one
> for canonical-server-packageset-reviewers or canonical-server-core-reviewers

Annotated

> 2. target branch for a merge from Debian is debian/sid and not as done here
> ubuntu/devel
> That also explains the odd visualization in the LP preview
>

Annotated 2

Make a note (for myself in the future): For merge MP, look here https://github.com/canonical/ubuntu-maintainers-handbook/blob/master/PackageMerging.md#submit-merge-proposal not here https://github.com/kstenerud/ubuntu-maintainers-handbook/blob/master/MergeProposal.md#open-a-merge-proposal.

(I always put all the stuff in the Commit message not in the Descrition part and then I'm going to check on UMH what textbox is the correct one before submitting -shame on me-)

> 3. I checked the build in the PPA
> It is sadly only x86 (you'd usually want all arches we build on the real
> upload) and
> without proposed configured (so it built with glibc 2.33 instead of the new
> one).
> The build is good to be done, but the closer you are to the real build on
> an upload/sync the
> better.

Totally forgot to activate the other builds in the PPA. Indeed, I waste a lot of time because I was trying to upload the debian upstream package to the PPA... until I realized I can't do that because I can't sign that :facepalm:)

> The changelog is a common place for mistakes, but I must say if we would
> upload (and not sync) this it LGTM - thanks!
>

:) Thanks a lot! As it was my common place to fail, I took great care of it... now I will do in the others aspects also (I hope so)!

> +1 to sync this

[Christian Ehrhardt  (paelzer)]

FYI - blocked on libc

freeipmi (1.6.6-3ubuntu1 to 1.6.6-4)
Migration status for freeipmi (1.6.6-3ubuntu1 to 1.6.6-4): BLOCKED: Cannot migrate due to another item, which is blocked (please check which dependencies are stuck)
Issues preventing migration:
Depends: freeipmi glibc (not considered)
Invalidated by dependency
Additional info:
4 days old

[Bryce Harrington (bryce)]

This sync has migrated successfully.

 freeipmi | 1.6.6-3 | hirsute
 freeipmi | 1.6.6-4 | impish
 freeipmi | 1.6.6-4 | unstable

diff --git a/debian/changelog b/debian/changelog
index 9b419fe..d760dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+<<<<<<< debian/changelog
+=======
+freeipmi (1.6.6-4ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+  * Dropped Changes:
+    - d/p/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
+      incorrect sensor reading reported (LP: #1926299)
+      [Fixed in 1.6.6-4]
+
+ -- Miriam España Acebal <[e-mail]>  Thu, 12 Aug 2021 09:47:08 +0200
+
+freeipmi (1.6.6-4) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Use absolute symlink targets for symlink_to_dir, the maintainer scripts in
+    jessie converted the doc directories to absolute symlinks.
+    (Closes: #991604)
+
+  [ Fabio Fantoni ]
+  * d/p/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
+    incorrect sensor reading reported (LP: #1926299)
+
+ -- Fabio Fantoni <[e-mail]>  Wed, 28 Jul 2021 16:41:51 +0200
+
+>>>>>>> debian/changelog
 freeipmi (1.6.6-3ubuntu1) impish; urgency=medium
 
   * d/p/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
diff --git a/debian/control b/debian/control
index 20f5d9c..3c9b71d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: freeipmi
 Section: admin
 Priority: optional
-Maintainer: Fabio Fantoni <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Fabio Fantoni <[e-mail]>
 Uploaders: Bernd Zeimetz <[e-mail]>
 Build-Depends:
  chrpath,
diff --git a/debian/freeipmi-bmc-watchdog.maintscript b/debian/freeipmi-bmc-watchdog.maintscript
index 79cc159..8bc6b9f 100644
--- a/debian/freeipmi-bmc-watchdog.maintscript
+++ b/debian/freeipmi-bmc-watchdog.maintscript
@@ -1,2 +1,2 @@
 rm_conffile /etc/init.d/bmc-watchdog 1.6.4-3.1~
-symlink_to_dir /usr/share/doc/freeipmi-bmc-watchdog freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/freeipmi-bmc-watchdog /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/freeipmi-ipmidetect.maintscript b/debian/freeipmi-ipmidetect.maintscript
index ab53570..aea40a5 100644
--- a/debian/freeipmi-ipmidetect.maintscript
+++ b/debian/freeipmi-ipmidetect.maintscript
@@ -1,3 +1,3 @@
 rm_conffile /etc/default/ipmidetectd 1.6.4-4~ freeipmi-ipmidetect
 rm_conffile /etc/init.d/ipmidetectd 1.6.4-3.1~
-symlink_to_dir /usr/share/doc/freeipmi-ipmidetect freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/freeipmi-ipmidetect /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/freeipmi-ipmiseld.maintscript b/debian/freeipmi-ipmiseld.maintscript
index 803770b..cf8c7fa 100644
--- a/debian/freeipmi-ipmiseld.maintscript
+++ b/debian/freeipmi-ipmiseld.maintscript
@@ -1,2 +1,2 @@
 rm_conffile /etc/init.d/ipmiseld 1.6.4-3.1~
-symlink_to_dir /usr/share/doc/freeipmi-ipmiseld freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/freeipmi-ipmiseld /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/freeipmi-tools.maintscript b/debian/freeipmi-tools.maintscript
index 62c711a..fb79d58 100644
--- a/debian/freeipmi-tools.maintscript
+++ b/debian/freeipmi-tools.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/freeipmi-tools freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/freeipmi-tools /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/freeipmi.maintscript b/debian/freeipmi.maintscript
index 359c965..2245321 100644
--- a/debian/freeipmi.maintscript
+++ b/debian/freeipmi.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/freeipmi freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/freeipmi /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libfreeipmi-dev.maintscript b/debian/libfreeipmi-dev.maintscript
index e4105f3..484ad32 100644
--- a/debian/libfreeipmi-dev.maintscript
+++ b/debian/libfreeipmi-dev.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libfreeipmi-dev freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libfreeipmi-dev /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libfreeipmi17.maintscript b/debian/libfreeipmi17.maintscript
index 7c0f60a..f1ad780 100644
--- a/debian/libfreeipmi17.maintscript
+++ b/debian/libfreeipmi17.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libfreeipmi17 freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libfreeipmi17 /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libipmiconsole-dev.maintscript b/debian/libipmiconsole-dev.maintscript
index 26a11a5..b9d071d 100644
--- a/debian/libipmiconsole-dev.maintscript
+++ b/debian/libipmiconsole-dev.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libipmiconsole-dev freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libipmiconsole-dev /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libipmiconsole2.maintscript b/debian/libipmiconsole2.maintscript
index 05ca45b..1a11d72 100644
--- a/debian/libipmiconsole2.maintscript
+++ b/debian/libipmiconsole2.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libipmiconsole2 freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libipmiconsole2 /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libipmidetect-dev.maintscript b/debian/libipmidetect-dev.maintscript
index 1fd8d0a..57c1cc7 100644
--- a/debian/libipmidetect-dev.maintscript
+++ b/debian/libipmidetect-dev.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libipmidetect-dev freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libipmidetect-dev /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libipmidetect0.maintscript b/debian/libipmidetect0.maintscript
index b2dc2a0..c54d022 100644
--- a/debian/libipmidetect0.maintscript
+++ b/debian/libipmidetect0.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libipmidetect0 freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libipmidetect0 /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libipmimonitoring-dev.maintscript b/debian/libipmimonitoring-dev.maintscript
index ed7775f..2caff83 100644
--- a/debian/libipmimonitoring-dev.maintscript
+++ b/debian/libipmimonitoring-dev.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libipmimonitoring-dev freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libipmimonitoring-dev /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/libipmimonitoring6.maintscript b/debian/libipmimonitoring6.maintscript
index e7f86d7..c8ba359 100644
--- a/debian/libipmimonitoring6.maintscript
+++ b/debian/libipmimonitoring6.maintscript
@@ -1 +1 @@
-symlink_to_dir /usr/share/doc/libipmimonitoring6 freeipmi-common 1.6.4-3~
+symlink_to_dir /usr/share/doc/libipmimonitoring6 /usr/share/doc/freeipmi-common 1.6.6-4~
diff --git a/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch b/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
index 45ca993..54a4d5d 100644
--- a/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
+++ b/debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
@@ -1,7 +1,12 @@
 From: Heather Lemon <[e-mail]>
 Date: Wed, 19 May 2021 08:19:03 -0600
+<<<<<<< debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
 Subject: [PATCH] libfreeipmi/ipmi-sensor-read.c: Incorrect sensor 
 reading reported. The ipmi-sensors command 
+=======
+Subject: [PATCH] libfreeipmi/ipmi-sensor-read.c: Incorrect sensor
+reading reported. The ipmi-sensors command
+>>>>>>> debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
 reads the wrong temperature sensor on a Lenovo BMC.
 When the LUN number is not the default (00b) the sensor is reporting
 back an incorrect temperature reading.
@@ -33,7 +38,11 @@ Index: freeipmi-1.6.6/ChangeLog
 +	otherwise specified via the ipmiV2.0 spec and must be accessed via LUN 00b.
 +
  2020-09-03 Christian Ehrhardt <[e-mail]>
+<<<<<<< debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
  
+=======
+
+>>>>>>> debian/patches/libfreeipmi-ipmi-sensor-read.c-Incorrect-sensor-read.patch
  	* libfreeipmi/locate/ipmi-locate-acpi-spmi.c
 Index: freeipmi-1.6.6/libfreeipmi/sensor-read/ipmi-sensor-read.c
 ===================================================================