Control: tags -1 + patch
On Fri, Nov 22, 2024 at 03:02:58PM +0100, Michael Biebl wrote:
> Please move those files to their corresponding location in /usr.
I have prepared a patch. Please find it attached. I noticed that in the
earlier update the directories passed to dh_shlibdeps were not updated.
This is handled as well.
Helmut
diff --minimal -Nru readline-8.2/debian/changelog readline-8.2/debian/changelog
--- readline-8.2/debian/changelog 2024-08-20 11:17:03.000000000 +0200
+++ readline-8.2/debian/changelog 2024-11-26 14:43:39.000000000 +0100
@@ -1,3 +1,10 @@
+readline (8.2-5.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move lib64 libraries to /usr. (Closes: #1088046)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 26 Nov 2024 14:43:39 +0100
+
readline (8.2-5) unstable; urgency=medium
* Apply upstream patches 008 - 013.
diff --minimal -Nru readline-8.2/debian/rules readline-8.2/debian/rules
--- readline-8.2/debian/rules 2024-08-20 11:17:03.000000000 +0200
+++ readline-8.2/debian/rules 2024-11-26 14:43:35.000000000 +0100
@@ -24,6 +24,7 @@
ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/i386/powerpc/sparc/s390/))
build64 = yes
CC64 = $(CROSS) -m64
+ lib64dir = usr/lib64
gencontrol_flags = -- \
'-Vdevxx:Depends=libc6-dev-$(ARCH64)'
ifeq ($(DEB_HOST_ARCH),i386)
@@ -387,25 +388,25 @@
infodir=/usr/share/info
dh_installdirs -p$(p_rl64) \
- lib64 \
+ $(lib64dir) \
usr/share/doc
dh_installdirs -p$(p_rld64) \
usr/share/doc
cp -p $(d64)/usr/lib/lib{history,readline}.so.$(libversion) \
- $(d_rl64)/lib64/
+ $(d_rl64)/$(lib64dir)/
ln -s libhistory.so.$(libversion) \
- $(d_rl64)/lib64/libhistory.so.$(soversion)
+ $(d_rl64)/$(lib64dir)/libhistory.so.$(soversion)
ln -s libreadline.so.$(libversion) \
- $(d_rl64)/lib64/libreadline.so.$(soversion)
+ $(d_rl64)/$(lib64dir)/libreadline.so.$(soversion)
dh_installdirs -p$(p_rld64) \
- usr/lib64 \
+ $(lib64dir) \
usr/share/doc
- ln -s /lib64/libhistory.so.$(soversion) \
- $(d_rld64)/usr/lib64/libhistory.so
- ln -s /lib64/libreadline.so.$(soversion) \
- $(d_rld64)/usr/lib64/libreadline.so
- mv $(d64)/usr/lib/lib{history,readline}.a $(d_rld64)/usr/lib64/.
+ ln -s libhistory.so.$(soversion) \
+ $(d_rld64)/$(lib64dir)/libhistory.so
+ ln -s libreadline.so.$(soversion) \
+ $(d_rld64)/$(lib64dir)/libreadline.so
+ mv $(d64)/usr/lib/lib{history,readline}.a $(d_rld64)/$(lib64dir)/.
endif
: # $(p_doc)
@@ -466,7 +467,7 @@
dh_makeshlibs -p$(p_rl) --add-udeb=$(p_rlu)
cp -p debian/libreadline.shlibs debian/shlibs.local
dh_shlibdeps -p$(p_rl) -p$(p_rld) -p$(p_rlfe) \
- -L $(p_rl) -l $(d_rl)/lib
+ -L $(p_rl) -l $(d_rl)/usr/lib
ifneq ($(buildudeb),)
dh_compress -p$(p_rlu)
@@ -474,7 +475,7 @@
dh_strip -p$(p_rlu)
dh_makeshlibs -p$(p_rlu)
-dh_shlibdeps -p$(p_rlu) \
- -L $(p_rlu) -l $(d_rlu)/lib
+ -L $(p_rlu) -l $(d_rlu)/usr/lib
endif
ifneq ($(build32),)
@@ -488,7 +489,7 @@
dh_strip -p$(p_rl32) -p$(p_rld32)
dh_makeshlibs -p$(p_rl32)
-dh_shlibdeps -p$(p_rl32) -p$(p_rld32) \
- -L $(p_rl32) -l $(d_rl32)/lib
+ -L $(p_rl32) -l $(d_rl32)/usr/lib
-ls -l $(d_rld)/usr/share/doc/$(p_rl)
endif
@@ -503,7 +504,7 @@
dh_strip -p$(p_rl64) -p$(p_rld64)
dh_makeshlibs -p$(p_rl64)
-dh_shlibdeps -p$(p_rl64) -p$(p_rld64) \
- -L $(p_rl64) -l $(d_rl64)/lib
+ -L $(p_rl64) -l $(d_rl64)/usr/lib
-ls -l $(d_rld)/usr/share/doc/$(p_rl)
endif
