From baa72faf7312000b27df6186b90b54bfdb79d2ca Mon Sep 17 00:00:00 2001 From: Jo Date: Tue, 23 Apr 2024 19:54:13 +0200 Subject: [PATCH 1/2] First working of stanalone debuild --- debian/compat | 2 +- debian/libmbus-dev.install | 8 ++++---- debian/libmbus1.install | 2 +- debian/rules | 8 ++++++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011e..b1bd38b6 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +13 diff --git a/debian/libmbus-dev.install b/debian/libmbus-dev.install index f6e83a86..7355f185 100644 --- a/debian/libmbus-dev.install +++ b/debian/libmbus-dev.install @@ -1,5 +1,5 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/*.la -usr/lib/pkgconfig/libmbus.pc +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/*.la +usr/lib/*/pkgconfig/libmbus.pc diff --git a/debian/libmbus1.install b/debian/libmbus1.install index 09955d8b..3fd06cf8 100644 --- a/debian/libmbus1.install +++ b/debian/libmbus1.install @@ -1,3 +1,3 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* usr/bin/* usr/share/* diff --git a/debian/rules b/debian/rules index 372fa02c..15fd49ab 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +execute_before_dh_autoreconf: + mkdir -p ./m4 + %: - dh --with autoreconf $@ + dh $@ --with autoreconf -.PHONY: override_dh_strip override_dh_strip: dh_strip --dbg-package=libmbus1-dbg @@ -14,3 +16,5 @@ override_dh_strip: #override_dh_usrlocal: # echo "dh_usrlocal does nothing" + +.PHONY: override_dh_strip execute_before_dh_autoreconf From 845e5210ba369ec7de5f597206ffee790c2e882e Mon Sep 17 00:00:00 2001 From: Jo Date: Wed, 24 Apr 2024 06:35:53 +0200 Subject: [PATCH 2/2] Removed a few lintian warnings and did some minor fixes --- debian/compat | 2 +- debian/control | 10 +++++----- debian/rules | 2 +- debian/source/format | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 debian/source/format diff --git a/debian/compat b/debian/compat index b1bd38b6..48082f72 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -13 +12 diff --git a/debian/control b/debian/control index 0f224180..91c27574 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: libmbus -Priority: extra +Priority: optional Maintainer: Robert Johansson -Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf +Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.4 Section: libs Homepage: http://www.rscada.se/libmbus @@ -9,7 +9,7 @@ Homepage: http://www.rscada.se/libmbus Package: libmbus-dev Section: libdevel Architecture: any -Depends: libmbus1 (= ${binary:Version}), libc6 +Depends: libmbus1 (= ${binary:Version}), ${misc:Depends} Description: FreeSCADA M-Bus Library Development files. A free and open-source library for M-Bus (Meter Bus) from the rSCADA project, including development files. @@ -17,14 +17,14 @@ Description: FreeSCADA M-Bus Library Development files. Package: libmbus1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libc6 +Depends: ${shlibs:Depends}, ${misc:Depends} Description: FreeSCADA M-Bus Library. A free and open-source library for M-Bus (Meter Bus) from the rSCADA project. Package: libmbus1-dbg Architecture: any Section: debug -Priority: extra +Priority: optional Depends: libmbus1 (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for libmbus1 A free and open-source library for M-Bus (Meter Bus) from the rSCADA project, diff --git a/debian/rules b/debian/rules index 15fd49ab..19812725 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 execute_before_dh_autoreconf: - mkdir -p ./m4 + mkdir -p m4 libltdl/config %: dh $@ --with autoreconf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..89ae9db8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native)