Merge ~sergiodj/ubuntu/+source/openipmi:openipmi-merge-2.0.29-0.1 into ubuntu/+source/openipmi:debian/sid

[Sergio Durigan Junior]

This is the merge for openipmi 2.0.29-0.1.

The Debian maintainer has been MIA for more than a year now, so I put on my DD hat and did the update from the Debian side first. I took the opportunity and incorporated the various patches that we've been carrying on Ubuntu to improve the sysv init file, and to adjust d/control et al in order to compile the newest version from upstream. That's why you will see the dropped changes there.

As for the single change I decided to keep, debian/patches/fix_pthread_pkg_config.patch, pedantically speaking it is not entirely needed because upstream already provides "-pthread" on pkg-config's Cflags. However, GCC recommends that, when using "-pthread" on CFLAGS, we also pass "-pthread" when linking the binaries.

The package doesn't carry dep8 tests, so I installed it on a groovy container. I also wanted to test the "-pthread" thing above, so I used sources.d.o to find a package that uses openipmi's pkg-config file to determine CFLAGS/LDFLAGS, found that collectd is one of them, then I compiled and tested it inside the same VM using the new openipmi package. As I said, the compilation works even without providing "-pthread" on Libs, but I decided to keep it anyway because it's more correct this way.

[Sergio Durigan Junior (sergiodj)]

Christian, I'm requesting a review from you because you're the person who last touched the package, but feel free to decline if you have too much to do already :-). TIA!

[Christian Ehrhardt  (paelzer)]

Queued to my ever growing monday list of TODOs :-)

[Christian Ehrhardt  (paelzer)]

LGTM you were able to drop most of the things since they are upstream and/or in Debian by now which is a great result of our delta submission \o/.

The one remaining delta is from before me touching the package, I didn't look too much at it last time - but now that it is the only thing left we maybe should look more deeply.

It is reported to Debian as already as https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474087 (long ago).
It is reported as Fixed there in version openipmi/2.0.16-1.1

So might this be able to become a sync now?

The Ubuntu fix says the fix is "Forward-ported from 2.10.16-1.1, as it seems to have been dropped in Debian".
Indeed at upstream it was fixed (late) see https://sourceforge.net/p/openipmi/feature-requests/5/

This upstream fix is in since 2.0.22-1 and the reason it was dropped from Debian.

And indeed this LGTM now for cflags:
root@d10-sid:~# pkg-config --libs OpenIPMIpthread
-lOpenIPMIutils -lOpenIPMIpthread -lOpenIPMIutils -lOpenIPMI
root@d10-sid:~# pkg-config --cflags OpenIPMIpthread
-pthread

The one reason against it is that you usually want it on cflags AND ldflags and not just one of them. But at least the upstream bug reporter was happy with the change as is.

So this should be:
a) not needed - good to become a sync now as it was the only delta.
OR
b) our remaining fix of adding it to "Libs:" as well is indeed important.
   In that case almost +1 to this MP, but then please provide a follow on bug report
   upstream and explain it there. Link tat bug report from our patch header then.

What do you think on (a) vs (b) @Sergio?

review: Needs Fixing

[Sergio Durigan Junior (sergiodj)]

On Monday, August 03 2020, Christian Ehrhardt  wrote:

> The one remaining delta is from before me touching the package, I didn't look too much at it last time - but now that it is the only thing left we maybe should look more deeply.
>
> It is reported to Debian as already as https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474087 (long ago).
> It is reported as Fixed there in version openipmi/2.0.16-1.1
>
> So might this be able to become a sync now?
>
> The Ubuntu fix says the fix is "Forward-ported from 2.10.16-1.1, as it seems to have been dropped in Debian".
> Indeed at upstream it was fixed (late) see https://sourceforge.net/p/openipmi/feature-requests/5/
>
> This upstream fix is in since 2.0.22-1 and the reason it was dropped from Debian.
>
> And indeed this LGTM now for cflags:
> root@d10-sid:~# pkg-config --libs OpenIPMIpthread
> -lOpenIPMIutils -lOpenIPMIpthread -lOpenIPMIutils -lOpenIPMI
> root@d10-sid:~# pkg-config --cflags OpenIPMIpthread
> -pthread
>
>
> The one reason against it is that you usually want it on cflags AND ldflags and not just one of them. But at least the upstream bug reporter was happy with the change as is.
>
> So this should be:
> a) not needed - good to become a sync now as it was the only delta.
> OR
> b) our remaining fix of adding it to "Libs:" as well is indeed important.
> In that case almost +1 to this MP, but then please provide a follow on bug report
> upstream and explain it there. Link tat bug report from our patch header then.
>
> What do you think on (a) vs (b) @Sergio?

Thanks for the review, Christian!

As I wrote in the MP description, the correct thing to do here is for
"-pthread" to be passed both on CFLAGS and LDFLAGS. Therefore, the
right thing to do is to get in touch with upstream, provide a patch to
complement the existing fix there, and link it in our patch header.

