Control: tags -1 + patch
On 2016-12-15 21:28 +0100, Sven Joachim wrote:
> On 2016-12-15 08:38 +0100, Matthias Klose wrote:
>
>> On 14.12.2016 21:05, Sven Joachim wrote:
>>> Source: readline
>>> Version: 7.0-1
>>> Tags: buster sid
>>> Control: block 848163 by -1
>>>
>>> I intend to remove the ncurses multilib packages after the stretch
>>> release, see #848163. Since ncurses is required to build readline, this
>>> means that the readline multilib packages can then no longer be built.
>>>
>>> There are no reverse dependencies of the readline multilib packages, so
>>> removing them should not be a problem.
>>
>> Did we stop building gdb64 packages for 32bit architectures?
>
> Yes, since gdb 7.9-1.
>
>> I'd like to delay that change until the buildds can manage dependencies on
>> foreign architectures.
>
> Has there been any progress on that? Bug #770925 has not seen any
> updates for 16 months. :-(
>
> Which use case of foreign architecture dependencies is handled by the
> existing readline multilib packages?
Also, while installing foreign architecture packages might sometimes be
useful, linking a program in a newly built package against a shared
foreign-arch library is not really possible, because dpkg-shlipdeps will
generate incorrect dependencies for it.
There is an overdue ncurses library transition (#230990) in the works,
and I do not want to introduce lib32ncurses6 etc. to the archive.
Attached is a patch which removes the readline multilib packages.
diff -Nru readline-7.0/debian/changelog readline-7.0/debian/changelog
--- readline-7.0/debian/changelog 2017-05-15 22:00:23.000000000 +0200
+++ readline-7.0/debian/changelog 2018-02-10 11:17:01.000000000 +0100
@@ -1,3 +1,10 @@
+readline (7.0-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop the multilib packages (Closes: #848168).
+
+ -- Sven Joachim <svenj...@gmx.de> Sat, 10 Feb 2018 11:17:01 +0100
+
readline (7.0-3) unstable; urgency=medium
* Apply upstream patches 002 and 003. Closes: #852750.
diff -Nru readline-7.0/debian/control readline-7.0/debian/control
--- readline-7.0/debian/control 2017-01-24 16:19:24.000000000 +0100
+++ readline-7.0/debian/control 2017-11-05 17:21:36.000000000 +0100
@@ -4,11 +4,9 @@
Maintainer: Matthias Klose <d...@debian.org>
Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9),
- libtinfo-dev, lib32tinfo-dev [amd64 ppc64],
+ libtinfo-dev,
libncursesw5-dev (>= 5.6),
- lib32ncursesw5-dev [amd64 ppc64], lib64ncurses5-dev [i386 powerpc sparc s390],
- mawk | awk, texinfo, autotools-dev,
- gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc ppc64 s390 sparc]
+ mawk | awk, texinfo, autotools-dev
Package: libreadline7
Architecture: any
@@ -25,19 +23,6 @@
The GNU history library provides a consistent user interface for
recalling lines of previously typed input.
-Package: lib64readline7
-Architecture: i386 powerpc s390 sparc
-Depends: readline-common, ${shlibs:Depends}, ${misc:Depends}
-Section: libs
-Priority: optional
-Description: GNU readline and history libraries, run-time libraries (64-bit)
- The GNU readline library aids in the consistency of user interface
- across discrete programs that need to provide a command line
- interface.
- .
- The GNU history library provides a consistent user interface for
- recalling lines of previously typed input.
-
Package: readline-common
Architecture: all
Multi-Arch: foreign
@@ -74,21 +59,6 @@
.
This package contains development files.
-Package: lib64readline-dev
-Architecture: i386 powerpc s390 sparc
-Depends: lib64readline7 (= ${binary:Version}), ${devxx:Depends}, ${misc:Depends}
-Conflicts: lib64readline6-dev, lib64readline-gplv2-dev
-Provides: lib64readline6-dev
-Section: libdevel
-Priority: optional
-Description: GNU readline and history libraries, development files (64-bit)
- The GNU readline library aids in the consistency of user interface
- across discrete programs that need to provide a command line
- interface.
- .
- The GNU history library provides a consistent user interface for
- recalling lines of previously typed input.
-
Package: libreadline7-dbg
Architecture: any
Depends: libreadline7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -119,34 +89,6 @@
.
See the ledit and rlwrap packages for other programs of that kind.
-Package: lib32readline7
-Architecture: amd64 ppc64
-Depends: readline-common, ${shlibs:Depends}, ${misc:Depends}
-Section: libs
-Priority: optional
-Description: GNU readline and history libraries, run-time libraries (32-bit)
- The GNU readline library aids in the consistency of user interface
- across discrete programs that need to provide a command line
- interface.
- .
- The GNU history library provides a consistent user interface for
- recalling lines of previously typed input.
-
-Package: lib32readline-dev
-Architecture: amd64 ppc64
-Depends: lib32readline7 (= ${binary:Version}), lib32tinfo-dev, ${devxx:Depends}, ${misc:Depends}
-Conflicts: lib32readline6-dev, lib32readline-gplv2-dev
-Provides: lib32readline6-dev
-Section: libdevel
-Priority: optional
-Description: GNU readline and history libraries, development files (32-bit)
- The GNU readline library aids in the consistency of user interface
- across discrete programs that need to provide a command line
- interface.
- .
- The GNU history library provides a consistent user interface for
- recalling lines of previously typed input.
-
Package: readline-doc
Architecture: all
Multi-Arch: foreign
diff -Nru readline-7.0/debian/lib32readline7.symbols readline-7.0/debian/lib32readline7.symbols
--- readline-7.0/debian/lib32readline7.symbols 2016-01-08 08:46:21.000000000 +0100
+++ readline-7.0/debian/lib32readline7.symbols 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-libhistory.so.7 #PACKAGE# #MINVER#
-#include "libhistory7.symbols.common"
-libreadline.so.7 #PACKAGE# #MINVER#
-#include "libreadline7.symbols.common"
diff -Nru readline-7.0/debian/lib64readline7.symbols readline-7.0/debian/lib64readline7.symbols
--- readline-7.0/debian/lib64readline7.symbols 2016-01-08 08:46:41.000000000 +0100
+++ readline-7.0/debian/lib64readline7.symbols 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-libhistory.so.7 #PACKAGE# #MINVER#
-#include "libhistory7.symbols.common"
-libreadline.so.7 #PACKAGE# #MINVER#
-#include "libreadline7.symbols.common"
diff -Nru readline-7.0/debian/rules readline-7.0/debian/rules
--- readline-7.0/debian/rules 2016-01-08 09:21:54.000000000 +0100
+++ readline-7.0/debian/rules 2017-11-05 17:20:08.000000000 +0100
@@ -17,46 +17,6 @@
CROSS=gcc
endif
-ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/i386/powerpc/sparc/s390/))
- build64 = yes
- CC64 = $(CROSS) -m64
- gencontrol_flags = -- \
- '-Vdevxx:Depends=libc6-dev-$(ARCH64)'
- ifeq ($(DEB_HOST_ARCH),i386)
- ARCH64 = amd64
- HOST64 = x86_64-linux-gnu
- endif
- ifeq ($(DEB_HOST_ARCH),powerpc)
- ARCH64 = ppc64
- HOST64 = ppc64-linux-gnu
- endif
- ifeq ($(DEB_HOST_ARCH),sparc)
- ARCH64 = sparc64
- HOST64 = sparc64-linux-gnu
- endif
- ifeq ($(DEB_HOST_ARCH),s390)
- ARCH64 = s390x
- HOST64 = s390x-linux-gnu
- endif
-endif
-
-ifneq (,$(findstring /$(DEB_HOST_ARCH)/,/amd64/ppc64/))
- build32 = yes
- CC32 = $(CROSS) -m32
- lib32dir = lib32
- lib32devdir = usr/lib32
- gencontrol_flags = -- \
- '-Vdevxx:Depends=libc6-dev-$(ARCH32)'
- ifeq ($(DEB_HOST_ARCH),amd64)
- ARCH32 = i386
- HOST32 = i486-linux-gnu
- endif
- ifeq ($(DEB_HOST_ARCH),ppc64)
- ARCH32 = powerpc
- HOST32 = powerpc-linux-gnu
- endif
-endif
-
unexport CPPFLAGS CFLAGS LDFLAGS
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
@@ -69,34 +29,22 @@
SHELL = bash
p_rl = libreadline$(soversion)
-p_rl32 = lib32readline$(soversion)
-p_rl64 = lib64readline$(soversion)
p_comm = readline-common
p_rld = libreadline-dev
-p_rld32 = lib32readline-dev
-p_rld64 = lib64readline-dev
p_rlg = $(p_rl)-dbg
p_doc = readline-doc
p_rlfe = rlfe
d = debian/tmp
-d32 = debian/tmp32
-d64 = debian/tmp64
d_rl = debian/$(p_rl)
-d_rl32 = debian/$(p_rl32)
-d_rl64 = debian/$(p_rl64)
d_comm = debian/$(p_comm)
d_rld = debian/$(p_rld)
-d_rld32 = debian/$(p_rld32)
-d_rld64 = debian/$(p_rld64)
d_rlg = debian/$(p_rlg)
d_doc = debian/$(p_doc)
d_rlfe = debian/$(p_rlfe)
srcdir = $(CURDIR)
builddir = $(CURDIR)/build
-builddir32 = $(CURDIR)/build32
-builddir64 = $(CURDIR)/build64
default: build
@@ -113,22 +61,6 @@
--host=$(DEB_HOST_GNU_TYPE) \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-ifneq ($(build32),)
- rm -rf $(builddir32)
- mkdir $(builddir32)
- cd $(builddir32) && \
- CC="$(CC32)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(srcdir)/configure \
- --host=$(HOST32) --prefix=/usr
-endif
-
-ifneq ($(build64),)
- rm -rf $(builddir64)
- mkdir $(builddir64)
- cd $(builddir64) && \
- CC="$(CC64)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" $(srcdir)/configure \
- --host=$(HOST64) --prefix=/usr
-endif
-
touch configure-stamp
ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
@@ -147,25 +79,6 @@
SHOBJ_LDFLAGS='$(LDFLAGS) -shared' \
SHLIB_LIBS="-ltinfo"
-ifneq ($(build32),)
- $(MAKE) -C $(builddir32) \
- CC="$(CC32)" \
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- SHOBJ_CFLAGS="-fPIC -D_REENTRANT" \
- SHOBJ_LDFLAGS='$(LDFLAGS) -shared' \
- SHLIB_LIBS="-ltinfo"
- SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`'
-endif
-
-ifneq ($(build64),)
- $(MAKE) -C $(builddir64) \
- CC="$(CC64)" \
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- SHOBJ_CFLAGS="-fPIC -D_REENTRANT" \
- SHOBJ_LDFLAGS='$(LDFLAGS) -shared' \
- SHLIB_LIBS="-ltinfo"
- SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`'
-endif
$(MAKE) -C $(builddir)/doc info
touch build-stamp
@@ -194,7 +107,7 @@
dh_testroot
rm -f configure*-stamp build*-stamp install-stamp
rm -rf autom4te.cache
- rm -rf $(builddir) $(builddir32) $(builddir64)
+ rm -rf $(builddir)
rm -rf debian/tmp*
rm -f doc/*.dvi
rm -f debian/shlibs.local
@@ -291,74 +204,6 @@
cp -p debian/rlfe.1 $(d_rlfe)/usr/share/man/man1/.
endif
-ifneq ($(build32),)
- rm -rf $(d32)
- mkdir -p $(d32)/usr/bin
- $(MAKE) -C $(builddir32) install \
- CC="$(CC32)" \
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -D_REENTRANT" \
- SHOBJ_LDFLAGS='-shared $(LDFLAGS)' \
- SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' \
- SHLIB_LIBS=-ltinfo \
- DESTDIR=$(CURDIR)/$(d32) \
- mandir=/usr/share/man \
- infodir=/usr/share/info
-
- dh_installdirs -p$(p_rl32) \
- $(lib32dir) \
- usr/share/doc
- cp -p $(d32)/usr/lib/lib{history,readline}.so.$(libversion) \
- $(d_rl32)/$(lib32dir)/
- ln -s libhistory.so.$(libversion) \
- $(d_rl32)/$(lib32dir)/libhistory.so.$(soversion)
- ln -s libreadline.so.$(libversion) \
- $(d_rl32)/$(lib32dir)/libreadline.so.$(soversion)
-
- dh_installdirs -p$(p_rld32) \
- $(lib32devdir) \
- usr/share/doc
- ln -s /$(lib32dir)/libhistory.so.$(soversion) \
- $(d_rld32)/$(lib32devdir)/libhistory.so
- ln -s /$(lib32dir)/libreadline.so.$(soversion) \
- $(d_rld32)/$(lib32devdir)/libreadline.so
- mv $(d32)/usr/lib/lib{history,readline}.a $(d_rld32)/$(lib32devdir)/.
-endif
-
-ifneq ($(build64),)
- rm -rf $(d64)
- mkdir -p $(d64)/usr/bin
- $(MAKE) -C $(builddir64) install \
- CC="$(CC64)" \
- CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -D_REENTRANT" \
- SHOBJ_LDFLAGS='-shared $(LDFLAGS)' \
- SHLIB_XLDFLAGS='-Wl,-soname,`echo $$@ | sed s/\\..$$$$//`' \
- SHLIB_LIBS=-ltinfo \
- DESTDIR=$(CURDIR)/$(d64) \
- mandir=/usr/share/man \
- infodir=/usr/share/info
-
- dh_installdirs -p$(p_rl64) \
- lib64 \
- usr/share/doc
- dh_installdirs -p$(p_rld64) \
- usr/share/doc
- cp -p $(d64)/usr/lib/lib{history,readline}.so.$(libversion) \
- $(d_rl64)/lib64/
- ln -s libhistory.so.$(libversion) \
- $(d_rl64)/lib64/libhistory.so.$(soversion)
- ln -s libreadline.so.$(libversion) \
- $(d_rl64)/lib64/libreadline.so.$(soversion)
-
- dh_installdirs -p$(p_rld64) \
- usr/lib64 \
- 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/.
-endif
-
: # $(p_doc)
mkdir -p $(d_doc)/usr/share/info
mv $(d)/usr/share/info/{readline.info,history.info} \
@@ -420,36 +265,6 @@
-L $(p_rl) -l $(d_rl)/lib
endif
-ifneq ($(build32),)
- -ls -l $(d_rld)/usr/share/doc/$(p_rl)
- dh_installdocs -p$(p_rl32) \
- USAGE debian/inputrc.arrows
- dh_installchangelogs -p$(p_rl32) CHANGES
- ln -sf $(p_rl32) $(d_rld32)/usr/share/doc/$(p_rld32)
- dh_compress -p$(p_rl32) -p$(p_rld32)
- dh_fixperms -p$(p_rl32) -p$(p_rld32)
- dh_strip --dbg-package=$(p_rlg) -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
- -ls -l $(d_rld)/usr/share/doc/$(p_rl)
-endif
-
-ifneq ($(build64),)
- -ls -l $(d_rld)/usr/share/doc/$(p_rl)
- dh_installdocs -p$(p_rl64) \
- USAGE debian/inputrc.arrows
- dh_installchangelogs -p$(p_rl64) CHANGES
- ln -sf $(p_rl64) $(d_rld64)/usr/share/doc/$(p_rld64)
- dh_compress -p$(p_rl64) -p$(p_rld64)
- dh_fixperms -p$(p_rl64) -p$(p_rld64)
- dh_strip --dbg-package=$(p_rlg) -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
- -ls -l $(d_rld)/usr/share/doc/$(p_rl)
-endif
-
dh_installdeb -s
dh_gencontrol -s $(gencontrol_flags)
dh_md5sums -s
