Source: hwinfo
Version: 21.52-1
Severity: wishlist
Tags: patch
I tried making hwinfo cross buildable, but that turned out to be rather
more difficult. While at it I went improved some aspects of the
packaging. The attached patch contains my suggestions. The various
aspectes are:
* Including architecture.mk is simpler than computing
DEB_HOST_MULTIARCH.
* Including pkg-info.mk is simpler than working out the version and
coming up with tricky sed expressions.
* Using dh_auto_build (which happens to not work in parallel mode for
hwinfo) allows passing cross compilers to make at least.
Regardless of whether you apply them or not, you should close this bug
report no later than your next hwinfo upload. I hope this helps.
Helmut
diff --minimal -Nru hwinfo-21.52/debian/changelog hwinfo-21.52/debian/changelog
--- hwinfo-21.52/debian/changelog 2018-02-12 17:56:22.000000000 +0100
+++ hwinfo-21.52/debian/changelog 2018-05-08 18:48:42.000000000 +0200
@@ -1,3 +1,10 @@
+hwinfo (21.52-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Simplify packaging by using more dpkg and debhelper. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 08 May 2018 18:48:42 +0200
+
hwinfo (21.52-1) unstable; urgency=medium
* New upstream version 21.52
diff --minimal -Nru hwinfo-21.52/debian/rules hwinfo-21.52/debian/rules
--- hwinfo-21.52/debian/rules 2018-02-12 17:56:22.000000000 +0100
+++ hwinfo-21.52/debian/rules 2018-05-08 18:48:42.000000000 +0200
@@ -5,23 +5,21 @@
#export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow,+pie
DPKG_EXPORT_BUILDFLAGS=1
+include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/pkg-info.mk
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
-DEBVERS ?= $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-VERSION ?= $(shell echo '$(DEBVERS)' | sed -e 's/^[[:digit:]]*://' -e
's/[-].*//')
-
# this is passed to patched hwinfo Makefile
-export HWINFO_VERSION=$(VERSION)
+export HWINFO_VERSION=$(DEB_VERSION_UPSTREAM)
%:
dh $@
override_dh_auto_build:
- make
- make doc
+ dh_auto_build --no-parallel
+ dh_auto_build --no-parallel -- doc
override_dh_auto_clean:
dh_auto_clean
@@ -40,4 +38,4 @@
ln -s /usr/share/javascript/jquery/jquery.js $(DOCDIR)/jquery.js
gen-upstream-changelog:
- bash debian/gen-upstream-changelog.sh $(VERSION)
+ bash debian/gen-upstream-changelog.sh $(DEB_VERSION_UPSTREAM)