I'll do that and force-push my updates later.

Cheers,

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

[Christian Ehrhardt  (paelzer)]

Ok - I must have read over the MP description too quickly, but I'm glad we came to the same conclusion :-)

I think these three places should be updated to properly reflect the real summary of the remaining purpose of the Delta. And if you submit something upstream as usual link that in the patches header.

Patch Header
+Description: fix pkg-config files: pthread.pc does not exist in Ubuntu
375 + Forward-ported from 2.10.16-1.1, as it seems to have been dropped in
376 + Debian.

Changelog:
 Remaining changes:
9 + - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
10 + pthread.pc does not exist in Ubuntu. Thanks to Simon McVittie
11 + <email address hidden>. Closes #474087, LP #1311888.

Commit message:
    - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
      pthread.pc does not exist in Ubuntu. Thanks to Simon McVittie
      <email address hidden>. Closes #474087, LP #1311888.

+1 under the condition that this is done

review: Approve

e7fb7e6... by Sergio Durigan Junior on 2020-08-05

merge-changelogs

3d04011... by Sergio Durigan Junior on 2020-08-05

reconstruct-changelog

17654a2... by Sergio Durigan Junior on 2020-08-05

update-maintainer

[Sergio Durigan Junior (sergiodj)]

On Wednesday, August 05 2020, Christian Ehrhardt  wrote:

> Ok - I must have read over the MP description too quickly, but I'm glad we came to the same conclusion :-)

:-)

> I think these three places should be updated to properly reflect the real summary of the remaining purpose of the Delta. And if you submit something upstream as usual link that in the patches header.
>
> Patch Header
> +Description: fix pkg-config files: pthread.pc does not exist in Ubuntu
> 375 + Forward-ported from 2.10.16-1.1, as it seems to have been dropped in
> 376 + Debian.
>
> Changelog:
> Remaining changes:
> 9 + - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
> 10 + pthread.pc does not exist in Ubuntu. Thanks to Simon McVittie
> 11 + <email address hidden>. Closes #474087, LP #1311888.
>
> Commit message:
> - debian/patches/fix_pthread_pkg_config.patch: fix pkg-config files:
> pthread.pc does not exist in Ubuntu. Thanks to Simon McVittie
> <email address hidden>. Closes #474087, LP #1311888.

I adjusted the descriptions on these 3 places as requested.

> +1 under the condition that this is done

Thanks! If you can take a quick look to make sure you like the new
description, and then sponsor the package for me, I'd appreciate.

Cheers,

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

[Christian Ehrhardt  (paelzer)]

new head is 17654a2eb8251e990b14ebefa97022d04bafe6dd

LGTM now - thanks!

review: Approve

[Christian Ehrhardt  (paelzer)]

Total 24 (delta 13), reused 1 (delta 1), pack-reused 0
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/openipmi
 * [new tag] upload/2.0.29-0.1ubuntu1 -> upload/2.0.29-0.1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading openipmi_2.0.29-0.1ubuntu1.dsc: done.
  Uploading openipmi_2.0.29.orig.tar.gz: done.
  Uploading openipmi_2.0.29-0.1ubuntu1.debian.tar.xz: done.
  Uploading openipmi_2.0.29-0.1ubuntu1_source.buildinfo: done.
  Uploading openipmi_2.0.29-0.1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a46b8db..7ef0dc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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 ]
@@ -33,6 +51,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.
@@ -42,6 +86,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!
@@ -66,6 +119,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.
@@ -73,6 +163,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
@@ -112,6 +249,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.
@@ -153,6 +364,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
@@ -164,6 +385,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
@@ -171,6 +406,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
@@ -179,6 +422,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
@@ -189,6 +441,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 20bfe69..a20136c 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,
diff --git a/debian/patches/fix_pthread_pkg_config.patch b/debian/patches/fix_pthread_pkg_config.patch
new file mode 100644
index 0000000..928e5c9
--- /dev/null
+++ b/debian/patches/fix_pthread_pkg_config.patch
@@ -0,0 +1,22 @@
+Description: fix pkg-config files:
+ 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.
+Author: Simon McVittie <[e-mail]>
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+Bug-Debian: https://bugs.debian.org/474087
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1311888
+Forwarded: https://sourceforge.net/p/openipmi/code/merge-requests/6/
+
+Index: b/OpenIPMIpthread.pc.in
+===================================================================
+--- a/OpenIPMIpthread.pc.in
++++ b/OpenIPMIpthread.pc.in
+@@ -7,5 +7,5 @@ Name: OpenIPMIpthread
+ Description: Pthread OS handler for OpenIPMI
+ Version: @VERSION@
+ Requires: OpenIPMI
+-Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread
++Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread -pthread
+ Cflags: -I${includedir} -pthread
diff --git a/debian/patches/series b/debian/patches/series
index 732215f..7112540 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 increase-MAX_CONFIG_LINE.patch
+fix_pthread_pkg_config.patch