Re: Adrian Vondendriesch 2016-03-12 <145780145961.5970.1064203268962720443.reportbug@kang.zoozer.local> > In Version 2.0.21-1 OPENIPMI_VERSION_MAJOR _MINOR and _RELEASE defines within > /usr/include/OpenIPMI/ipmiif.h are empty. This differs from prior versions > where all those variables were defined.
Hi, the problem is in configure.ac, where the variables are not passed properly to AC_SUBST. The attached patch fixes the problem. I've also uploaded it to delayed/2. Christoph
Control files: lines which differ (wdiff format)
------------------------------------------------
Build-Depends: debhelper (>> [-5.0.0),-] {+9.0.0),+} libsnmp-dev, libpopt-dev, libncurses5-dev,
chrpath, autotools-dev, [-libssl-dev-] {+libssl-dev, dh-autoreconf+}
diff -Nru openipmi-2.0.21/debian/changelog openipmi-2.0.21/debian/changelog
--- openipmi-2.0.21/debian/changelog 2016-03-22 13:35:33.000000000 +0100
+++ openipmi-2.0.21/debian/changelog 2016-03-22 13:15:29.000000000 +0100
@@ -1,3 +1,11 @@
+openipmi (2.0.21-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix substitution of OPENIPMI_VERSION_ variables in configure.ac.
+ Closes: #818004
+
+ -- Christoph Berg <[email protected]> Mon, 21 Mar 2016 18:40:41 +0100
+
openipmi (2.0.21-1) unstable; urgency=medium
* new upstream release from 2014-01-28
diff -Nru openipmi-2.0.21/debian/control openipmi-2.0.21/debian/control
--- openipmi-2.0.21/debian/control 2016-03-22 13:35:33.000000000 +0100
+++ openipmi-2.0.21/debian/control 2016-03-22 13:18:20.000000000 +0100
@@ -2,8 +2,8 @@
Section: admin
Priority: optional
Maintainer: Noël Köthe <[email protected]>
-Build-Depends: debhelper (>> 5.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev,
- chrpath, autotools-dev, libssl-dev
+Build-Depends: debhelper (>> 9.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev,
+ chrpath, autotools-dev, libssl-dev, dh-autoreconf
Standards-Version: 3.9.6
Homepage: https://openipmi.sourceforge.net/
diff -Nru openipmi-2.0.21/debian/patches/configure openipmi-2.0.21/debian/patches/configure
--- openipmi-2.0.21/debian/patches/configure 1970-01-01 01:00:00.000000000 +0100
+++ openipmi-2.0.21/debian/patches/configure 2016-03-22 13:17:15.000000000 +0100
@@ -0,0 +1,23 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,7 +1,4 @@
+ OPENIPMI_PKG_NAME=OpenIPMI
+-OPENIPMI_VERSION_MAJOR=2
+-OPENIPMI_VERSION_MINOR=0
+-OPENIPMI_VERSION_RELEASE=21
+ OPENIPMI_VERSION_EXTRA=
+ AC_INIT([OpenIPMI], [2.0.21], [[email protected]], [OpenIPMI])
+ AC_CANONICAL_TARGET
+@@ -283,9 +280,9 @@ AC_CHECK_FUNCS(getaddrinfo)
+
+ AC_CHECK_HEADERS(execinfo.h)
+
+-AC_SUBST(OPENIPMI_VERSION_MAJOR)
+-AC_SUBST(OPENIPMI_VERSION_MINOR)
+-AC_SUBST(OPENIPMI_VERSION_RELEASE)
++AC_SUBST(OPENIPMI_VERSION_MAJOR, 2)
++AC_SUBST(OPENIPMI_VERSION_MINOR, 0)
++AC_SUBST(OPENIPMI_VERSION_RELEASE, 21)
+ AC_SUBST(OPENIPMI_VERSION_EXTRA)
+
+ AC_SUBST(POPTLIBS)
diff -Nru openipmi-2.0.21/debian/patches/series openipmi-2.0.21/debian/patches/series
--- openipmi-2.0.21/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ openipmi-2.0.21/debian/patches/series 2016-03-22 13:16:44.000000000 +0100
@@ -0,0 +1 @@
+configure
diff -Nru openipmi-2.0.21/debian/rules openipmi-2.0.21/debian/rules
--- openipmi-2.0.21/debian/rules 2016-03-22 13:35:33.000000000 +0100
+++ openipmi-2.0.21/debian/rules 2016-03-21 18:55:03.000000000 +0100
@@ -18,6 +18,7 @@
config.status: configure
cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
dh_testdir
+ dh_autoreconf
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
@@ -50,6 +51,7 @@
rm -f config.sub config.guess
dh_clean
+ dh_autoreconf_clean
install: install-arch
@@ -61,6 +63,7 @@
# Add here commands to install the arch part of the package into
# debian/tmp.
+ mkdir -p $(CURDIR)/debian/tmp/usr/bin
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# remove useless rpath from libOpenIPMIposix (which is built with
diff -Nru openipmi-2.0.21/debian/source/format openipmi-2.0.21/debian/source/format
--- openipmi-2.0.21/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ openipmi-2.0.21/debian/source/format 2016-03-22 13:16:34.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
signature.asc
Description: PGP signature
