summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-11-02 11:29:20 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-11-02 11:29:20 +0000
commite23f8506870ca98b5c41614cf275cdbf79a412a2 (patch)
tree9e93bff2be1401e32a8af9d926dbf9f9c219b457
parentReleasing progress-linux version 1.2.6-1~progress7+u1. (diff)
downloadlibnftnl-e23f8506870ca98b5c41614cf275cdbf79a412a2.tar.xz
libnftnl-e23f8506870ca98b5c41614cf275cdbf79a412a2.zip
Merging debian version 1.2.6-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/control9
-rwxr-xr-xdebian/rules7
3 files changed, 15 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index b789076..bbb8a53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libnftnl (1.2.6-2) unstable; urgency=medium
+
+ * [b8d5c66] d/rules: let dh manage build-flags
+ * [05d66dc] d/control, d/rules: build -doc package in `binary-indep` target
+ (Closes: #1043314)
+ * [965513d] d/control, d/rules: add `nodoc` build-profile support
+
+ -- Jeremy Sowden <jeremy@azazel.net> Wed, 09 Aug 2023 16:09:58 +0100
+
libnftnl (1.2.6-1~progress7+u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 2c843e2..5e50049 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,8 @@ XSBC-Original-Maintainer: Debian Netfilter Packaging Team <team+pkg-netfilter-te
XSBC-Original-Uploaders: Arturo Borrero Gonzalez <arturo@debian.org>,
Jeremy Sowden <jeremy@azazel.net>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper-compat (= 13),
- doxygen,
- graphviz,
- libmnl-dev,
- libtool,
- pkg-config
+Build-Depends: debhelper-compat (= 13), libmnl-dev, libtool, pkg-config
+Build-Depends-Indep: doxygen <!nodoc>, graphviz <!nodoc>
Rules-Requires-Root: no
Standards-Version: 4.6.2
Section: libs
@@ -52,6 +48,7 @@ Description: Development files for libnftnl
Package: libnftnl-dev-doc
Section: doc
Architecture: all
+Build-Profiles: <!nodoc>
Multi-Arch: foreign
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 090055f..d3fad4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
export DH_VERBOSE=1
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
%:
dh $@
@@ -11,6 +9,7 @@ include /usr/share/dpkg/buildflags.mk
override_dh_auto_configure:
dh_auto_configure -- --enable-static
-override_dh_auto_build:
- dh_auto_build
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
+execute_after_dh_auto_build-indep:
doxygen doxygen.cfg
+endif