debian: Make liblopsub-dev usable for cross compilation.

In order to build a package such as tfortune which depends on the
lopsub library, we need the liblopsub shared library for the host
architecture, and we also need to run lopsubgen as a build architecture
executable. These things currently reside in the same binary package,
but for a cross build we need them to be installed for different
architectures.

This patch splits liblopsub-dev. The new liblopsub-bin package only
contains lopsubgen and its man page. Since the -dev package depends
on the -bin package, all existing uses will continue to work as
is. For a cross build, liblopsub-dev will continue to be installed
for the host architecture. liblopsub-bin will be installed for the
build architecture though as it will be marked Multi-Arch: foreign,
indicating that the architecture of the package does not matter for
interactions with it.

V3: Edit debian/changelog since this is no longer an NMU, add signed-off-by
V2: Add missing "Multi-Arch: same" for liblopsub1t64, fix typo

Signed-off-by: Andre Noll <maan@tuebingen.mpg.de>

diff --git a/debian/changelog b/debian/changelog
index af146095cbb292eb2a411781879af720480a2404..dc53520e8746f6a3adf0972253255ba1a740f98b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+liblopsub (1.0.5-2) experimental; urgency=medium
+
+  [ Helmut Grohne ]
+  * Split lopsubgen into a Multi-Arch: foreign package. Closes: #1078823
+
+  [ Andre Noll ]
+  * Mark liblopsub1t64 Multi-Arch: same.
+
+ -- Andre Noll <maan@tuebingen.mpg.de>  Mon, 26 Aug 2024 16:21:14 +0200
+
 liblopsub (1.0.5-1) unstable; urgency=medium
 
   * prefer https:// over http:// and git://

diff --git a/debian/control b/debian/control
index 0216b982bab0f6998b3133c7aaed630ad7816ced..668fbd9058dd06040c3e72cd73b7c8343af14b0e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Provides: ${t64:Provides}
 Replaces: liblopsub1
 Breaks: liblopsub1 (<< ${source:Version})
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Long Option Parser for Subcommands
  Lopsub  is  an  open  source library written in C which aims to ease
@@ -28,7 +29,7 @@ Description: Long Option Parser for Subcommands
 
 Package: liblopsub-dev
 Architecture: any
-Depends: ${shlibs:Depends}, liblopsub1t64 (= ${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, liblopsub1t64 (= ${binary:Version}), ${misc:Depends}, liblopsub-bin (= ${binary:Version})
 Description: Long Option Parser for Subcommand - headers
  Lopsub  is  an  open  source library written in C which aims to ease
  the task of creating, documenting and parsing the options of Unix
@@ -40,3 +41,21 @@ Description: Long Option Parser for Subcommand - headers
  supports single-character short options and GNU-style long  options.
  The public API is well documented and stable.
  This package contains the development environment for the lopsub library.
+
+Package: liblopsub-bin
+Architecture: any
+Multi-Arch: foreign
+Depends: ${shlibs:Depends}, liblopsub1t64 (= ${binary:Version}), ${misc:Depends}
+Breaks: liblopsub-dev (<< 1.0.5-1.1~)
+Replaces: liblopsub-dev (<< 1.0.5-1.1~)
+Description: Long Option Parser for Subcommand - generator
+ Lopsub  is  an  open  source library written in C which aims to ease
+ the task of creating, documenting and parsing the options of Unix
+ command line utilities. It is suitable for simple commands as well
+ as complex command line utilities with many subcommands where  each
+ subcommand  has its own set of options. Options and documentation are
+ kept together in a single file which can be translated to C code (to
+ be included in the application), or to a manual page.  The library
+ supports single-character short options and GNU-style long  options.
+ The public API is well documented and stable.
+ This package contains the lopsubgen conversion utility.

diff --git a/debian/liblopsub-dev.install b/debian/liblopsub-dev.install
index 8e6c62d716489823a420d6e05dcc0c1859a17b0f..773fd2a0842c35991fc0e8f44bb36cae6c2f3e5a 100644 (file)
--- a/debian/liblopsub-dev.install
+++ b/debian/liblopsub-dev.install
@@ -1,5 +1,3 @@
 usr/include/*
 usr/lib/*/liblopsub.so
-usr/bin/lopsubgen
-usr/share/man/man1/lopsubgen*
 usr/share/man/man5/lopsub-suite*

diff --git a/debian/rules b/debian/rules
index ddb503d8fc4ef189bce5846383f4f0b686c6c2d5..4f5f5ca83cb2520e7697fa645ca8b40aa6ea8de9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 
 package := liblopsub1t64
 devpackage := liblopsub-dev
+binpackage := liblopsub-bin
 
 define checkdir
        @test -f debian/rules -a -f lopsub.c || \
@@ -47,6 +48,8 @@ binary: build
        mv $(TMPDIR)/usr/lib-$(TRIPLET) $(TMPDIR)/usr/lib/$(TRIPLET)
        dh_install -p $(package)
        dh_install -p $(devpackage)
+       dh_install -p $(binpackage)
+       dh_link -p $(binpackage)
        dh_lintian
        $(MAKE_DIR) $(DESTDIR)/DEBIAN $(DOCS_DIR) $(DEVDOCS_DIR)
        echo 'activate-noawait ldconfig' > $(DESTDIR)/DEBIAN/triggers