Coin,

While porting the recent versions of parted to Hurd, i found this problem too, and several others, and fixed them with the patch attached. The obsolete gnulib problem may break other architectures too. The documentation generation problem, probably due to stricter latex softwares uploaded recently, probably impact all architectures.

I did not encounter #525193, so i guess it is obsolete and can be closed. With this patch, not very clean i agree, i got a fully working package on hurd-i386.

I also wonder if the files in the m4 directory are modified by the build, even if gnulib-tool is not called. I think you should check to be able to comply to the "double build" policy.

Hope this helps.

--
Marc Dequènes (Duck)
diff -Nur orig/parted-1.8.8.git.2008.03.24/debian/changelog parted-1.8.8.git.2008.03.24/debian/changelog
--- orig/parted-1.8.8.git.2008.03.24/debian/changelog	2009-05-15 13:31:40.000000000 +0200
+++ parted-1.8.8.git.2008.03.24/debian/changelog	2009-05-15 01:10:20.000000000 +0200
@@ -1,3 +1,16 @@
+parted (1.8.8.git.2008.03.24-11.1+hurdfr1) unstable; urgency=low
+
+  * NMU from HurdFr.
+  * Removed dependency on libdevmapper on hurd-i386.
+  * Ensure autoreconf updates necessary files, as the provided ones are
+    quite old.
+  * Added build-depends on gnulib and update files after autoreconf, and
+    solve include files badly generated (on Hurd at least).
+  * Added new patch 'doc-package.dpatch' to solve a minor (but FTBFS-
+    prone) documentation generation problem.
+
+ -- Marc Dequènes (Duck) <d...@hurdfr.org>  Fri, 15 May 2009 01:10:20 +0200
+
 parted (1.8.8.git.2008.03.24-11.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nur orig/parted-1.8.8.git.2008.03.24/debian/control parted-1.8.8.git.2008.03.24/debian/control
--- orig/parted-1.8.8.git.2008.03.24/debian/control	2009-05-15 13:31:40.000000000 +0200
+++ parted-1.8.8.git.2008.03.24/debian/control	2009-05-14 22:08:42.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Parted Maintainer Team <parted-maintain...@lists.alioth.debian.org>
 Uploaders: Sven Luther <lut...@debian.org>, Otavio Salvador <ota...@debian.org>, Bastian Blank <wa...@debian.org>, Xavier Oswald <x.osw...@free.fr>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.22), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, libdevmapper-dev, uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.10, libtool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64], cvs, po4a, pkg-config
+Build-Depends: debhelper (>= 5.0.22), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, libdevmapper-dev [!hurd-i386], uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.10, libtool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64], cvs, po4a, pkg-config, gnulib
 
 Package: parted
 Architecture: any
diff -Nur orig/parted-1.8.8.git.2008.03.24/debian/control.in parted-1.8.8.git.2008.03.24/debian/control.in
--- orig/parted-1.8.8.git.2008.03.24/debian/control.in	2009-05-15 13:31:40.000000000 +0200
+++ parted-1.8.8.git.2008.03.24/debian/control.in	2009-05-13 14:45:48.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Parted Maintainer Team <parted-maintain...@lists.alioth.debian.org>
 Uploaders: Sven Luther <lut...@debian.org>, Otavio Salvador <ota...@debian.org>, Bastian Blank <wa...@debian.org>, Xavier Oswald <x.osw...@free.fr>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.22), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, libdevmapper-dev, uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.10, libtool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64], cvs, po4a, pkg-config
+Build-Depends: debhelper (>= 5.0.22), dpatch, libncurses-dev | libncurses5-dev, libreadline5-dev | libreadline-dev, libdevmapper-dev [!hurd-i386], uuid-dev, gettext, texinfo (>= 4.2), debianutils (>= 1.13.1), autoconf, automake1.10, libtool, libgeom-dev [kfreebsd-i386 kfreebsd-amd64], cvs, po4a, pkg-config, gnulib
 
 Package: par...@binpkgver@
 Architecture: any
