Source: libnss-pgsql Version: 1.4.0debian-8 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to /usr. libnss-pgsql 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. Note 1: this change includes moving the .so into a multiarch path which is recommended on Debian nowadays. Note 2: 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 libnss-pgsql-1.4.0debian/debian/changelog libnss-pgsql-1.4.0debian/debian/changelog --- libnss-pgsql-1.4.0debian/debian/changelog 2014-10-10 17:54:53.000000000 +0200 +++ libnss-pgsql-1.4.0debian/debian/changelog 2024-02-17 13:43:18.000000000 +0100 @@ -1,3 +1,10 @@ +libnss-pgsql (1.4.0debian-8.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install NSS module into multiarch path in /usr. (Closes: #-1) + + -- Michael Biebl <[email protected]> Sat, 17 Feb 2024 13:43:18 +0100 + libnss-pgsql (1.4.0debian-8) unstable; urgency=medium * debian/control: set myself as Maintainer because the team list does diff -Nru libnss-pgsql-1.4.0debian/debian/libnss-pgsql2.dirs libnss-pgsql-1.4.0debian/debian/libnss-pgsql2.dirs --- libnss-pgsql-1.4.0debian/debian/libnss-pgsql2.dirs 2014-10-10 17:54:53.000000000 +0200 +++ libnss-pgsql-1.4.0debian/debian/libnss-pgsql2.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -lib diff -Nru libnss-pgsql-1.4.0debian/debian/rules libnss-pgsql-1.4.0debian/debian/rules --- libnss-pgsql-1.4.0debian/debian/rules 2014-10-10 17:54:53.000000000 +0200 +++ libnss-pgsql-1.4.0debian/debian/rules 2024-02-17 13:43:18.000000000 +0100 @@ -1,10 +1,12 @@ #!/usr/bin/make -f +include /usr/share/dpkg/architecture.mk + override_dh_auto_configure: autoreconf -if ./configure \ --prefix=/usr \ - --libdir=/lib \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-docdir=\$${prefix}/share/doc/libnss-pgsql2 \ @@ -20,9 +22,9 @@ override_dh_install: $(MAKE) install DESTDIR=$(CURDIR)/debian/libnss-pgsql2 - rm -f $(CURDIR)/debian/libnss-pgsql2/lib/libnss_pgsql.la \ - $(CURDIR)/debian/libnss-pgsql2/lib/libnss_pgsql.a \ - $(CURDIR)/debian/libnss-pgsql2/lib/libnss_pgsql.so + rm -f $(CURDIR)/debian/libnss-pgsql2/usr/lib/*/libnss_pgsql.la \ + $(CURDIR)/debian/libnss-pgsql2/usr/lib/*/libnss_pgsql.a \ + $(CURDIR)/debian/libnss-pgsql2/usr/lib/*/libnss_pgsql.so %: dh $@ --with autotools_dev
