Merge ~sergiodj/ubuntu/+source/openipmi:merge-2.0.33-1-kinetic into ubuntu/+source/openipmi:debian/sid

[Sergio Durigan Junior]

This is the merge of openipmi 2.0.33-1 from Debian unstable. This merge will actually be a sync, so this MP is just a formality in order to demonstrate that our delta has been successfully incorporated by upstream:

https://sourceforge.net/p/openipmi/code/merge-requests/6/

You can find a PPA with the proposed changes here:

https://launchpad.net/~sergiodj/+archive/ubuntu/openipmi-merge

This package doesn't have dep8 tests; I've performed the regular install/upgrade/remove operations instead.

[Bryce Harrington (bryce)]

Sync LGTM, +1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: sergiodj, bryce
Uploaders: sergiodj, bryce
MP auto-approved

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Monday, August 01 2022, Bryce Harrington wrote:

> Review: Approve
>
> Sync LGTM, +1

Thanks, Bryce. Sync'ed.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 1dd541c..a8d1772 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+openipmi (2.0.33-1ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971303). Remaining changes:
+  * Dropped changes:
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config file:
+      Upstream's OpenIPMIpthread.pc.in file passes "-pthread" on
+      CFLAGS, but not on LDFLAGS.  Even though this might be OK, GCC
+      recommends that, when "-pthread" is used, it should be passed on
+      CFLAGS and LDFLAGS.  This patch does that.
+      [ Incorporated by upstream. ]
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 01 Aug 2022 15:18:09 -0400
+
 openipmi (2.0.33-1) unstable; urgency=medium
 
   * new upstream release from 2022-07-07
