Bug#764387: will FTBFS when libtool drops its dependency on libtool-bin

2014-10-11 Thread Helmut Grohne 
Hi Andreas,

On Tue, Oct 07, 2014 at 09:00:29PM +0200, Andreas Henriksson wrote:
> Thanks for your bug report and patch!

Could you apply this patch without waiting for upstream?

1) All other libtool bugs were NMUed to delayed by Matthias Klose,
   because libtool is going to be fixed soon. So unless you do,
   util-linux will FTBFS soon and you can avoid another NMU of it
   that way.

2) Your last upload changed debian/series making the patch fail to
   apply. That makes rebootstrap fail again and causes useless work.

Just fix it please. I did send the patch upstream. At the very least,
please do not upload further util-linux versions without that fix.

Thanks in advance

Helmut


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#764387: will FTBFS when libtool drops its dependency on libtool-bin

2014-10-07 Thread Andreas Henriksson 
Hello Helmut.

On Tue, Oct 07, 2014 at 08:48:43PM +0200, Helmut Grohne wrote:
> Hi Andreas,
> 
> util-linxu will FTBFS when libtool drops its Depends on libtool-bin.
[...]
> Fortunately, the only place that util-linux uses /usr/bin/libtool is
> in autogen.sh
[...]
> And this is where my patch comes in.

Thanks for your bug report and patch!

Would be super-awesome if you where willing to do this change
on top of upstream git master[1], git format-patch -s ..., and git send-email
it to the upstream mailing list[2] for upstream review/inclusion.

(Please make sure you include the -s flag so your Signed-off-by[3] is added.)

[1]: http://git.kernel.org/cgit/utils/util-linux/util-linux.git/
[2]: util-li...@vger.kernel.org
[3]: 
http://git.kernel.org/cgit/utils/util-linux/util-linux.git/tree/Documentation/howto-contribute.txt#n32

Regards,
Andreas Henriksson


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#764387: will FTBFS when libtool drops its dependency on libtool-bin

2014-10-07 Thread Helmut Grohne 
Package: src:util-linux
Version: 2.25.1-3
Severity: important
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
User: debian-cr...@lists.debian.org
Usertags: libtool-split
Control: block 682045 by -1

Hi Andreas,

util-linxu will FTBFS when libtool drops its Depends on libtool-bin.
See #682045 for details. At that time, a Build-Depends: libtool will no
longer mean that /usr/bin/libtool is available. Fortunately, the only
place that util-linux uses /usr/bin/libtool is in autogen.sh for
checking whether libtool is installed. After that it uses libtoolize
only (in the way libtool is intended to be used). So all that needs to
change is that autogen.sh needs to check for libtoolize rather than
libtool. And this is where my patch comes in.

Helmut
diff -Nru util-linux-2.25.1/debian/changelog util-linux-2.25.1/debian/changelog
--- util-linux-2.25.1/debian/changelog  2014-10-05 19:06:55.0 +0200
+++ util-linux-2.25.1/debian/changelog  2014-10-07 18:36:56.0 +0200
@@ -1,3 +1,10 @@
+util-linux (2.25.1-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Check for libtoolize rather than libtool. (Closes: #-1)
+
+ -- Helmut Grohne   Tue, 07 Oct 2014 18:34:23 +0200
+
 util-linux (2.25.1-3) unstable; urgency=medium
 
   [ Ben Hutchings ]
diff -Nru 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch
--- 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch 
1970-01-01 01:00:00.0 +0100
+++ 
util-linux-2.25.1/debian/patches/check-for-libtoolize-rather-than-libtool.patch 
2014-10-07 18:36:24.0 +0200
@@ -0,0 +1,20 @@
+From: Helmut Grohne 
+Subject: check for libtoolize rather than libtool
+Last-Update: 2014-10-07
+
+libtool lives in libtool-bin, but util-linux does not Build-Depend on
+libtool-bin (because it doesn't need it).
+
+Index: util-linux-2.25.1/autogen.sh
+===
+--- util-linux-2.25.1.orig/autogen.sh
 util-linux-2.25.1/autogen.sh
+@@ -66,7 +66,7 @@
+   echo
+   DIE=1
+ }
+-(libtool --version) < /dev/null > /dev/null 2>&1 || {
++(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
+   echo
+   echo "You must have libtool-2 installed to generate util-linux build 
system."
+   echo
diff -Nru util-linux-2.25.1/debian/patches/series 
util-linux-2.25.1/debian/patches/series
--- util-linux-2.25.1/debian/patches/series 2014-10-05 19:06:55.0 
+0200
+++ util-linux-2.25.1/debian/patches/series 2014-10-07 18:34:50.0 
+0200
@@ -11,3 +11,4 @@
 libmount-only-include-context-on-linux.patch
 build-sys-build-libmount-everywhere.patch
 build-sys-use-lutil-for-BSD-only.patch
+check-for-libtoolize-rather-than-libtool.patch