diff mbox

please add multi-arch support for readline6

Message ID 20110822132003.GA10979@afflict.kos.to
State Accepted
Headers show

Commit Message

Riku Voipio Aug. 22, 2011, 1:20 p.m. UTC
Package: readline6
Version: 6.2-2
Severity: wishlist
User: debian-dpkg@lists.debian.org
Usertags: multiarch
Tags: patch

Hi,

The attached patch converts libreadline6 to multiarch paths 
and adds the relevant Multi-Arch: fields to debian/control.


Riku
diff mbox

Patch

diff -urN old/readline6-6.2//debian/control readline6-6.2//debian/control
--- old/readline6-6.2//debian/control	2011-04-23 15:51:29.000000000 +0300
+++ readline6-6.2//debian/control	2011-08-22 15:36:05.192285001 +0300
@@ -3,7 +3,7 @@ 
 Priority: important
 Maintainer: Matthias Klose <doko@debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 5), lsb-release,
+Build-Depends: debhelper (>= 8.1.3), lsb-release,
   libncurses5-dev (>= 5.6),
   lib32ncurses5-dev [amd64 ppc64], lib64ncurses5-dev [i386 powerpc sparc s390],
   mawk | awk, texinfo, autotools-dev,
@@ -12,6 +12,8 @@ 
 Package: libreadline6
 Architecture: any
 Depends: readline-common, ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Section: libs
 Priority: important
 Description: GNU readline and history libraries, run-time libraries
@@ -54,6 +56,7 @@ 
 Architecture: any
 Depends: libreadline6-dev (= ${binary:Version}), ${misc:Depends}
 Conflicts: libreadline-gplv2-dev
+Multi-Arch: same
 Section: libdevel
 Priority: optional
 Description: GNU readline and history libraries, development files
@@ -71,6 +74,7 @@ 
 Section: libdevel
 Priority: optional
 Depends: libreadline6 (= ${binary:Version}), libncurses5-dev, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Multi-Arch: same
 Conflicts: libreadline5-dev, libreadline-gplv2-dev
 Description: GNU readline and history libraries, development files
  The GNU readline library aids in the consistency of user interface
diff -urN old/readline6-6.2//debian/rules readline6-6.2//debian/rules
--- old/readline6-6.2//debian/rules	2010-11-22 11:46:23.000000000 +0200
+++ readline6-6.2//debian/rules	2011-08-22 15:44:12.502285001 +0300
@@ -9,6 +9,8 @@ 
 DEB_HOST_ARCH_OS	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 CROSS=$(DEB_HOST_GNU_TYPE)-gcc
 else
@@ -109,7 +111,8 @@ 
 	cd $(builddir) && \
 	  CC=$(CC) $(srcdir)/configure \
 		--with-curses --prefix=/usr\
-		--host=$(DEB_HOST_GNU_TYPE)
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 ifneq ($(build32),)
 	rm -rf $(builddir32)
@@ -211,9 +214,9 @@ 
 	: # move $(p_rl)
 	dh_installdirs -p$(p_rl) \
 		etc \
-		lib \
+		lib/$(DEB_HOST_MULTIARCH) \
 		usr/share/doc
-	cp -a $(d)/usr/lib/lib{history,readline}.so.* $(d_rl)/lib/
+	cp -a $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.* $(d_rl)/lib/$(DEB_HOST_MULTIARCH)/
 #	cp -a $(d)/usr/lib/lib{history,readline}.so.$(libversion) $(d_rl)/lib/
 #	ln -s libhistory.so.$(libversion) \
 #		$(d_rl)/lib/libhistory.so.$(soversion)
@@ -238,7 +241,7 @@ 
 	dh_installdirs -p$(p_rlg) \
 		usr/lib/debug \
 		usr/share/doc
-	mv $(d)/usr/lib/lib{history,readline}.so.$(libversion) \
+	mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.so.$(libversion) \
 		$(d_rlg)/usr/lib/debug/.
 	ln -s libhistory.so.$(libversion) \
 		$(d_rlg)/usr/lib/debug/libhistory.so.$(soversion)
@@ -247,12 +250,12 @@ 
 
 	: # move $(p_rld)
 	dh_installdirs -p$(p_rld) \
-		usr/lib \
+		usr/lib/$(DEB_HOST_MULTIARCH)/ \
 		usr/share/doc \
 		usr/share/info
-	ln -s /lib/libhistory.so.$(soversion) $(d_rld)/usr/lib/libhistory.so
-	ln -s /lib/libreadline.so.$(soversion) $(d_rld)/usr/lib/libreadline.so
-	mv $(d)/usr/lib/lib{history,readline}.a	$(d_rld)/usr/lib/.
+	ln -s /lib/libhistory.so.$(soversion) $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libhistory.so
+	ln -s /lib/libreadline.so.$(soversion) $(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/libreadline.so
+	mv $(d)/usr/lib/$(DEB_HOST_MULTIARCH)/lib{history,readline}.a	$(d_rld)/usr/lib/$(DEB_HOST_MULTIARCH)/.
 	mv $(d)/usr/include $(d_rld)/usr/.
 	mv $(d)/usr/share/info/{readline.info,history.info} \
 		$(d_rld)/usr/share/info/.