Package: uruk
Version: 20231009-1
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 negative effects arising from
aliasing. uruk is involved, because it uses --prefix=/ and thus causes aliasing. I'm sending a patch, because it cannot automatically be
converted using dh-sequence-movetousr. Note that this patch must not be uploaded to bookworm-backports or earlier as it would violate the file
move moratorium there.

Helmut

diff --minimal -Nru uruk-20231009/debian/changelog uruk-20231009/debian/changelog
--- uruk-20231009/debian/changelog 2023-10-09 14:30:23.000000000 +0200
+++ uruk-20231009/debian/changelog 2024-02-11 07:37:17.000000000 +0100
@@ -1,3 +1,10 @@
+uruk (20231009-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files to /usr for DEP17. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 11 Feb 2024 07:37:17 +0100
+
uruk (20231009-1) unstable; urgency=medium

* New upstream release: The Vyttila - Kakkanad Release.
diff --minimal -Nru uruk-20231009/debian/rules uruk-20231009/debian/rules
--- uruk-20231009/debian/rules 2023-10-09 14:30:23.000000000 +0200
+++ uruk-20231009/debian/rules 2024-02-11 07:37:17.000000000 +0100
@@ -33,8 +33,8 @@

build-indep:
$(checkdir)
- ./configure --prefix=/ --datarootdir=/usr/share \
- --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
+ ./configure --prefix=/usr --exec-prefix=/usr --datarootdir=/usr/share \ + --sysconfdir=/etc --localstatedir=/var '--libexecdir=$${prefix}/lib'
$(M

Hi Helmut,

Thanks a lot for this beautiful patch. Do you intend to take care of uploading it to unstable too? If not, I'm happy to do that of course.

Bye,

Joost

On Sun, Feb 11, 2024 at 07:47:03AM +0100, Helmut Grohne wrote:

Package: uruk
Version: 20231009-1
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 negative effects arising from aliasing. uruk is involved, because it uses --prefix=/ and thus causes aliasing. I'm sending a patch, because it cannot automatically be
converted using dh-sequence-movetousr. Note that this patch must not be uploaded to bookworm-backports or earlier as it would violate the file
move moratorium there.

Helmut

diff --minimal -Nru uruk-20231009/debian/changelog uruk-20231009/debian/changelog
--- uruk-20231009/debian/changelog 2023-10-09 14:30:23.000000000 +0200
+++ uruk-20231009/debian/changelog 2024-02-11 07:37:17.000000000 +0100
@@ -1,3 +1,10 @@
+uruk (20231009-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files to /usr for DEP17. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Sun, 11 Feb 2024 07:37:17 +0100
+
uruk (20231009-1) unstable; urgency=medium

* New upstream release: The Vyttila - Kakkanad Release.
diff --minimal -Nru uruk-20231009/debian/rules uruk-20231009/debian/rules
--- uruk-20231009/debian/rules 2023-10-09 14:30:23.000000000 +0200
+++ uruk-20231009/debian/rules 2024-02-11 07:37:17.000000000 +0100
@@ -33,8 +33,8 @@

build-indep:
$(checkdir)
- ./configure --prefix=/ --datarootdir=/usr/share \
- --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib
+ ./configure --prefix=/usr --exec-prefix=/usr --datarootdir=/usr/share \ + --sysconfdir=/etc --localstatedir=/var '--libexecdir=$${prefix}/lib'
$(MAKE)
touch build

@@ -51,17 +51,13 @@
install -d debian/$(package)
# # /libexec/uruk/init/{autodetect-ips,enable-ipv6}
# # should end up in /lib/uruk/init/
- $(MAKE) install prefix=$(CURDIR)/debian/$(package) \
- datarootdir=$(CURDIR)/debian/$(package)/usr/share \
- sysconfdir=$(CURDIR)/debian/$(package)/etc \
- localstatedir=$(CURDIR)/debian/$(package)/var \
- libexecdir=$(CURDIR)/debian/$(package)/lib
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/$(package)
mkdir -p debian/$(package)/etc/uruk
mkdir -p debian/$(package)/etc/default
mkdir -p debian/$(package)/usr/share/lintian/overrides
cp -a debian/rc debian/$(package)/etc/uruk
# # /libexec will contain uruk/lsb/*, not needed on Debian
- rm -r debian/$(package)/lib/uruk/lsb
+ rm -r debian/$(package)/usr/lib/uruk/lsb
cp -a debian/lintian-overrides debian/$(package)/usr/share/lintian/overrides/$(package)
mv $(CURDIR)/debian/$(package)/usr/share/doc/$(package)/examples/default debian/$(package)/etc/default/uruk
rm $(CURDIR)/debian/$(package)/usr/share/doc/$(package)/COPYING

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Hi Joost,

On Sun, Feb 11, 2024 at 10:19:50AM +0100, Joost van Baal-Ilić wrote:

Thanks a lot for this beautiful patch. Do you intend to take care of uploading
it to unstable too? If not, I'm happy to do that of course.

Thanks for the quick reply. I prefer you uploading it as you know your
git workflow best. Let me know if you want me to NMU it. Realistically,
we need this done by September 2024 to finish the transition in time.

Helmut

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

tags 1063692 +pending
thanks

Hi Helmut,

On Sun, Feb 11, 2024 at 02:17:47PM +0100, Helmut Grohne wrote:

On Sun, Feb 11, 2024 at 10:19:50AM +0100, Joost van Baal-Ilić wrote:

Thanks a lot for this beautiful patch. Do you intend to take care of uploading
it to unstable too? If not, I'm happy to do that of course.

Thanks for the quick reply. I prefer you uploading it as you know your
git workflow best. Let me know if you want me to NMU it. Realistically,
we need this done by September 2024 to finish the transition in time.

Cool; just committed your patch; I'll take care of the upload.

Bye,

Joost

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)