Your message dated Sun, 17 Dec 2023 21:04:59 +0000
with message-id <[email protected]>
and subject line Bug#1057925: fixed in cubemap 1.5.1-1
has caused the Debian Bug report #1057925,
regarding cubemap: use systemd.pc to place systemd system units
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1057925: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057925
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: cubemap
Version: 1.4.3-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2
Dear Maintainer,
your package installs systemd system units, currently into /lib.
These files need to be moved to /usr/lib as part of Debian's usr-merge
effort [1].
Attached you will find a patch to delegate the exact placement of
these files to systemd.pc (using pkg-config). This immediately works
in unstable, placing the files into /usr/lib.
It also works for backports to older releases, where it will continue
install into /lib.
The patch inside the debdiff is probably suitable for upstream, if
you want to forward it.
If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload
to experimental first when these changes are done.
Later during the trixie cycle I expect this bug class to raise in
priority.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru cubemap-1.4.3/debian/changelog cubemap-1.4.3/debian/changelog
--- cubemap-1.4.3/debian/changelog 2020-11-01 18:55:26.000000000 +0100
+++ cubemap-1.4.3/debian/changelog 2023-12-10 19:39:51.000000000 +0100
@@ -1,3 +1,11 @@
+cubemap (1.4.3-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Use systemd.pc to determine install location for systemd system unit files.
+ (Closes: #-1)
+
+ -- Chris Hofstaedtler <[email protected]> Sun, 10 Dec 2023 19:39:51 +0100
+
cubemap (1.4.3-2) unstable; urgency=medium
* Remove myself from uploaders.
diff -Nru cubemap-1.4.3/debian/control cubemap-1.4.3/debian/control
--- cubemap-1.4.3/debian/control 2020-11-01 18:55:26.000000000 +0100
+++ cubemap-1.4.3/debian/control 2023-12-10 19:39:51.000000000 +0100
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Steinar H. Gunderson <[email protected]>
-Build-Depends: debhelper (>= 9.20160709), libprotobuf-dev, protobuf-compiler, dh-autoreconf, pkg-config, libsystemd-dev, libtomcrypt-dev
+Build-Depends: debhelper (>= 9.20160709), libprotobuf-dev, protobuf-compiler, dh-autoreconf, pkg-config, libsystemd-dev, libtomcrypt-dev, systemd-dev
Standards-Version: 4.5.0
Homepage: http://git.sesse.net/?p=cubemap
diff -Nru cubemap-1.4.3/debian/patches/1000-systemdsystemunitdir.patch cubemap-1.4.3/debian/patches/1000-systemdsystemunitdir.patch
--- cubemap-1.4.3/debian/patches/1000-systemdsystemunitdir.patch 1970-01-01 01:00:00.000000000 +0100
+++ cubemap-1.4.3/debian/patches/1000-systemdsystemunitdir.patch 2023-12-10 19:39:51.000000000 +0100
@@ -0,0 +1,43 @@
+Use systemd.pc to determine install location of systemd system unit files.
+
+Index: cubemap-1.4.3/Makefile.in
+===================================================================
+--- cubemap-1.4.3.orig/Makefile.in
++++ cubemap-1.4.3/Makefile.in
+@@ -7,6 +7,7 @@ CPPFLAGS += -Itlse -DWITH_KTLS -DNO_TLS_
+ CXXFLAGS=-Wall @CXXFLAGS@ @protobuf_CFLAGS@ @libsystemd_CFLAGS@ @libtomcrypt_CFLAGS@ -pthread
+ LDFLAGS=@LDFLAGS@ -pthread
+ LIBS=@LIBS@ @protobuf_LIBS@ @libsystemd_LIBS@ @libtomcrypt_LIBS@
++SYSTEMDSYSTEMUNITDIR=@SYSTEMDSYSTEMUNITDIR@
+
+ OBJS=main.o client.o server.o stream.o udpstream.o serverpool.o input.o input_stats.o httpinput.o udpinput.o parse.o config.o acceptor.o stats.o accesslog.o thread.o util.o log.o metacube2.o sa_compare.o timespec.o state.pb.o tlse/tlse.o
+
+@@ -41,14 +42,14 @@ install:
+ $(DESTDIR)$(LOCALSTATEDIR)/lib/cubemap \
+ $(DESTDIR)$(LOCALSTATEDIR)/log/cubemap \
+ $(DESTDIR)$(PREFIX)/share/munin/plugins \
+- $(DESTDIR)/lib/systemd/system
++ $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)
+ $(INSTALL) -m 755 -o root -g root cubemap $(DESTDIR)$(PREFIX)/bin/cubemap
+ $(INSTALL) -m 755 -o root -g root munin/cubemap munin/cubemap_input $(DESTDIR)$(PREFIX)/share/munin/plugins/
+ gzip -c cubemap.1 > $(DESTDIR)$(PREFIX)/share/man/man1/cubemap.1.gz
+ sed \
+ -e "s,@prefix[@],$(PREFIX),g" \
+ -e "s,@sysconfdir[@],$(SYSCONFDIR),g" \
+- cubemap.service.in > $(DESTDIR)/lib/systemd/system/cubemap.service
++ cubemap.service.in > $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)/cubemap.service
+ # Make sure we don't overwrite an existing configuration.
+ test ! -f $(DESTDIR)$(SYSCONFDIR)/cubemap.config
+ sed \
+Index: cubemap-1.4.3/configure.ac
+===================================================================
+--- cubemap-1.4.3.orig/configure.ac
++++ cubemap-1.4.3/configure.ac
+@@ -9,6 +9,7 @@ PKG_PROG_PKG_CONFIG
+ PKG_CHECK_MODULES([libsystemd], [libsystemd])
+ PKG_CHECK_MODULES([protobuf], [protobuf])
+ PKG_CHECK_MODULES([libtomcrypt], [libtomcrypt])
++PKG_CHECK_VAR(SYSTEMDSYSTEMUNITDIR, systemd, systemdsystemunitdir)
+
+ CXXFLAGS="$CXXFLAGS -std=gnu++11"
+
diff -Nru cubemap-1.4.3/debian/patches/series cubemap-1.4.3/debian/patches/series
--- cubemap-1.4.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ cubemap-1.4.3/debian/patches/series 2023-12-10 19:35:42.000000000 +0100
@@ -0,0 +1 @@
+1000-systemdsystemunitdir.patch
--- End Message ---
--- Begin Message ---
Source: cubemap
Source-Version: 1.5.1-1
Done: Steinar H. Gunderson <[email protected]>
We believe that the bug you reported is fixed in the latest version of
cubemap, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steinar H. Gunderson <[email protected]> (supplier of updated cubemap package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 17 Dec 2023 21:05:04 +0100
Source: cubemap
Architecture: source
Version: 1.5.1-1
Distribution: unstable
Urgency: medium
Maintainer: Steinar H. Gunderson <[email protected]>
Changed-By: Steinar H. Gunderson <[email protected]>
Closes: 1057925
Changes:
cubemap (1.5.1-1) unstable; urgency=medium
.
* New upstream release.
* Uses systemd.pc to place systemd system units. Patch from
Chris Hofstaedtler. (Closes: #1057925)
* Add build-dependency on systemd-dev.
* Build-depend on FFmpeg to build ffmpeg_metacube_hack.so.
* Add lib/${DEB_HOST_MULTIARCH} to dirs.
* Move to dh-compat 13.
* Update versioned debhelper build-dependency.
* Remove obsolete dependency on lsb-base.
* Remove now-default dh --parallel argument.
* Remove now-default dependency on dh-autoreconf.
* Add Pre-Depends: ${misc:Pre-Depends} to debian/control.
Checksums-Sha1:
7e5adb1fc336063b69db6dafcedaab8e992c919b 1838 cubemap_1.5.1-1.dsc
8764568c98562585193436884af4d4033d53ea54 149005 cubemap_1.5.1.orig.tar.gz
c680aed7237bd1b17ed466732c2c61979a92402f 5560 cubemap_1.5.1-1.debian.tar.xz
846fb3cd125ddbb546293989293a041c71a56b3b 10074 cubemap_1.5.1-1_amd64.buildinfo
Checksums-Sha256:
af50279756e1f9b97ba76bc09ff08ae894204d7df3225766c6c4d1cccf6c5e3f 1838
cubemap_1.5.1-1.dsc
afec7cee27e588a4ebe116d324e88cb2ce4cc53694451d9edb107c4bd4ce6001 149005
cubemap_1.5.1.orig.tar.gz
13c960359b6f17d167d13b6715108af9c50ff6e6f7eaf0cedec3c7bd5f0029e0 5560
cubemap_1.5.1-1.debian.tar.xz
da66f20cbd8f701fbb1519167e8715475207f7efe90138371a019f9bc1f42215 10074
cubemap_1.5.1-1_amd64.buildinfo
Files:
5ad2c4a56aa629bac47b4ad455574880 1838 net optional cubemap_1.5.1-1.dsc
a50beba3bdfa7d8b8ae727c203794a84 149005 net optional cubemap_1.5.1.orig.tar.gz
121ce5abacce2476374d15d8dde3794e 5560 net optional
cubemap_1.5.1-1.debian.tar.xz
b7f674f8f252ab94f0e12f0a144ee35d 10074 net optional
cubemap_1.5.1-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEwukAT/AowY5OrduDf2F1YXeXj3YFAmV/WxoACgkQf2F1YXeX
j3YkJw/9EC85nlkTGKagHzYxlpuYzzQy77JfmDMi0okNUPp1GLTnisr5wc01k7Au
cAIL0+13AF4Et9FldOdYhaXG91JBZAIvWVtDj0uPw6rUA8FpgI9WdTzmX7C/Yar1
I6kAT4JYUUlFxHc2BaWxZhInF1/gOohEi0LtLjI1u84IXFDqkqM/GwqoG1NwDPYC
I9u5SkK3TpGJYT47bU77XPtKuOgyP16ioLv1ENpBEUFLS3zBFY/bt2A1k/6Nez4J
UoosL1y4HTSL2wgXpsjnVzxd0vT59QZwIoEn9z51TRD/VRyaTuryFMgxdysyLNir
dwn8DlYpISU/8gZBL0ZcLRegLtAT2W4U+idsJxUpG72uYf9fckra7L2Kg4LB/XAf
a24Db3SH/C/FFk5DypawR2FKwSR8R99C4+0jeyMhBrX7+tvnHng3u30KeJ92JMWv
g9/YxTkngQwLJ5BSnOxUqsvhjeIJ9kTIBoW0onSfp3S1cPZnLlLsckybe0E9AWJQ
wyzMAwZuN2Cl3YHNSZmPwb1Avxml+gDBAIaWRpFfOVbgLNL+Vhtf5L6paipO0w4E
s+zGcVPS5fcUM6ql+P1Cp2ypq9YqRt0ZaDdVkrq7YhhB7GOpG9UVIzBJxbmLLpCQ
A00Eir5lP2HejSNzoZn1ahn3OoMKy49vughkAMGFQYa1tJy5VxI=
=zBHz
-----END PGP SIGNATURE-----
--- End Message ---