diff -Nur orig/parted-1.8.8.git.2008.03.24/debian/patches/00list parted-1.8.8.git.2008.03.24/debian/patches/00list
--- orig/parted-1.8.8.git.2008.03.24/debian/patches/00list	2009-05-15 13:31:40.000000000 +0200
+++ parted-1.8.8.git.2008.03.24/debian/patches/00list	2009-05-15 00:47:09.000000000 +0200
@@ -15,6 +15,8 @@
 # Patch which may be obsolet.
 #amiga-raid-lvm_fix
 
+doc_fix.dpatch
+
 #########################
 # ABI checking symbols update
 ########################
diff -Nur orig/parted-1.8.8.git.2008.03.24/debian/patches/doc_fix.dpatch parted-1.8.8.git.2008.03.24/debian/patches/doc_fix.dpatch
--- orig/parted-1.8.8.git.2008.03.24/debian/patches/doc_fix.dpatch	1970-01-01 01:00:00.000000000 +0100
+++ parted-1.8.8.git.2008.03.24/debian/patches/doc_fix.dpatch	2009-05-15 00:46:44.000000000 +0200
@@ -0,0 +1,23 @@
+#! /bin/sh -e
+## doc_fix.dpatch by Marc Dequènes (Duck) <d...@hurdfr.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix doc generation due to the following error:
+## DP: ../../doc/parted.texi:1194: Menu reference to nonexistent node `GNU Free Documentation License' (perhaps incorrect sectioning?).
+
+. `dirname $0`/DPATCH
+
+...@dpatch@
+--- parted-1.8.8~/doc/parted.texi.orig	2009-05-15 00:05:09.000000000 +0200
++++ parted-1.8.8/doc/parted.texi	2009-05-15 00:05:35.000000000 +0200
+@@ -1190,10 +1190,6 @@
+ @node Copying This Manual
+ @appendix Copying This Manual
+ 
+...@menu
+-* GNU Free Documentation License::  License for copying this manual
+...@end menu
+-
+ @include fdl.texi
+ 
+ @node History
diff -Nur orig/parted-1.8.8.git.2008.03.24/debian/rules parted-1.8.8.git.2008.03.24/debian/rules
--- orig/parted-1.8.8.git.2008.03.24/debian/rules	2009-05-15 13:31:40.000000000 +0200
+++ parted-1.8.8.git.2008.03.24/debian/rules	2009-05-14 22:08:31.000000000 +0200
@@ -111,7 +111,9 @@
   CONFFLAGS += --disable-Werror
 endif
 ifeq (gnu, $(DEB_BUILD_GNU_SYSTEM))
-  CONFFLAGS += --disable-Werror
+  CONFFLAGS += --disable-Werror --disable-device-mapper
+else
+  CONFFLAGS += --enable-device-mapper
 endif
 
 # Workaround/fix bug #442308
@@ -157,7 +159,8 @@
 
 autotools-update: autotools-update-stamp
 autotools-update-stamp: patch-stamp
-	AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 autoreconf
+	AUTOMAKE=automake-1.10 ACLOCAL=aclocal-1.10 autoreconf -f -i
+	gnulib-tool --update
 	touch $@
 
 build-deb/config.status: autotools-update-stamp
@@ -174,7 +177,6 @@
 	    --sbindir=/sbin --mandir=\$${prefix}/share/man \
 	    --infodir=\$${prefix}/share/info --enable-shared \
 	    --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-		--enable-device-mapper \
 	    $(CONFFLAGS)
 
 build-udeb/config.status: autotools-update-stamp
@@ -185,7 +187,7 @@
 	    --sbindir=/sbin --libdir=/lib --mandir=\$${prefix}/share/man \
 	    --infodir=\$${prefix}/share/info --enable-shared --disable-static \
 	    --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-	    --without-readline --enable-device-mapper \
+	    --without-readline \
 		$(CONFFLAGS)
 
 build-dbg/config.status: autotools-update-stamp

Attachment: pgpxLt1qffBzl.pgp
Description: PGP Digital Signature

Reply via email to