On Thu, Apr 14, 2016 at 4:24 AM, Sven Joachim <svenj...@gmx.de> wrote:
> On 2016-04-14 02:42 +0900, Roger Shimizu wrote:
>> I tried to remove install add install.in:
>>
>> diff --git a/debian/libtinfo5-udeb.install.in
>> b/debian/libtinfo5-udeb.install.in
>> new file mode 100644
>> index 0000000..b0b4373
>> --- /dev/null
>> +++ b/debian/libtinfo5-udeb.install.in
>> @@ -0,0 +1,2 @@
>> +usr/lib/${DEB_HOST_MULTIARCH}/libtinfo.so.* lib/${DEB_HOST_MULTIARCH}
>> +usr/lib/${DEB_HOST_MULTIARCH}/libtic.so.*
>
> Apparently you have to install the libraries directly into lib/ and
> avoid the multiarch directories in the udeb.
>
>> and register the install:
>>
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -69,8 +69,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture
>> -qDEB_HOST_MULTIARCH)
>> autogen-files := debian/libncurses5-dev.links debian/libtinfo-dev.links \
>> debian/libncurses5.install debian/libncursesw5.install \
>> debian/libncurses5-dev.install debian/libncursesw5-dev.install \
>> - debian/libtinfo5.install debian/libtinfo-dev.install \
>> - debian/libtermcap.so
>> + debian/libtinfo5.install debian/libtinfo5-udeb.install \
>> + debian/libtinfo-dev.install debian/libtermcap.so
>>
>> But the result of built package keeps the same.
>> It still depends on lib32tinfo5, which is not udeb.
>>
>> I also confirmed that there's no "/usr/lib/32" library in the udeb.
>> Library so files looks alright in udeb.
>
> Huh, indeed. Looks like something is rather odd with dpkg-shlibdeps,
> however this can be avoided by putting the libraries into lib/ (see
> above).
Since you're confident on moving udeb lib so to lib/ to solve the
problem, here enclosed you can find the v5 patch.
However, I still have the issue on my amd64 environment:
Depends: lib32tinfo5 (>= 6), libc6-udeb (>= 2.19)
Maybe I my environment is not clean, so you can try the patch yourself.
>>>> diff --git a/debian/libtinfo5-udeb.install b/debian/libtinfo5-udeb.install
>>>> index c6aa24a..576962e 100644
>>>> --- a/debian/libtinfo5-udeb.install
>>>> +++ b/debian/libtinfo5-udeb.install
>>>> @@ -1,2 +1 @@
>>>> usr/lib/*/libtinfo.so.*
>>>> -usr/lib/*/libtic.so.*
>>>
>>> I don't like that, since the information in the libtinfo5 shlibs file
>>> information then becomes incorrect. The shlibs file says that udebs
>>> with binaries linking to libtic should depend on libtinfo5-udeb, but
>>> libtinfo5-udeb would not actually contain the library.
>>
>> Understand your points.
>> But I can argue that udeb is the deb package only contain the stuff
>> necessary for d-i.
>> Stuff d-i don't need can be removed.
>
> It is correct that d-i does not currently need libtic, but if some udeb
> package ever does it will end up installable but broken, a situation I
> would rather not let happen.
Understand.
So we have to resolve this before upload.
Cheers,
--
Roger Shimizu, GMT +9 Tokyo
PGP/GPG: 17B3ACB1
From c4f0dfcdea050a5c9bb7df273aa41fc0b9f2ca38 Mon Sep 17 00:00:00 2001
From: Roger Shimizu <rogershim...@gmail.com>
Date: Sun, 27 Mar 2016 23:15:51 +0900
Subject: [PATCH] Add udeb support to libtinfo5
---
debian/.gitignore | 1 +
debian/changelog | 7 +++++++
debian/control | 13 +++++++++++++
debian/libtinfo5-udeb.install.in | 2 ++
debian/rules | 6 +++---
5 files changed, 26 insertions(+), 3 deletions(-)
create mode 100644 debian/libtinfo5-udeb.install.in
diff --git a/debian/.gitignore b/debian/.gitignore
index cf040fd..367708f 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -7,6 +7,7 @@ libncursesw5-dev.install
libtinfo-dev.install
libtinfo-dev.links
libtinfo5.install
+libtinfo5-udeb.install
libtermcap.so
*.substvars
*.debhelper
diff --git a/debian/changelog b/debian/changelog
index a02785a..6810fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ncurses (6.0+20160319-2) UNRELEASED; urgency=medium
+
+ [ Roger Shimizu ]
+ * Add udeb support to libtinfo5
+
+ -- Roger Shimizu <rogershim...@gmail.com> Sat, 26 Mar 2016 18:22:36 +0900
+
ncurses (6.0+20160319-1) unstable; urgency=medium
* New upstream patchlevel.
diff --git a/debian/control b/debian/control
index a740fa2..253e66e 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,19 @@ Description: shared low-level terminfo library for terminal handling
.
This package contains the shared low-level terminfo library.
+Package: libtinfo5-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: any
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: shared low-level terminfo library for terminal handling - udeb
+ The ncurses library routines are a terminal-independent method of
+ updating character screens with reasonable optimization.
+ .
+ This package contains the stripped-down udeb version of shared low-level
+ terminfo library.
+
Package: libncurses5
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/libtinfo5-udeb.install.in b/debian/libtinfo5-udeb.install.in
new file mode 100644
index 0000000..528903f
--- /dev/null
+++ b/debian/libtinfo5-udeb.install.in
@@ -0,0 +1,2 @@
+usr/lib/${DEB_HOST_MULTIARCH}/libtinfo.so.* lib
+usr/lib/${DEB_HOST_MULTIARCH}/libtic.so.* lib
diff --git a/debian/rules b/debian/rules
index e1f67dc..d8eb111 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,8 +69,8 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
autogen-files := debian/libncurses5-dev.links debian/libtinfo-dev.links \
debian/libncurses5.install debian/libncursesw5.install \
debian/libncurses5-dev.install debian/libncursesw5-dev.install \
- debian/libtinfo5.install debian/libtinfo-dev.install \
- debian/libtermcap.so
+ debian/libtinfo5.install debian/libtinfo5-udeb.install \
+ debian/libtinfo-dev.install debian/libtermcap.so
ifeq ($(DEB_HOST_ARCH),i386)
build_64_target = x86_64-$(DEB_HOST_GNU_SYSTEM)
@@ -471,7 +471,7 @@ endif
dh_compress -s -N$(package-examples)
dh_fixperms -s
dh_link -s
- dh_makeshlibs -p$(package-ti) -V "$(package-ti) $(sodepver)" -- -c4
+ dh_makeshlibs -p$(package-ti) -V "$(package-ti) $(sodepver)" --add-udeb=$(package-ti)-udeb -- -c4
dh_makeshlibs -p$(package-lib) -V "$(package-lib) $(sodepver)" -- -c4
dh_makeshlibs -p$(package-libw) -V "$(package-libw) $(sodepver)" -- -c4
ifneq ($(build_32),)
--
2.1.4