@@ -11,6 +24,54 @@ openipmi (2.0.33-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Tue, 19 Jul 2022 09:42:06 +0200
 
+openipmi (2.0.29-0.1ubuntu6) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 24 Mar 2022 17:28:31 +0100
+
+openipmi (2.0.29-0.1ubuntu5) jammy; urgency=medium
+
+  * No-change rebuild against openssl3
+
+ -- Simon Chopin <[e-mail]>  Tue, 07 Dec 2021 15:08:35 +0000
+
+openipmi (2.0.29-0.1ubuntu4) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:21:56 +0200
+
+openipmi (2.0.29-0.1ubuntu3) hirsute; urgency=medium
+
+  * No-change upload to build against net-snmp on armhf.
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 07 Jan 2021 20:06:37 -0500
+
+openipmi (2.0.29-0.1ubuntu2) hirsute; urgency=medium
+
+  * No-change upload due to net-snmp transition.
+
+ -- Sergio Durigan Junior <[e-mail]>  Thu, 07 Jan 2021 15:05:06 -0500
+
+openipmi (2.0.29-0.1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config file:
+      Upstream's OpenIPMIpthread.pc.in file passes "-pthread" on
+      CFLAGS, but not on LDFLAGS.  Even though this might be OK, GCC
+      recommends that, when "-pthread" is used, it should be passed on
+      CFLAGS and LDFLAGS.  This patch does that.
+  * Dropped changes, accepted by Debian.
+    - d/openipmi.init: fix various issues identified upstream (LP #1844448)
+    - New upstream release 2.0.27
+    - d/rules: disable the now default-on python support
+    - d/control: now needs libreadline-dev as build-depends
+    - d/p/sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch:
+      fix readline include in ipmi_serial_bmc_emu.c
+
+ -- Sergio Durigan Junior <[e-mail]>  Wed, 05 Aug 2020 13:07:18 -0400
+
 openipmi (2.0.29-0.1) unstable; urgency=medium
 
   [ Sergio Durigan Junior ]
@@ -46,6 +107,32 @@ openipmi (2.0.29-0.1) unstable; urgency=medium
 
  -- Sergio Durigan Junior <[e-mail]>  Tue, 07 Jul 2020 22:28:53 -0400
 
+openipmi (2.0.27-0ubuntu2) focal; urgency=medium
+
+  * Rebuild for libsnmp35.
+
+ -- Rafael David Tinoco <[e-mail]>  Tue, 14 Jan 2020 18:04:48 +0000
+
+openipmi (2.0.27-0ubuntu1) focal; urgency=medium
+
+  * New upstream release 2.0.27
+    - d/rules: disable the now default-on python support
+    - d/control: now needs libreadline-dev as build-depends
+    - d/p/sample-fix-readline-include-in-ipmi_serial_bmc_emu.c.patch: fix
+      FTBFS due to readline include in ipmi_serial_bmc_emu.c
+  * d/openipmi.init: fix various issues identified upstream (LP: #1844448)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 28 Nov 2019 14:12:35 +0100
+
+openipmi (2.0.25-2.1ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
+      pthread.pc does not exist in Ubuntu.  Thanks to Simon McVittie
+      <[e-mail]>.  Closes #474087, LP #1311888.
+
+ -- Gianfranco Costamagna <[e-mail]>  Sun, 07 Apr 2019 21:24:31 +0200
+
 openipmi (2.0.25-2.1) unstable; urgency=medium
 
   * Non-maintainer upload, with pre-approval from current maintainer.
@@ -55,6 +142,15 @@ openipmi (2.0.25-2.1) unstable; urgency=medium
 
  -- Thomas Goirand <[e-mail]>  Wed, 27 Mar 2019 22:57:19 +0100
 
+openipmi (2.0.25-2ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
+      pthread.pc does not exist in Ubuntu.  Thanks to Simon McVittie
+      <[e-mail]>.  Closes #474087, LP #1311888.
+
+ -- Matthias Klose <[e-mail]>  Sun, 17 Jun 2018 14:02:26 +0200
+
 openipmi (2.0.25-2) unstable; urgency=medium
 
   * Fixed openipmi init file for other archs. Thanks Majon!
@@ -79,6 +175,43 @@ openipmi (2.0.25-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Fri, 18 May 2018 13:44:36 +0200
 
+openipmi (2.0.22-1.1ubuntu4) cosmic; urgency=medium
+
+  * d/openipmi.init: Fixed openipmi init file for other archs. (LP: #1716517)
+
+ -- Manoj Iyer <[e-mail]>  Mon, 21 May 2018 15:50:05 -0500
+
+openipmi (2.0.22-1.1ubuntu3) cosmic; urgency=medium
+
+  * No-change rebuild for ncurses soname changes.
+
+ -- Matthias Klose <[e-mail]>  Thu, 03 May 2018 14:17:44 +0000
+
+openipmi (2.0.22-1.1ubuntu2) bionic; urgency=high
+
+  * No change rebuild against openssl1.1.
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 06 Feb 2018 17:54:46 +0000
+
+openipmi (2.0.22-1.1ubuntu1) artful; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/openipmi.init: Change lockfile path. '/var/log/subsys' does
+      not exists in Debian. (LP #722770)
+    - Fix up packaging to install and use /etc/default/openipmi.
+      (LP #473332) Thanks to Serge Hallyn.
+    - Detect that a module is built into the kernel.
+      + LP #1309860
+    - debian/openipmi.init: Do not unload all modules if some configured
+      HW modules are not successfully loaded (LP #1318317).
+    - debian/openipmi.init: add Default-Start and Default-Stop values
+      (LP #1596474).
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
+      pthread.pc does not exist in Ubuntu.  Thanks to Simon McVittie
+      <[e-mail]>.  Closes #474087, LP #1311888.
+
+ -- Nishanth Aravamudan <[e-mail]>  Thu, 04 May 2017 15:21:46 -0700
+
 openipmi (2.0.22-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -86,6 +219,53 @@ openipmi (2.0.22-1.1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Wed, 14 Dec 2016 22:19:50 +0100
 
+openipmi (2.0.22-1ubuntu1) zesty; urgency=medium
+
+  * Merge with Debian unstable (LP: #1593461). Remaining changes:
+    - debian/openipmi.init: Change lockfile path. '/var/log/subsys' does
+      not exists in Debian. (LP #722770)
+    - Fix up packaging to install and use /etc/default/openipmi.
+      (LP #473332) Thanks to Serge Hallyn.
+    - Detect that a module is built into the kernel.
+      + LP #1309860
+    - debian/openipmi.init: Do not unload all modules if some configured
+      HW modules are not successfully loaded (LP #1318317).
+    - debian/openipmi.init: add Default-Start and Default-Stop values
+      (LP #1596474).
+    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
+      pthread.pc does not exist in Ubuntu.  Thanks to Simon McVittie
+      <[e-mail]>.  Closes #474087, LP #1311888.
+  * Drop:
+    - debian/rules, debian/openipmi.init:
+      + added init script
+      [ Fixed in Debian ]
+    - Do not explicitly depend on pthread.
+      [ previously documented ]
+    - Only use SIGPWR if defined.
+      [ Previously undocumented ]
+    - Delete copyright.
+      [ previously undocumented ]
+    - Add usr/sbin to debian/dirs
+      [ previously undocumented ]
+    - d/watch: update for new location
+      [ previously undocumented ]
+    - swig/pythong/openipmigui/Makefile: new file
+      [ previously undocumented ]
+    - New upstream version.
+      [ Debian has moved past ]
+    - Revert local changes to config.guess/config.sub; instead, use
+      autotools-dev's debhelper integration to update these files for
+      each build.
+      [ Fixed in Debian ]
+    - Enabling openssl support as it is causing
+      problems running third party applications. (closes #775847)
+      (LP #1546735)
+      [ Fixed in 2.0.21-1 ]
+    - Patch libtool macro support in for ppc64el shared libaries.
+      [ Fixed in 2.0.16-1.4 by moving to autotools-dev ]
+
+ -- Nishanth Aravamudan <[e-mail]>  Tue, 22 Nov 2016 16:33:42 -0800
+
 openipmi (2.0.22-1) unstable; urgency=medium
 
   * new upstream release from 2016-06-01
@@ -125,6 +305,80 @@ openipmi (2.0.21-1) unstable; urgency=medium
 
  -- Noël Köthe <[e-mail]>  Thu, 25 Feb 2016 12:06:21 +0100
 
+openipmi (2.0.18-0ubuntu11) xenial; urgency=medium
+
+  * debian/openipmi.init: Do not unload all modules if some configured
+    HW modules are not successfully loaded (LP: #1318317).
+
+ -- Nishanth Aravamudan <[e-mail]>  Thu, 03 Mar 2016 16:55:22 -0800
+
+openipmi (2.0.18-0ubuntu10) xenial; urgency=medium
+
+  * Enabling openssl support as it is causing 
+    problems running third party applications. (closes: #775847)
+    (LP: #1546735)
+
+ -- Eric Desrochers <[e-mail]>  Fri, 04 Mar 2016 17:28:50 +0000
+
+openipmi (2.0.18-0ubuntu9) xenial; urgency=medium
+
+  * No-change rebuild for ncurses6 transition.
+
+ -- Matthias Klose <[e-mail]>  Sun, 07 Feb 2016 09:44:35 +0000
+
+openipmi (2.0.18-0ubuntu8) utopic; urgency=medium
+
+  * Detect that a module is built into the kernel.
+    -LP: #1309860
+
+ -- Tim Gardner <[e-mail]>  Tue, 20 May 2014 11:15:44 -0700
+
+openipmi (2.0.18-0ubuntu7) trusty; urgency=medium
+
+  * Patch libtool macro support in for ppc64el shared libraries.
+
+ -- Adam Conrad <[e-mail]>  Tue, 18 Mar 2014 22:40:54 -0600
+
+openipmi (2.0.18-0ubuntu6) saucy; urgency=low
+
+  * Revert local changes to config.guess/config.sub; instead, use
+    autotools-dev's debhelper integration to update these files for each
+    build.
+
+ -- Colin Watson <[e-mail]>  Tue, 08 Oct 2013 23:06:03 +0100
+
+openipmi (2.0.18-0ubuntu5) saucy; urgency=low
+
+  * Rebuild for libsnmp30.
+
+ -- Colin Watson <[e-mail]>  Mon, 20 May 2013 11:05:34 +0100
+
+openipmi (2.0.18-0ubuntu4) quantal; urgency=low
+
+  * Rebuild for new armel compiler default of ARMv5t.
+
+ -- Colin Watson <[e-mail]>  Mon, 08 Oct 2012 08:36:00 +0100
+
+openipmi (2.0.18-0ubuntu3) natty; urgency=low
+
+  * Fix up packaging to install and use /etc/default/openipmi.
+    (LP: #473332) Thanks to Serge Hallyn.
+
+ -- Chuck Short <[e-mail]>  Fri, 04 Mar 2011 10:38:42 -0500
+
+openipmi (2.0.18-0ubuntu2) natty; urgency=low
+
+  * debian/openipmi.init: Change lockfile path. '/var/log/subsys' does not
+    exists in Debian. (LP: #722770)
+
+ -- Andres Rodriguez <[e-mail]>  Thu, 24 Feb 2011 11:34:04 -0500
+
+openipmi (2.0.18-0ubuntu1) maverick; urgency=low
+
+  * New upstream version. 
+
+ -- Chuck Short <[e-mail]>  Wed, 26 May 2010 14:58:52 -0400
+
 openipmi (2.0.16-1.4) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -166,6 +420,16 @@ openipmi (2.0.16-1.1) unstable; urgency=low
 
  -- Micah Anderson <[e-mail]>  Sat, 30 Jan 2010 19:17:13 -0500
 
+openipmi (2.0.16-1ubuntu1) lucid; urgency=low
+
+  * Sync with debian.
+  * debian/control: 
+    - changed maintainer to match DebianMaintainerField spec.
+  * debian/rules, debian/openipmi.init:
+    - added init script
+
+ -- Chuck Short <[e-mail]>  Thu, 05 Nov 2009 12:52:52 -0500
+
 openipmi (2.0.16-1) unstable; urgency=low
 
   * new upstream release from 2009-03-16
@@ -177,6 +441,20 @@ openipmi (2.0.16-1) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Tue, 28 Jul 2009 10:17:23 +0200
 
+openipmi (2.0.14-2ubuntu2) karmic; urgency=low
+
+  * No-change upload to (hopefully) fix FTBFS.
+
+ -- Martin Pitt <[e-mail]>  Mon, 19 Oct 2009 10:11:04 +0200
+
+openipmi (2.0.14-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: changed maintainer to match DebianMaintainerField spec.
+    - debian/rules: debian/openipmi.init: added init-script.
+
+ -- Chuck Short <[e-mail]>  Wed, 05 Nov 2008 03:00:14 +0000
+
 openipmi (2.0.14-2) unstable; urgency=low
 
   * added GNU/kFreeBSD patch from Petr. Thanks
@@ -184,6 +462,14 @@ openipmi (2.0.14-2) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Sun, 19 Oct 2008 15:58:15 +0200
 
+openipmi (2.0.14-1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/control: changed maintainer to match DebianMaintainerField spec.
+    - debian/rules: debian/openipmi.init: added init-script.
+
+ -- Chuck Short <[e-mail]>  Sun, 20 Jul 2008 13:51:04 +0100
+
 openipmi (2.0.14-1) unstable; urgency=medium
 
   * new upstream release
@@ -192,6 +478,15 @@ openipmi (2.0.14-1) unstable; urgency=medium
 
  -- Noèl Köthe <[e-mail]>  Sat, 19 Jul 2008 20:30:39 +0200
 
+openipmi (2.0.13-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable (LP: #242632), remaining changes:
+    - debian/control: remove unecessary cdbs build-dep
+    - debian/rules, debian/openipmi.init: added init script
+    - debian/control: changed Maintainer to match DebianMaintinaerField spec.
+
+ -- Thierry Carrez <[e-mail]>  Tue, 24 Jun 2008 14:24:49 +0200
+
 openipmi (2.0.13-1) unstable; urgency=low
 
   * new upstream release
@@ -202,6 +497,31 @@ openipmi (2.0.13-1) unstable; urgency=low
 
  -- Noèl Köthe <[e-mail]>  Mon, 25 Feb 2008 20:07:00 +0100
 
+openipmi (2.0.13-0ubuntu3) hardy; urgency=low
+
+  * Make the init script more lsb specific.
+
+ -- Chuck Short <[e-mail]>  Wed, 13 Feb 2008 14:03:38 -0500
+
+openipmi (2.0.13-0ubuntu2) hardy; urgency=low
+
+  * Added init script.
+
+ -- Chuck Short <[e-mail]>  Tue, 12 Feb 2008 19:24:00 -0500
+
+openipmi (2.0.13-0ubuntu1) hardy; urgency=low
+
+  * New upstream release.
+  * Cleaned up debian/control.
+
+ -- Chuck Short <[e-mail]>  Tue, 12 Feb 2008 12:49:05 -0500
+
+openipmi (2.0.11-2build1) hardy; urgency=low
+
+  * Rebuild for libsnmp10 -> libsnmp15 transition.
+
+ -- Steve Kowalik <[e-mail]>  Mon, 10 Dec 2007 20:32:47 +1100
+
 openipmi (2.0.11-2) unstable; urgency=low
 
   * correcting build dependency libsnmp10-dev -> libsnmp-dev
diff --git a/debian/control b/debian/control
index 117a863..adf064c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: openipmi
 Section: admin
 Priority: optional
-Maintainer: Noël Köthe <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Noël Köthe <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
 	       libsnmp-dev,
 	       libpopt-dev,