[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1063693: marked as done (xdm: move systemd unit to /usr (DEP17))

Your message dated Thu, 13 Jun 2024 02:34:59 +0000
with message-id <E1sHaIl-00Cmha-Ts@fasolo.debian.org>
and subject line Bug#1063693: fixed in xdm 1:1.1.11-3.1
has caused the Debian Bug report #1063693,
regarding xdm: move systemd unit to /usr (DEP17)
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 owner@bugs.debian.org
immediately.)


-- 
1063693: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063693
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: xdm
Version: 1:1.1.11-3
Tags: patch trixie sid
User: helmutg@debian.org
Usertags: dep17m2

Hi,

we want to finalize the /usr-merge transition by moving all aliased
files from / to /usr via DEP17 to avoid any negative effects arising
from aliasing. xdm is involved, because it installs a systemd unit. The
systemd.pc file contains a variable systemdsystemunit dir that points to
the right location in different Debian releases and xdm's upstream build
system can automatically use this information. I'm attaching a patch for
xdm that moves the unit in trixie or later, but also is safe for
backporting.

Helmut

diff -u xdm-1.1.11/debian/changelog xdm-1.1.11/debian/changelog
--- xdm-1.1.11/debian/changelog
+++ xdm-1.1.11/debian/changelog
@@ -1,3 +1,10 @@
+xdm (1:1.1.11-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Let systemd.pc determine the location of systemd units. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Sat, 10 Feb 2024 09:00:06 +0100
+
 xdm (1:1.1.11-3) unstable; urgency=medium
 
   * Team upload.
diff -u xdm-1.1.11/debian/control xdm-1.1.11/debian/control
--- xdm-1.1.11/debian/control
+++ xdm-1.1.11/debian/control
@@ -5,8 +5,9 @@
 Uploaders: Cyril Brulebois <kibi@debian.org>
 Build-Depends:
  debhelper (>= 9),
+ dh-exec,
  dpkg-dev (>= 1.16.1),
- pkg-config,
+ pkgconf,
  libxmu-dev (>= 1:1.0.1),
  libx11-dev (>= 2:1.0.0),
  libxau-dev (>= 1:1.0.0),
@@ -18,6 +19,7 @@
  quilt,
  automake,
  libtool,
+ systemd-dev,
  xutils-dev,
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xdm
diff -u xdm-1.1.11/debian/rules xdm-1.1.11/debian/rules
--- xdm-1.1.11/debian/rules
+++ xdm-1.1.11/debian/rules
@@ -13,6 +13,8 @@
 
 include debian/xsfbs/xsfbs.mk
 
+export deb_systemdsystemunitdir := $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,)
+
 confflags += \
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
@@ -24,7 +26,7 @@
 	--with-pixmapdir=/usr/share/X11/xdm/pixmaps \
 	--with-color-pixmap=debian.xpm \
 	--with-bw-pixmap=debianbw.xpm \
-	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemdsystemunitdir \
 	--disable-xdm-auth \
 	--with-xft \
 	--disable-silent-rules \
@@ -126,6 +128,7 @@
 	dh_testroot
 
 	dh_installdocs
+	chmod +x debian/xdm.install
 	dh_install --sourcedir=debian/tmp --list-missing
 	dh_installchangelogs ChangeLog
 	dh_installinit --noscripts
diff -u xdm-1.1.11/debian/xdm.install xdm-1.1.11/debian/xdm.install
--- xdm-1.1.11/debian/xdm.install
+++ xdm-1.1.11/debian/xdm.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 etc/X11/app-defaults/Chooser
 etc/X11/xdm/Xaccess
 etc/X11/xdm/Xreset
@@ -10,7 +11,7 @@
 etc/X11/xdm/xdm-config
 etc/X11/xdm/xdm.options
 etc/insserv.conf.d/xdm
-lib/systemd/system/xdm.service
+${deb_systemdsystemunitdir}/xdm.service
 usr/bin/xdm
 usr/lib/X11/xdm/chooser
 usr/lib/X11/xdm/libXdmGreet.so

