Package: libexpat1 Version: 2.5.0-2 Tags: patch User: helm...@debian.org Usertags: dep17
Hi, we want to finalize the /usr-merge transition by moving aliased files from / to /usr via DEP17 to get rid of problems arising from aliasing. libexpat1 cannot be converted automatically, because it does not use dh. Hence, I am sending a patch that performs the move. Do not upload this patch to bookworm-backports or earlier as you would violate the earlier /usr-merge moratorium. Helmut
diff --minimal -Nru expat-2.5.0/debian/changelog expat-2.5.0/debian/changelog --- expat-2.5.0/debian/changelog 2023-06-14 22:08:48.000000000 +0200 +++ expat-2.5.0/debian/changelog 2024-02-09 15:07:25.000000000 +0100 @@ -1,3 +1,10 @@ +expat (2.5.0-2.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Move files to /usr (DEP17). (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Fri, 09 Feb 2024 15:07:25 +0100 + expat (2.5.0-2) unstable; urgency=medium [ Samuel Thibault <sthiba...@debian.org> ] diff --minimal -Nru expat-2.5.0/debian/libexpat1-udeb.install expat-2.5.0/debian/libexpat1-udeb.install --- expat-2.5.0/debian/libexpat1-udeb.install 2012-03-20 19:39:42.000000000 +0100 +++ expat-2.5.0/debian/libexpat1-udeb.install 2024-02-09 15:07:15.000000000 +0100 @@ -1 +1 @@ -lib/*/libexpat.so.* usr/lib +usr/lib/*/libexpat.so.* usr/lib diff --minimal -Nru expat-2.5.0/debian/libexpat1.install expat-2.5.0/debian/libexpat1.install --- expat-2.5.0/debian/libexpat1.install 2017-12-17 08:33:25.000000000 +0100 +++ expat-2.5.0/debian/libexpat1.install 2024-02-09 15:07:21.000000000 +0100 @@ -1,3 +1,2 @@ usr/lib/*/*.so.* -lib/*/*.so.* ../../expat/AUTHORS usr/share/doc/libexpat1/ diff --minimal -Nru expat-2.5.0/debian/rules expat-2.5.0/debian/rules --- expat-2.5.0/debian/rules 2023-06-14 22:08:48.000000000 +0200 +++ expat-2.5.0/debian/rules 2024-02-09 15:06:51.000000000 +0100 @@ -102,15 +102,6 @@ endif $(MAKE) -C build/ install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C buildw/lib install DESTDIR=$(CURDIR)/debian/tmp APIHEADER= - # Move libexpat.so.* to /lib so that zfsutils can use it. - mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH) - mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexpat.so.* \ - $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/ - for i in $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexpat.so ; do \ - dest=$$(readlink $$i) ; \ - rm -f $$i ; \ - ln -s /lib/$(DEB_HOST_MULTIARCH)/$$dest $$i ; \ - done mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH) mv debian/tmp/usr/include/expat_config.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/.