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

Bug#1064400: discover-data: install files into /usr



Source: discover-data
Version: 2.2013.01.13
Severity: normal
Tags: patch trixie sid
User: helmutg@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. discover-data installs files into /lib; these should be moved into
the respective canonical locations in /usr/.

Please find a patch attached. It has been build-tested.

This should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.

If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].

Michael

[1] https://wiki.debian.org/UsrMerge
diff -Nru discover-data-2.2013.01.13/debian/changelog discover-data-2.2013.01.13+nmu1/debian/changelog
--- discover-data-2.2013.01.13/debian/changelog	2022-01-09 10:27:19.000000000 +0100
+++ discover-data-2.2013.01.13+nmu1/debian/changelog	2024-02-21 14:53:10.000000000 +0100
@@ -1,3 +1,10 @@
+discover-data (2.2013.01.13+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr. (Closes: #-1)
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 21 Feb 2024 14:53:10 +0100
+
 discover-data (2.2013.01.13) unstable; urgency=medium
 
   * Rewrite debian/rules using dh, keeping only a few directives.
diff -Nru discover-data-2.2013.01.13/debian/rules discover-data-2.2013.01.13+nmu1/debian/rules
--- discover-data-2.2013.01.13/debian/rules	2022-01-09 10:26:49.000000000 +0100
+++ discover-data-2.2013.01.13+nmu1/debian/rules	2024-02-21 14:52:44.000000000 +0100
@@ -4,10 +4,10 @@
 	dh $@
 
 override_dh_auto_build:
-	dh_auto_build -- hwlistsdir=/lib/discover
+	dh_auto_build -- hwlistsdir=/usr/lib/discover
 
 override_dh_auto_install:
-	dh_auto_install -- hwlistsdir=/lib/discover
+	dh_auto_install -- hwlistsdir=/usr/lib/discover
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog

Reply to: