Merge ~nacc/ubuntu/+source/openipmi:merge into ~usd-import-team/ubuntu/+source/openipmi:debian/sid

[Nish Aravamudan]

[Robie Basak (racb)]

Good job with a complex, messy merge. Minor nitpicks inline. This is substantially correct though. I especially like the amount of Ubuntu delta we're able to drop.

review: Needs Information

[Nish Aravamudan (nacc)]

On 21.06.2016 [13:27:00 -0000], Robie Basak wrote:
> Review: Needs Information
>
> Good job with a complex, messy merge. Minor nitpicks inline. This is
> substantially correct though. I especially like the amount of Ubuntu
> delta we're able to drop.

Yep, that seemed like a net-positive :)

> Diff comments:
>
> > diff --git a/debian/changelog b/debian/changelog
> > index 8ade0c3..4b0450b 100644
> > --- a/debian/changelog
> > +++ b/debian/changelog
> > @@ -1,3 +1,44 @@
> > +openipmi (2.0.21-1.2ubuntu1) yakkety; 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.
> > + - Patch libtool macro support in for ppc64el shared libaries.
> > + - 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).
> > + * 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 documented ]
>
> Presumably this should be "undocumented"?

Correct, will fix.

> > + - Add usr/sbin to debian/dirs
> > + [ previously undocumented ]
> > + - d/watch: update for new location
> > + [ previously documented ]
> > + - 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 ]
> > +
> > + -- Nishanth Aravamudan <email address hidden> Thu, 16 Jun 2016 15:35:42 -0700
> > +
> > openipmi (2.0.21-1.2) unstable; urgency=medium
> >
> > * Re-add accidentally deleted debian/*.files. Sorry! Closes: #819105
> > diff --git a/debian/dirs b/debian/dirs
> > index e772481..d54f2ca 100644
> > --- a/debian/dirs
> > +++ b/debian/dirs
> > @@ -1 +1,4 @@
> > usr/bin
> > +usr/sbin
> > +usr/sbin
>
> Duplicate entry from c298c94. The logical breakdown (d0d32b8) didn't
> have usr/sbin here at all, so is it needed?

Erp, will reverify and fix/drop as appropriate.

> > +etc/default
> > diff --git a/debian/patches/ppc64_le_support b/debian/patches/ppc64_le_support
> > new file mode 100644
> > index 0000000..c2d55db
> > --- /dev/null
> > +++ b/debian/patches/ppc64_le_support
> > @@ -0,0 +1,55 @@
> > +Description: Patch libtool macro support in for ppc64el shared libraries
> > +Author: Nishanth...

[Nish Aravamudan (nacc)]

git log merge.v1..
commit be646c5b7d7320b42e76f51c20ed2e3c2c3f3ce8 (HEAD -> merge)
Author: Nishanth Aravamudan <email address hidden>
Date: Tue Jun 21 10:15:50 2016 -0700

    Drop ppc64_le patch after MR review

    tested at https://launchpad.net/~nacc/+archive/ubuntu/lp1593461

commit bd1c01d30bb5e573aaf2e79f7e8c8a5a4bfea2bd
Author: Nishanth Aravamudan <email address hidden>
Date: Tue Jun 21 10:08:10 2016 -0700

    d/dirs update after MR review (usr/sbin dropped)

commit ac62ed0d0c766b22465fa5b4ea43f58ca6c09b6d
Author: Nishanth Aravamudan <email address hidden>
Date: Tue Jun 21 09:59:38 2016 -0700

    d/changelog entry update after MR review (documented -> undocumented)

[Nish Aravamudan (nacc)]

Hi Robie,

Thank you for an excellent review of this complicated MR. After further consideration and consultation with other developers, I'm submitting our delta to Debian directly. I believe it consists solely of bugs/issues also present in Debian, and we can sync if they pick it up.

I've updated the corresponding LP bug accordingly as well.

-Nish

[Nish Aravamudan (nacc)]

Robie,

Given lack of response from Debian in the past few days, how would you like to proceed? If you're amenable to just doing this merge now and syncing in the future, I'd like to push the bugfix for LP: #1596474 on top of my current branch so we can SRU it.

[Nish Aravamudan (nacc)]

I went ahead and pushed, as you can always ask me to drop them, but it makes for a simpler review now. Old merge head tagged as merge.v2.

8e1afb7... by Nish Aravamudan on 2016-09-21

  * debian/openipmi.init: add Default-Start and Default-Stop values
    (LP: #1596474).

f846ad7... by Nish Aravamudan on 2016-09-21

  * Drop: - debian/rules, debian/openipmi.init: + added init script [ Fixed in Debian ]

8ad0689... by Nish Aravamudan on 2016-09-21

  * Drop: Do not explicitly depend on pthread. [ previously documented ]

74cc8de... by Nish Aravamudan on 2016-09-21

  * Drop: Only use SIGPWR if defined. [ Previously undocumented ]

7e336d4... by Nish Aravamudan on 2016-09-21

  * Drop: Delete copyright. [ previously documented ]

6666d86... by Nish Aravamudan on 2016-09-21

  * Drop: Add usr/sbin to debian/dirs [ previously undocumented ]

6a7e3c9... by Nish Aravamudan on 2016-09-21

  * Drop: d/watch: update for new location [ previously documented ]

fd0c1f3... by Nish Aravamudan on 2016-09-21

  * Drop: b682971 * swig/pythong/openipmigui/Makefile: new file [ previously undocumented ]

400ffec... by Nish Aravamudan on 2016-09-21

  * Drop: New upstream version.

7fb3e61... by Nish Aravamudan on 2016-09-21

  * Drop: - Revert local changes to config.guess/config.sub; instead, use autotools-dev's debhelper integration to update these files for each build.

cb540fe... by Nish Aravamudan on 2016-09-21

  * 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.

fa1f184... by Nish Aravamudan on 2016-09-21

Update changelog after 2.0.18-0ubuntu12 update in yakkety

[Nish Aravamudan (nacc)]

Hi Robie,

Ok, updated the tree with a fresh merge against current debian, I'm submitting the FFe request right now as well, but if you could take a look.

I've updated the new/debian, old/ubuntu tags, as well as provided new {deconstruct,reconstruct,logical}/2.0.18-0ubuntu12. merge.v3 is also an updated tag, and merge.v2 represents the old merge.

Let me know what you think.

Unmerged commits

fa1f184... by Nish Aravamudan on 2016-09-21

Update changelog after 2.0.18-0ubuntu12 update in yakkety

cb540fe... by Nish Aravamudan on 2016-09-21

  * 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.

8e1afb7... by Nish Aravamudan on 2016-09-21

  * debian/openipmi.init: add Default-Start and Default-Stop values
    (LP: #1596474).

6a6dc78... by Nish Aravamudan on 2016-06-21

Drop ppc64_le patch after MR review

tested at https://launchpad.net/~nacc/+archive/ubuntu/lp1593461

8af7ec4... by Nish Aravamudan on 2016-06-21

d/dirs update after MR review (usr/sbin dropped)

c7c8e76... by Nish Aravamudan on 2016-06-21

d/changelog entry update after MR review (documented -> undocumented)

9e3ea5c... by Nish Aravamudan on 2016-06-16

update-metadata

c07bfea... by Nish Aravamudan on 2016-06-16

reconstruct-changelog

a6d0e38... by Nish Aravamudan on 2016-06-16

merge-changelogs

849b531... by Nish Aravamudan on 2016-06-16

  * debian/openipmi.init: Do not unload all modules if some configured
    HW modules are not successfully loaded (LP: #1318317).

diff --git a/debian/changelog b/debian/changelog
index 55510cc..8788d58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,50 @@
+openipmi (2.0.22-1ubuntu1) yakkety; 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]>  Wed, 21 Sep 2016 14:30:47 -0700
+
 openipmi (2.0.22-1) unstable; urgency=medium
 
   * new upstream release from 2016-06-01
@@ -37,6 +84,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.
@@ -78,10 +199,20 @@ 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
-  * debian/compat debian/control raised to debhelper 5
+  * new upstream  release from 2009-03-16
+  * debian/compat, debian/control, raised to debhelper 5
   * debian/control removed URL in description new we
     have the Homepage: field
   * debian/control updated Standards-Version: (no changes needed)
@@ -89,6 +220,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
@@ -96,6 +241,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
@@ -104,6 +257,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
@@ -114,6 +276,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 1a66c59..8f2b1e0 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 (>> 9.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev,
                chrpath, autotools-dev, libssl-dev, dh-autoreconf
 Standards-Version: 3.9.8
diff --git a/debian/dirs b/debian/dirs
index e772481..526c3a7 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1,2 @@
 usr/bin
+etc/default
diff --git a/debian/openipmi.init b/debian/openipmi.init
index 36c044b..bc7f8b6 100644
--- a/debian/openipmi.init
+++ b/debian/openipmi.init
@@ -13,8 +13,8 @@
 # Provides: ipmidrv
 # Required-Start: $local_fs $remote_fs $syslog
 # Required-Stop: $local_fs $remote_fs $syslog
-# Default-Start:
-# Default-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
 # Short-Description: OpenIPMI Driver init script
 # Description: OpenIPMI Driver init script
 ### END INIT INFO
@@ -32,7 +32,7 @@
 #############################################################################
 . /lib/lsb/init-functions
 
-CONFIGFILE=/etc/sysconfig/ipmi
+CONFIGFILE=/etc/default/openipmi
 # source config info
 [ -r ${CONFIGFILE} ] && . ${CONFIGFILE}
 
@@ -66,7 +66,7 @@ MODULES_BASE="ipmi_msghandler"
 MODULES="${MODULES_INTERFACES} ${MODULES_FEATURES} ${MODULES_HW} ${MODULES_BASE}"
 
 RETVAL=0
-LOCKFILE=/var/lock/subsys/ipmi
+LOCKFILE=/var/lock/ipmi
 DEV_IPMI_TIMEOUT=15
 
 UDEV_EXISTS=0
@@ -90,6 +90,9 @@ modules_loaded_verbose()
 		if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then
 			echo "$m module loaded."
 			OnePlusLoaded=1
+		elif [ -d "/sys/module/$m" ]; then
+			echo "$m module in kernel."
+			OnePlusLoaded=1
 		else
 			echo "$m module not loaded."
 			OnePlusUnloaded=1
@@ -104,6 +107,8 @@ modules_loaded()
 	for m in $@; do
 		if /sbin/lsmod | grep $m >/dev/null 2>&1 ; then
 			OnePlusLoaded=1
+		elif [ -d "/sys/module/$m" ]; then
+			OnePlusLoaded=1
 		else
 			OnePlusUnloaded=1
 		fi
@@ -323,9 +328,9 @@ load_ipmi_modules ()
 	local locdelay
 	modprobe ipmi_msghandler > /dev/null 2>&1
 	modules_loaded ipmi_msghandler
-	[ ${OnePlusLoaded} -ne 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return
+	[ ${OnePlusLoaded} -ne 1 ] && RETVAL=$((RETVAL | 1)) && return
 	load_hw_modules
-	[ $((RETVAL & 1)) -eq 1 ] && unload_all_ipmi_modules && RETVAL=$((RETVAL | 1)) && return
+	[ $((RETVAL & 1)) -eq 1 ] && return
 
 	if [ "${DEV_IPMI}" = "yes" ]; then
 		modprobe ipmi_devintf > /dev/null 2>&1
diff --git a/debian/patches/fix_pthread_pkg_config.patch b/debian/patches/fix_pthread_pkg_config.patch
new file mode 100644
index 0000000..345f5bb
--- /dev/null
+++ b/debian/patches/fix_pthread_pkg_config.patch
@@ -0,0 +1,19 @@
+Description: fix pkg-config files: pthread.pc does not exist in Ubuntu
+ Forward-ported from 2.10.16-1.1, as it seems to have been dropped in
+ Debian.
+Author: Simon McVittie <[e-mail]>
+Bug-Debian: https://bugs.debian.org/474087
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1311888
+
+--- openipmi-2.0.22.orig/OpenIPMIpthread.pc.in
++++ openipmi-2.0.22/OpenIPMIpthread.pc.in
+@@ -6,6 +6,6 @@ includedir=@includedir@
+ Name: OpenIPMIpthread
+ Description: Pthread OS handler for OpenIPMI
+ Version: @VERSION@
+-Requires: OpenIPMI pthread
+-Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread
+-Cflags: -I${includedir}
++Requires: OpenIPMI
++Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread -pthread
++Cflags: -I${includedir} -pthread
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..84a0c30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_pthread_pkg_config.patch
diff --git a/debian/rules b/debian/rules
index 4af8204..5af87d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,8 @@ binary-common:
 	dh_installdocs
 	dh_installexamples
 	dh_installinit -p openipmi --name openipmi --no-start -- defaults 21 20
+	mv ipmi.sysconf openipmi
+	dh_install openipmi etc/default
 	dh_installman
 	dh_link
 	dh_strip