Bug#581725: util-linux: FTBFS on kfreebsd-*: ln: target `fdisk-udeb/usr/sbin/' is not a directory

2010-06-20 Thread Martin Michlmayr
* Cyril Brulebois k...@debian.org [2010-06-13 12:05]:
  The attached trivial patch guards the call linking in the locales
  files with a check that debian/cfdisk-udeb actually exists, which
  will be the case on architectures where the package is built.
 
 Just in case maintainers were waiting for an ACK from my side, sorry,
 I thought it was easy enough to be merged without any second thought.
 Anyway, better late than never: tested on my kfreebsd-i386 porterbox,
 and the patch indeed fixes the FTBFS.

Lamont, can you upload this fix asap?  If not, can someone NMU.

e2fsprogs has been waiting to move to testing because of util-linux
for about 2 weeks.
-- 
Martin Michlmayr
http://www.cyrius.com/



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



Bug#581725: util-linux: FTBFS on kfreebsd-*: ln: target `fdisk-udeb/usr/sbin/' is not a directory

2010-06-20 Thread Cyril Brulebois
Martin Michlmayr t...@cyrius.com (20/06/2010):
 Lamont, can you upload this fix asap?  If not, can someone NMU.

Will upload in a few hours unless I hear from him.

Mraw,
KiBi.


signature.asc
Description: Digital signature


Bug#581725: util-linux: FTBFS on kfreebsd-*: ln: target `fdisk-udeb/usr/sbin/' is not a directory

2010-06-20 Thread Cyril Brulebois
Cyril Brulebois k...@debian.org (20/06/2010):
 Will upload in a few hours unless I hear from him.

Done, with the attached patch.

Mraw,
KiBi.
diff -u util-linux-2.17.2/debian/rules util-linux-2.17.2/debian/rules
--- util-linux-2.17.2/debian/rules
+++ util-linux-2.17.2/debian/rules
@@ -137,7 +137,9 @@
 	ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
 	S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \
 	fi
-	cd debian/util-linux-locales  find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done
+	if [ -d debian/cfdisk-udeb ]; then \
+		cd debian/util-linux-locales  find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \
+	fi
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab
 ifeq ($(arch),$(findstring $(arch),powerpc ppc64))
