On Tue, 2019-12-31 at 12:25 +0100, Gianfranco Costamagna wrote:
> Hello,
>
> On Wed, 06 Nov 2019 20:08:19 +0000 Martyn Welch <mar...@welchs.me.uk>
> wrote:
> > On Wed, 2019-11-06 at 19:36 +0000, Martyn Welch wrote:
> > > Source: dlt-daemon
> > > Version: 2.18.4-0.1
> > > Severity: minor
> > >
> > > Dear Maintainer,
> > >
> > > Whilst tweaking the dlt-daemon for a Debian derivative I noticed
> > > that
> > > this
> > > package ships example systemd unit files which require binaries
> > > found
> > > in the
> > > dlt-tools and libdlt-examples packages. It is likely that in many
> > > circumstances
> > > dlt-daemon will be installed on systems without dlt-tools or
> > > libdlt-
> > > examples
> > > being present, hence these example units are unusable and are
> > > essentially cruft
> > > on many systems that may in fact be limited in storage.
> > >
> > > I have attached a patch which moves the example systemd unit
> > > files to
> > > the
> > > appropriate packages.
> > >
> >
> > Oops, forgot attachment!
>
> looks like also you forgot to do the upgrade testing...
> Moving files around packages requires some versioned breaks/replaces
> relationship between packages.
>
> Please have a look at https://wiki.debian.org/PackageTransition and
> update the patch with the updated control file.
>
Sorry for the delay. Now had a chance to look at this again.
Updated
patch attached,
Martyn
> thanks
>
> Gianfranco
>
From efaa193ecf92477cae9e01a87f433a31982a7813 Mon Sep 17 00:00:00 2001
From: Martyn Welch <martyn.we...@collabora.com>
Date: Wed, 6 Nov 2019 19:29:56 +0000
Subject: [PATCH v2] Move example systemd units to the appropriate packages
The dlt-daemon package ships example systemd unit files which require
binaries found in the dlt-tools and libdlt-examples packages. It is likely
that in many circumstances dlt-daemon will be installed on systems without
dlt-tools or libdlt-examples being present, hence these example units are
unusable and essentially cruft on many systems that may in fact be limited
in storage.
Move the example systemd unit files to the appropriate packages.
Signed-off-by: Martyn Welch <martyn.we...@collabora.com>
---
Changes since v1:
- Added versioning relationship information
debian/changelog | 7 +++++++
debian/control | 5 +++++
debian/dlt-daemon.install | 3 ---
debian/dlt-tools.install | 2 ++
debian/libdlt-examples.install | 1 +
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4bff75e..2632520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dlt-daemon (2.18.4-0.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload
+ * Move systemd unit files into associated packages
+
+ -- Martyn Welch <martyn.we...@collabora.com> Fri, 20 Mar 2020 16:37:12 +0000
+
dlt-daemon (2.18.4-0.1) unstable; urgency=medium
* Non-maintainer upload
diff --git a/debian/control b/debian/control
index 5380ca7..09fa784 100644
--- a/debian/control
+++ b/debian/control
@@ -38,6 +38,7 @@ Package: dlt-daemon
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: dlt-tools (<< 2.18.4-0.2), libdlt-examples (<< 2.18.4-0.2)
Suggests: dlt-tools
Description: Diagnostic Log and Trace logging daemon
This component provides a log and trace interface, based on the standardised
@@ -56,6 +57,8 @@ Package: dlt-tools
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: dlt-daemon (<< 2.18.4-0.2)
+Replaces: dlt-daemon (<< 2.18.4-0.2)
Suggests: dlt-daemon
Description: Diagnostic Log and Trace (DLT) (documentation)
This component provides a log and trace interface, based on the standardised
@@ -71,6 +74,8 @@ Package: libdlt-examples
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: dlt-daemon (<< 2.18.4-0.2)
+Replaces: dlt-daemon (<< 2.18.4-0.2)
Suggests: dlt-daemon
Description: Diagnostic Log and Trace (DLT) (documentation)
This component provides a log and trace interface, based on the standardised
diff --git a/debian/dlt-daemon.install b/debian/dlt-daemon.install
index 966fb63..a7ae18e 100644
--- a/debian/dlt-daemon.install
+++ b/debian/dlt-daemon.install
@@ -3,6 +3,3 @@ etc/dlt_gateway.conf
usr/bin/dlt-daemon
usr/share/man/man1/dlt-daemon.*
usr/share/man/man5/dlt.conf.*
-usr/lib/systemd/system/dlt-adaptor-udp.service /usr/share/doc/dlt-daemon/examples
-usr/lib/systemd/system/dlt-example-user.service /usr/share/doc/dlt-daemon/examples
-usr/lib/systemd/system/dlt-receive.service /usr/share/doc/dlt-daemon/examples
diff --git a/debian/dlt-tools.install b/debian/dlt-tools.install
index e7c2a0c..3a318af 100644
--- a/debian/dlt-tools.install
+++ b/debian/dlt-tools.install
@@ -14,3 +14,5 @@ usr/share/man/man1/dlt-*-ctrl*
usr/share/man/man1/dlt-receive*
usr/share/man/man1/dlt-system*
usr/share/man/man5/dlt-system*
+usr/lib/systemd/system/dlt-adaptor-udp.service /usr/share/doc/dlt-tools/examples
+usr/lib/systemd/system/dlt-receive.service /usr/share/doc/dlt-tools/examples
diff --git a/debian/libdlt-examples.install b/debian/libdlt-examples.install
index 960d661..e16a1d1 100644
--- a/debian/libdlt-examples.install
+++ b/debian/libdlt-examples.install
@@ -4,3 +4,4 @@ examples/* /usr/share/doc/libdlt-examples
src/examples/* /usr/share/doc/libdlt-examples
doc/*.txt /usr/share/doc/libdlt-examples
doc/images/* /usr/share/doc/libdlt-examples
+usr/lib/systemd/system/dlt-example-user.service /usr/share/doc/libdlt-examples/examples
--
2.25.1
