Followup-For: Bug #852433
Control: tag -1 patch pending
Hi,
I just uploaded the attached patch as a NMU to DELAYED/5. Please let me
know if I should delay it longer or reschedule.
Greetings from the credativ BSP.
Andreas
diff -Nru openhpi-3.6.1/debian/changelog openhpi-3.6.1/debian/changelog
--- openhpi-3.6.1/debian/changelog 2017-01-18 20:45:48.000000000 +0100
+++ openhpi-3.6.1/debian/changelog 2017-03-18 17:13:16.000000000 +0100
@@ -1,3 +1,13 @@
+openhpi (3.6.1-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Remove -dbgsym packages from debian/control, these are autogenerated by
+ dh_strip. (Closes: #852433)
+ * Move the plugin .so links into the plugin packages. (Closes: #615955)
+ * libopenhpi3.postrm: Drop manual ldconfig call.
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 18 Mar 2017 17:13:16 +0100
+
openhpi (3.6.1-2.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru openhpi-3.6.1/debian/control openhpi-3.6.1/debian/control
--- openhpi-3.6.1/debian/control 2017-01-18 20:45:42.000000000 +0100
+++ openhpi-3.6.1/debian/control 2017-03-18 16:01:20.000000000 +0100
@@ -70,7 +70,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for HP's ProLiant rackmount servers
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -86,7 +87,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version}), libopenipmi0 (>=2.0.7), openipmi (>=2.0.7)
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for OpenIPMI
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -101,7 +103,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for direct IPMI over LAN (RMCP) or SMI
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -116,7 +119,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for HP's BladeSystem c-Class
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -132,7 +136,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for slave plugin
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -147,7 +152,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for test agent plugin
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -161,7 +167,8 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for IBM's BladeCenter or RSA over SNMP
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -177,7 +184,8 @@
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for the sysfs filesystem
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -193,7 +201,8 @@
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for the Linux watchdog interface
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -208,7 +217,8 @@
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for a simulator that works without hardware
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -223,7 +233,8 @@
Architecture: linux-any
Depends: ${shlibs:Depends}, ${misc:Depends}, libopenhpi3 (= ${binary:Version})
Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
+Breaks: libopenhpi3 (<< 3.6.1-2.2~)
+Replaces: libopenhpi, libopenhpi2, libopenhpi3 (<< 3.6.1-2.2~)
Description: OpenHPI plugin module for a dynamic simulator
OpenHPI is an implementation of the Service Availability Forum's Hardware
Platform Interface specification. (See http://www.saforum.org) As
@@ -252,141 +263,3 @@
.
This package is a metapackage which installs all of the OpenHPI
components.
-
-Package: libopenhpi3-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libopenhpi3 (= ${binary:Version}), ${misc:Depends}
-Recommends: openhpid (= ${binary:Version})
-Conflicts: libopenhpi-dbgsym, libopenhpi2-dbgsym
-Replaces: libopenhpi-dbgsym, libopenhpi2-dbgsym
-Description: Debug symbols for libopenhpi3 library
- See description of libopenhpi3
-
-Package: openhpid-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpid (= ${binary:Version}), ${misc:Depends}
-Description: Debug symbols package for OpenHPI daemon
- See description of openhpid
-
-Package: openhpi-clients-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-clients (= ${binary:Version}), ${misc:Depends}
-Description: Debug symbols for OpenHPI example client programs
- See description of openhpi-clients
-
-Package: openhpi-plugin-ilo2-ribcl-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-ilo2-ribcl (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-ilo2-ribcl plugin module
- See description of openhpi-plugin-ilo2-ribcl
-
-Package: openhpi-plugin-ipmi-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-ipmi (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-ipmi plugin module
- See description of openhpi-plugin-ipmi
-
-Package: openhpi-plugin-ipmidirect-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-ipmidirect (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-ipmidirect plugin module
- See description of openhpi-plugin-ipmidirect
-
-Package: openhpi-plugin-oa-soap-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-oa-soap (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-oa-soap plugin module
- See description of openhpi-plugin-oa-soap
-
-Package: openhpi-plugin-slave-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-slave (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-slave plugin module
- See description of openhpi-plugin-slave
-
-Package: openhpi-plugin-test-agent-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-test-agent (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-test-agent plugin module
- See description of openhpi-plugin-test-agent
-
-Package: openhpi-plugin-snmp-bc-dbgsym
-Section: debug
-Priority: extra
-Architecture: any
-Depends: openhpi-plugin-snmp-bc (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-snmp-bc plugin module
- See description of openhpi-plugin-snmp-bc
-
-Package: openhpi-plugin-sysfs-dbgsym
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: openhpi-plugin-sysfs (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-sysfs plugin module
- See description of openhpi-plugin-sysfs
-
-Package: openhpi-plugin-watchdog-dbgsym
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: openhpi-plugin-watchdog (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-watchdog plugin module
- See description of openhpi-plugin-watchdog
-
-Package: openhpi-plugin-simulator-dbgsym
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: openhpi-plugin-simulator (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-simulator plugin module
- See description of openhpi-plugin-simulator
-
-Package: openhpi-plugin-dynamic-simulator-dbgsym
-Section: debug
-Priority: extra
-Architecture: linux-any
-Depends: openhpi-plugin-dynamic-simulator (= ${binary:Version}), ${misc:Depends}
-Conflicts: libopenhpi, libopenhpi2
-Replaces: libopenhpi, libopenhpi2
-Description: Debug symbols for openhpi-plugin-dynamic-simulator plugin module
- See description of openhpi-plugin-dynamic-simulator
-
diff -Nru openhpi-3.6.1/debian/libopenhpi3.install openhpi-3.6.1/debian/libopenhpi3.install
--- openhpi-3.6.1/debian/libopenhpi3.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/libopenhpi3.install 2017-03-18 16:25:04.000000000 +0100
@@ -6,5 +6,5 @@
usr/lib/libopenhpiutils.so.*
usr/lib/libopenhpi_ssl.so.*
usr/lib/libopenhpitransport.so.*
+usr/lib/openhpi/libosahpi.so
usr/lib/openhpi/libosahpi.so.*
-usr/lib/openhpi/*.so
diff -Nru openhpi-3.6.1/debian/libopenhpi3.postrm openhpi-3.6.1/debian/libopenhpi3.postrm
--- openhpi-3.6.1/debian/libopenhpi3.postrm 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/libopenhpi3.postrm 2017-03-18 16:36:26.000000000 +0100
@@ -22,12 +22,6 @@
purge) rm -rf /var/lib/openhpi;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ldconfig;;
-
- *) echo "postrm called with unknown argument \`$1'" >&2
- exit 1;;
-
esac
# dh_installdeb will replace this with shell code automatically
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-dynamic-simulator.install openhpi-3.6.1/debian/openhpi-plugin-dynamic-simulator.install
--- openhpi-3.6.1/debian/openhpi-plugin-dynamic-simulator.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-dynamic-simulator.install 2017-03-18 15:57:32.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libdyn_simulator.so.*
+usr/lib/openhpi/libdyn_simulator.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-ilo2-ribcl.install openhpi-3.6.1/debian/openhpi-plugin-ilo2-ribcl.install
--- openhpi-3.6.1/debian/openhpi-plugin-ilo2-ribcl.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-ilo2-ribcl.install 2017-03-18 15:57:36.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libilo2_ribcl.so.*
+usr/lib/openhpi/libilo2_ribcl.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-ipmi.install openhpi-3.6.1/debian/openhpi-plugin-ipmi.install
--- openhpi-3.6.1/debian/openhpi-plugin-ipmi.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-ipmi.install 2017-03-18 15:57:40.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libipmi.so.*
+usr/lib/openhpi/libipmi.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-ipmidirect.install openhpi-3.6.1/debian/openhpi-plugin-ipmidirect.install
--- openhpi-3.6.1/debian/openhpi-plugin-ipmidirect.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-ipmidirect.install 2017-03-18 15:57:44.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libipmidirect.so.*
+usr/lib/openhpi/libipmidirect.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-oa-soap.install openhpi-3.6.1/debian/openhpi-plugin-oa-soap.install
--- openhpi-3.6.1/debian/openhpi-plugin-oa-soap.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-oa-soap.install 2017-03-18 15:57:48.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/liboa_soap.so.*
+usr/lib/openhpi/liboa_soap.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-simulator.install openhpi-3.6.1/debian/openhpi-plugin-simulator.install
--- openhpi-3.6.1/debian/openhpi-plugin-simulator.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-simulator.install 2017-03-18 15:57:52.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libsimulator.so.*
+usr/lib/openhpi/libsimulator.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-slave.install openhpi-3.6.1/debian/openhpi-plugin-slave.install
--- openhpi-3.6.1/debian/openhpi-plugin-slave.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-slave.install 2017-03-18 15:57:55.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libslave.so.*
+usr/lib/openhpi/libslave.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-snmp-bc.install openhpi-3.6.1/debian/openhpi-plugin-snmp-bc.install
--- openhpi-3.6.1/debian/openhpi-plugin-snmp-bc.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-snmp-bc.install 2017-03-18 15:58:20.000000000 +0100
@@ -1,2 +1,2 @@
usr/lib/libopenhpi_snmp.so.*
-usr/lib/openhpi/libsnmp_bc.so.*
+usr/lib/openhpi/libsnmp_bc.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-sysfs.install openhpi-3.6.1/debian/openhpi-plugin-sysfs.install
--- openhpi-3.6.1/debian/openhpi-plugin-sysfs.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-sysfs.install 2017-03-18 15:58:25.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libsysfs2hpi.so.*
+usr/lib/openhpi/libsysfs2hpi.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-test-agent.install openhpi-3.6.1/debian/openhpi-plugin-test-agent.install
--- openhpi-3.6.1/debian/openhpi-plugin-test-agent.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-test-agent.install 2017-03-18 15:58:31.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libtest_agent.so.*
+usr/lib/openhpi/libtest_agent.so*
diff -Nru openhpi-3.6.1/debian/openhpi-plugin-watchdog.install openhpi-3.6.1/debian/openhpi-plugin-watchdog.install
--- openhpi-3.6.1/debian/openhpi-plugin-watchdog.install 2016-03-25 20:42:31.000000000 +0100
+++ openhpi-3.6.1/debian/openhpi-plugin-watchdog.install 2017-03-18 15:58:35.000000000 +0100
@@ -1 +1 @@
-usr/lib/openhpi/libwatchdog.so.*
+usr/lib/openhpi/libwatchdog.so*