diff -u util-linux-2.17.2/debian/changelog util-linux-2.17.2/debian/changelog
--- util-linux-2.17.2/debian/changelog
+++ util-linux-2.17.2/debian/changelog
@@ -1,3 +1,13 @@
+util-linux (2.17.2-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Apply trivial patch by Adam D. Barratt (thanks!): Only attempt to link
+locale-specific files in to the cfdisk-udeb hierarchy if cfdisk-udeb
+is actually being built.  Closes: #581725
+  * Set urgency to “high” since some packages are waiting for util-linux.
+
+ -- Cyril Brulebois k...@debian.org  Sun, 20 Jun 2010 16:03:46 +0200
+
 util-linux (2.17.2-3) unstable; urgency=low
 
   [LaMont Jones]


signature.asc
Description: Digital signature


Bug#581725: util-linux: FTBFS on kfreebsd-*: ln: target `fdisk-udeb/usr/sbin/' is not a directory

2010-06-13 Thread Cyril Brulebois
Adam D. Barratt a...@adam-barratt.org.uk (05/06/2010):
 The attached trivial patch guards the call linking in the locales
 files with a check that debian/cfdisk-udeb actually exists, which
 will be the case on architectures where the package is built.

Thanks, Adam.

Just in case maintainers were waiting for an ACK from my side, sorry,
I thought it was easy enough to be merged without any second thought.
Anyway, better late than never: tested on my kfreebsd-i386 porterbox,
and the patch indeed fixes the FTBFS.

Also, e2fsprogs is waiting for that fix to flow in, so that it can be
tried because of a versioned B-D on util-linux stuff:
  http://release.debian.org/migration/testing.pl?package=e2fsprogs

Mraw,
KiBi.


signature.asc
Description: Digital signature


Bug#581725: util-linux: FTBFS on kfreebsd-*: ln: target `fdisk-udeb/usr/sbin/' is not a directory

2010-06-05 Thread Adam D. Barratt
tags 581725 + patch
thanks

On Sat, 2010-05-15 at 12:54 +0200, Cyril Brulebois wrote:
 your package no longer builds on kfreebsd-*:
 | cd debian; if [ -f util-linux/sbin/fdisk ]; then \
 | ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
 | S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $S ]; then mv $S 
 cfdisk-udeb/usr/sbin/; fi; \
 | fi
 | ln: target `fdisk-udeb/usr/sbin/' is not a directory: No such file or 
 directory
 | cd debian/util-linux-locales  find usr/share/locale -type f | while read 
 x; do ln $x ../cfdisk-udeb/$x; done
 | ln: creating hard link 
 `../cfdisk-udeb/usr/share/locale/ca/LC_MESSAGES/util-linux-ng.mo' = 
 `usr/share/locale/ca/LC_MESSAGES/util-linux-ng.mo': No such file or directory

The sparc build fails with the same issue; the common feature appears to
be that these are the architectures on which cfdisk-udeb is not built.

A change made in debhelper 7.4.16 means that commands which don't use -a
or -i only act on packages being built for the target architecture.
That in turn means that the cfdisk-udeb hierarchy is only created on
those architectures on which cfdisk-udeb is actually built, hence the
failure to link files in to it on other architectures.

The attached trivial patch guards the call linking in the locales files
with a check that debian/cfdisk-udeb actually exists, which will be the
case on architectures where the package is built.

Regards,

Adam
diff -u util-linux-2.17.2/debian/rules util-linux-2.17.2/debian/rules
--- util-linux-2.17.2/debian/rules
+++ util-linux-2.17.2/debian/rules
@@ -137,7 +137,9 @@
 	ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
 	S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \
 	fi
-	cd debian/util-linux-locales  find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done
+	if [ -d debian/cfdisk-udeb ]; then \
+		cd debian/util-linux-locales  find usr/share/locale -type f | while read x; do ln $$x ../cfdisk-udeb/$$x; done \
+	fi
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	install -m 644 debian/mount.fstab debian/mount/usr/share/doc/mount/examples/fstab
 ifeq ($(arch),$(findstring $(arch),powerpc ppc64))
diff -u util-linux-2.17.2/debian/changelog util-linux-2.17.2/debian/changelog
--- util-linux-2.17.2/debian/changelog
+++ util-linux-2.17.2/debian/changelog
@@ -1,3 +1,11 @@
+util-linux (2.17.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Only attempt to link locale-specific files in to the cfdisk-udeb heirarchy
+if cfdisk-udeb is actually being built (Closes: #581725)
+
+ -- Adam D. Barratt a...@adam-barratt.org.uk  Sat, 05 Jun 2010 13:09:44 +0100
+
 util-linux (2.17.2-2) unstable; urgency=low
 
   * should build Depend: dpkg or install-info.  Closes: #581579


Bug#581725: util-linux: FTBFS on kfreebsd-*: ln: target `fdisk-udeb/usr/sbin/' is not a directory

2010-05-15 Thread Cyril Brulebois
Source: util-linux
Version: 2.17.2-2
Severity: serious
Justification: FTBFS
User: debian-...@lists.debian.org
Usertags: kfreebsd

Hi,

your package no longer builds on kfreebsd-*:
| cd debian; if [ -f util-linux/sbin/fdisk ]; then \
|   ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
|   S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $S ]; then mv $S 
cfdisk-udeb/usr/sbin/; fi; \
|   fi
| ln: target `fdisk-udeb/usr/sbin/' is not a directory: No such file or 
directory
| cd debian/util-linux-locales  find usr/share/locale -type f | while read x; 
do ln $x ../cfdisk-udeb/$x; done
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/ca/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/ca/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/cs/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/cs/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/da/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/da/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/de/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/de/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/es/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/es/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/et/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/et/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/fi/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/fi/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/fr/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/fr/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/it/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/it/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/ja/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/ja/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/nl/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/nl/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/pt_BR/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/pt_BR/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/sl/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/sl/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/sv/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/sv/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/tr/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/tr/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/id/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/id/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/ru/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/ru/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/uk/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/uk/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| ln: creating hard link 
`../cfdisk-udeb/usr/share/locale/vi/LC_MESSAGES/util-linux-ng.mo' = 
`usr/share/locale/vi/LC_MESSAGES/util-linux-ng.mo': No such file or directory
| make: *** [install] Error 1

Full build logs:
  https://buildd.debian.org/status/package.php?p=util-linux

Mraw,
KiBi.



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