Package: fuse
Version: 2.9.2-4
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu ubuntu-patch trusty

Hi,

The ppc64el port requires a patch to libtool.m4.  I don't think that's
in Debian yet, but when it is it will require autoreconfing a bunch of
packages to pick it up.  fuse could handle this by using dh-autoreconf
rather than just autotools-dev, and by adjusting a couple of patches to
cope with this by patching source files and not generated files; when
libtool is in use (as of course it is here), dh-autoreconf is a superset
of autotools-dev, and it seems to still build just fine if I do the
following.

  * Convert to dh-autoreconf in order to update libtool.m4 for new ports.

diff -Nru fuse-2.9.2/debian/control fuse-2.9.2/debian/control
--- fuse-2.9.2/debian/control   2013-03-10 19:28:45.000000000 +0000
+++ fuse-2.9.2/debian/control   2013-12-16 11:11:18.000000000 +0000
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Daniel Baumann <[email protected]>
-Build-Depends: debhelper (>= 9), autotools-dev, libselinux-dev [linux-any]
+Build-Depends: debhelper (>= 9), dh-autoreconf, libselinux-dev [linux-any]
 Standards-Version: 3.9.4
 Homepage: http://fuse.sourceforge.net/
 
diff -Nru fuse-2.9.2/debian/patches/01-initscript.patch 
fuse-2.9.2/debian/patches/01-initscript.patch
--- fuse-2.9.2/debian/patches/01-initscript.patch       2013-03-10 
18:46:44.000000000 +0000
+++ fuse-2.9.2/debian/patches/01-initscript.patch       2013-12-16 
11:10:50.000000000 +0000
@@ -1,10 +1,10 @@
 Author: Bartosz Fenski <[email protected]>
 Description: Upstream build system should not run update-rc.d.
 
-diff -Naurp fuse.orig/util/Makefile.in fuse/util/Makefile.in
---- fuse.orig/util/Makefile.in 2012-05-18 08:24:51.600211252 +0200
-+++ fuse/util/Makefile.in      2012-05-18 08:26:22.272801756 +0200
-@@ -654,7 +654,7 @@ install-exec-local:
+diff -Naurp fuse.orig/util/Makefile.am fuse/util/Makefile.am
+--- fuse.orig/util/Makefile.am
++++ fuse/util/Makefile.am
+@@ -41,7 +41,7 @@ install-exec-local:
        $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
        @if test -x /usr/sbin/update-rc.d; then \
                echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || 
true"; \
diff -Nru fuse-2.9.2/debian/patches/03-examples.patch 
fuse-2.9.2/debian/patches/03-examples.patch
--- fuse-2.9.2/debian/patches/03-examples.patch 2013-03-10 19:28:45.000000000 
+0000
+++ fuse-2.9.2/debian/patches/03-examples.patch 2013-12-16 11:11:03.000000000 
+0000
@@ -12,14 +12,3 @@
  noinst_PROGRAMS = fusexmp fusexmp_fh null hello hello_ll fioc fioclient \
                  fsel fselclient cusexmp
  
-diff -Naurp fuse.orig/example/Makefile.in fuse/example/Makefile.in
---- fuse.orig/example/Makefile.in      2012-05-18 08:02:47.735592281 +0200
-+++ fuse/example/Makefile.in   2012-05-18 08:14:05.156029876 +0200
-@@ -262,7 +262,6 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/include -D_FILE_OFFSET_BITS=64 -D_REENTRANT
--noinst_HEADERS = fioc.h
- LDADD = ../lib/libfuse.la
- fusexmp_fh_LDADD = ../lib/libfuse.la ../lib/libulockmgr.la
- fioclient_CPPFLAGS = 
diff -Nru fuse-2.9.2/debian/rules fuse-2.9.2/debian/rules
--- fuse-2.9.2/debian/rules     2013-03-10 18:46:44.000000000 +0000
+++ fuse-2.9.2/debian/rules     2013-12-16 11:08:55.000000000 +0000
@@ -8,7 +8,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-       dh ${@} --with autotools_dev
+       dh ${@} --with autoreconf
 
 override_dh_auto_configure:
        dh_auto_configure -- --bindir=/bin 
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)

Thanks,

-- 
Colin Watson                                       [[email protected]]


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to