--- End Message ---
--- Begin Message --- 
Source: xdm
Source-Version: 1:1.1.11-3.1
Done: Chris Hofstaedtler <zeha@debian.org>

We believe that the bug you reported is fixed in the latest version of
xdm, 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 1063693@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Chris Hofstaedtler <zeha@debian.org> (supplier of updated xdm 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 ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Thu, 30 May 2024 03:12:21 +0200
Source: xdm
Architecture: source
Version: 1:1.1.11-3.1
Distribution: unstable
Urgency: medium
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Chris Hofstaedtler <zeha@debian.org>
Closes: 1063693
Changes:
 xdm (1:1.1.11-3.1) unstable; urgency=medium
 .
   * Non-maintainer upload.
 .
   [ Helmut Grohne ]
   * Let systemd.pc determine the location of systemd units. (Closes: #1063693)
Checksums-Sha1:
 9f9b0265fa5d5a9111aa099dd4501189cdaa9370 2064 xdm_1.1.11-3.1.dsc
 185c34b06f8821a5d25955dcdf1dcc3599e27332 66892 xdm_1.1.11-3.1.diff.gz
 b3b03d7b8b71fa0a13c38124eb363579cb5e1e76 8062 xdm_1.1.11-3.1_arm64.buildinfo
Checksums-Sha256:
 c0a961b2e3baa98e9fc73ee7cde8d56803a8d02295be6b023a92c3aaf411e11a 2064 xdm_1.1.11-3.1.dsc
 eb868bd2cacec4162e84553b42b488be346f33d5213b971928297adfd8b7e724 66892 xdm_1.1.11-3.1.diff.gz
 29255218cd0e25a9c0c0f82593cdd642fc2d27a7a8cfcfa0459ca766023e7824 8062 xdm_1.1.11-3.1_arm64.buildinfo
Files:
 73cc20500d11b371f1c086a70d35a0d3 2064 x11 optional xdm_1.1.11-3.1.dsc
 a572327507549a09494a1b01ecc1e65d 66892 x11 optional xdm_1.1.11-3.1.diff.gz
 4f0a3aba456c15f80c4fa1f5611acd67 8062 x11 optional xdm_1.1.11-3.1_arm64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIyBAEBCAAdFiEEfRrP+tnggGycTNOSXBPW25MFLgMFAmZX03wACgkQXBPW25MF
LgN0mA/2K7xD+Ech01UKq0HFC4dbEYGIkfO0LGyCAnpMa2hSglfSZMGvaRW+32j+
Um851xMLoAa5YW8r2bkp8xQ/THBKIE92RGm/+zzL6Imh1NDwPMiy14N8LCasJgbB
NtiaEpr7jgwluFf216mxVjVPpTsPJNLgyoGMo0eKV0IlciM7LC+fnyWsCBSnF5xP
F8vdpH8cJip1oatyyXzSOK/6kZjBGH0cH1Hd2FPUtexz1g+az3ynZIqsnBe/OndG
XXjqg4eHw7bs74b6QKbBDPu/z5CPllV36oGpWxfJuq/CGVOf8NbkuXLuQ9636YL2
Oy5J7IRrovpJZPTjDMkd4/SfsUEewW3TovxLxF4wzeXNl2i0rhJzt5//JnmtTuw9
2icg356Kv3LLxRj/VcG/s1tSBs9SXQcjFAJCQokuCjUCVcEadUWEXJQHhYN/Mal9
nb+MNnB1nV3B1WDlK7uvs8kjGyeGNwgmk2DDq+f9MWMMXbx1ftog11fMUjhdixi9
6/E2Aa2GRA1t9BbzJBmWVx32ur1ldOy61BIfA8EFYt7OZ45+Iuw5aIne93wT6Lxi
yjyGp5eqQZzGt6NP3lS9PqtfX0yMeyYaXppmYCuZT0VRl0bqZy15c+w5mZjV/byE
gEvEd87ZYHOD37Iq6fBPD0RPYqqJvfDRiPRV+f5zukK3CVB8aQ==
=XQMS
-----END PGP SIGNATURE-----

Attachment: pgpT7A49e5r3b.pgp
Description: PGP signature


--- End Message ---
Reply to: