Source: nano
Version: 7.2-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Hi!

Your package installs files directly into /bin. For the ongoing
Debian UsrMerge effort [1] these files should move to /usr/bin in
the trixie cycle.

I'm attaching a patch to implement such a move.
As noted in d/changelog, the update-alternatives calls are
intentionally kept unchanged to preserve existing user
configuration.

However, please still read the wiki page on moving files, especially
if you intend to backport to bookworm or earlier. The patch has
already been checked by a local dumat copy.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please also see the wiki and upload
to experimental first when these changes are done.

Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru nano-7.2/debian/changelog nano-7.2/debian/changelog
--- nano-7.2/debian/changelog	2023-01-18 16:31:52.000000000 +0100
+++ nano-7.2/debian/changelog	2023-12-24 20:22:21.000000000 +0100
@@ -1,3 +1,12 @@
+nano (7.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install all files below /usr. (Closes: #-1)
+    Keep update-alternatives calls unchanged to preserve user
+    configuration.
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sun, 24 Dec 2023 20:22:21 +0100
+
 nano (7.2-1) unstable; urgency=medium
 
   * The "Blue checkmark" release.
diff -Nru nano-7.2/debian/rules nano-7.2/debian/rules
--- nano-7.2/debian/rules	2022-12-07 23:10:44.000000000 +0100
+++ nano-7.2/debian/rules	2023-12-24 20:22:21.000000000 +0100
@@ -13,8 +13,7 @@
 tinybuild=$(CURDIR)/build-tiny
 udebbuild=$(CURDIR)/build-udeb
 
-CONFFLAGS = \
-	--bindir=/bin
+CONFFLAGS =
 
 CONFFLAGS_nano =
 
@@ -54,18 +53,18 @@
 
 	dh_auto_install --builddirectory=$(tinybuild) \
 		--destdir=$(CURDIR)/debian/nano-tiny
-	mv debian/nano-tiny/bin/nano debian/nano-tiny/bin/nano-tiny
+	mv debian/nano-tiny/usr/bin/nano debian/nano-tiny/usr/bin/nano-tiny
 	rm -rf $(CURDIR)/debian/nano-tiny/usr/share/man
 	rm -rf $(CURDIR)/debian/nano-tiny/usr/share/info
 	rm -rf $(CURDIR)/debian/nano-tiny/usr/share/nano
 	rm -rf $(CURDIR)/debian/nano-tiny/usr/share/doc/nano
-	rm -f $(CURDIR)/debian/nano-tiny/bin/rnano
+	rm -f $(CURDIR)/debian/nano-tiny/usr/bin/rnano
 
 ifeq (,$(filter noudeb,$(DEB_BUILD_PROFILES)))
 	dh_auto_install --builddirectory=$(udebbuild) \
 		--destdir=$(CURDIR)/debian/nano-udeb
-	rm -rf $(CURDIR)/debian/nano-udeb/usr
-	rm -f $(CURDIR)/debian/nano-udeb/bin/rnano
+	rm -rf $(CURDIR)/debian/nano-udeb/usr/share
+	rm -f $(CURDIR)/debian/nano-udeb/usr/bin/rnano
 endif
 
 override_dh_auto_clean:

Reply via email to