diff -Nru nfs4-acl-tools-0.3.3/debian/changelog nfs4-acl-tools-0.3.3/debian/changelog --- nfs4-acl-tools-0.3.3/debian/changelog 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/changelog 2010-03-26 09:30:33.000000000 +0000 @@ -1,3 +1,16 @@ +nfs4-acl-tools (0.3.3-1) unstable; urgency=low + + * Merge 0.3.3-0ubuntu1 + Initial release + Closes: 399502 + * Debian source format is 3.0 (quilt) + * Rename nfs4acl-0.2.0-compile.patch to 01-compile.patch + * Fix patch-system-but-no-source-readme + * Fix patch-system-but-direct-changes-in-diff + * Fix out-of-date-standards-version + + -- Anibal Monsalve Salazar Fri, 26 Mar 2010 13:52:16 +1100 + nfs4-acl-tools (0.3.3-0ubuntu1) lucid; urgency=low * Initial release diff -Nru nfs4-acl-tools-0.3.3/debian/control nfs4-acl-tools-0.3.3/debian/control --- nfs4-acl-tools-0.3.3/debian/control 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/control 2010-03-26 09:31:34.000000000 +0000 @@ -1,9 +1,9 @@ Source: nfs4-acl-tools Section: admin Priority: extra -Maintainer: Timo Aaltonen -Build-Depends: debhelper (>= 7), automake, quilt, libattr1-dev, libtool -Standards-Version: 3.8.0 +Maintainer: Anibal Monsalve Salazar +Build-Depends: debhelper (>= 7), autotools-dev, automake, libattr1-dev, libtool +Standards-Version: 3.8.4 Homepage: http://www.citi.umich.edu/projects/nfsv4/linux/ Package: nfs4-acl-tools @@ -12,4 +12,3 @@ Description: Commandline and GUI ACL utilities for the NFSv4 client This package contains commandline and GUI ACL utilities for the Linux NFSv4 client. - diff -Nru nfs4-acl-tools-0.3.3/debian/patches/01-compile.patch nfs4-acl-tools-0.3.3/debian/patches/01-compile.patch --- nfs4-acl-tools-0.3.3/debian/patches/01-compile.patch 1970-01-01 01:00:00.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/patches/01-compile.patch 2010-03-26 09:20:56.000000000 +0000 @@ -0,0 +1,82 @@ +--- a/configure.ac 2008-12-04 09:18:24.000000000 +1100 ++++ b/configure.ac 2010-03-26 19:48:02.000000000 +1100 +@@ -32,5 +32,6 @@ AC_PACKAGE_NEED_GETXATTR_LIBATTR + AC_MANUAL_FORMAT + + AC_FUNC_GCC_VISIBILITY ++AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE, [], [GCC supports visibility attributes]) + + AC_OUTPUT(include/builddefs) +--- a/include/buildmacros 2008-12-04 09:18:24.000000000 +1100 ++++ b/include/buildmacros 2010-03-26 19:48:02.000000000 +1100 +@@ -54,7 +54,7 @@ OBJECTS = $(ASFILES:.s=.o) \ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/install-sh + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images +--- a/Makefile 2008-12-04 09:18:24.000000000 +1100 ++++ b/Makefile 2010-03-26 19:48:02.000000000 +1100 +@@ -46,7 +46,7 @@ LDIRT = config.log .dep config.status co + + SUBDIRS = include libnfs4acl nfs4_getfacl nfs4_setfacl man + +-default: $(CONFIGURE) ++default: + ifeq ($(HAVE_BUILDDEFS), no) + $(MAKE) -C . $@ + else +--- a/include/builddefs 2008-12-04 09:18:24.000000000 +1100 ++++ b/include/builddefs 2010-03-26 18:18:57.000000000 +1100 +@@ -42,7 +42,7 @@ MALLOCLIB = + LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la + LIBATTR = -lattr + +-prefix = /usr/local ++prefix = /usr + exec_prefix = ${prefix} + + DESTDIR = +@@ -51,7 +51,7 @@ PKG_NAME = nfs4acl + PKG_USER = root + PKG_GROUP = root + PKG_RELEASE = 0 +-PKG_VERSION = 0.3.2 ++PKG_VERSION = 0.3.3 + PKG_PLATFORM = linux + PKG_DISTRIBUTION= Linux + PKG_BIN_DIR = ${exec_prefix}/bin +@@ -59,24 +59,24 @@ PKG_SBIN_DIR = ${exec_prefix}/sbin + PKG_LIB_DIR = ${exec_prefix}/lib + PKG_DEVLIB_DIR = ${exec_prefix}/libexec + PKG_INC_DIR = ${prefix}/include +-PKG_MAN_DIR = ${prefix}/man ++PKG_MAN_DIR = ${prefix}/share/man + PKG_DOC_DIR = ${prefix}/share/doc/nfs4acl + PKG_LOCALE_DIR = ${prefix}/share/locale + + CC = gcc +-AWK = /bin/awk ++AWK = /usr/bin/awk + SED = /bin/sed + TAR = /bin/tar + ZIP = /bin/gzip +-MAKE = /usr/bin/gmake ++MAKE = /usr/bin/make + ECHO = /bin/echo +-SORT = /bin/sort ++SORT = /usr/bin/sort + LN_S = ln -s + LIBTOOL = /usr/bin/libtool +-MAKEDEPEND = /usr/bin/makedepend ++MAKEDEPEND = /bin/true + + ENABLE_SHARED = no +-HAVE_ZIPPED_MANPAGES = false ++HAVE_ZIPPED_MANPAGES = true + + ifneq "$(findstring $(PKG_PLATFORM), linux gnu gnu/kfreebsd gnu/knetbsd)" "" + PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 diff -Nru nfs4-acl-tools-0.3.3/debian/patches/nfs4acl-0.2.0-compile.patch nfs4-acl-tools-0.3.3/debian/patches/nfs4acl-0.2.0-compile.patch --- nfs4-acl-tools-0.3.3/debian/patches/nfs4acl-0.2.0-compile.patch 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/patches/nfs4acl-0.2.0-compile.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -diff -up nfs4-acl-tools-0.3.2/configure.ac.orig nfs4-acl-tools-0.3.2/configure.ac ---- nfs4-acl-tools-0.3.2/configure.ac.orig 2007-10-22 15:46:09.000000000 -0400 -+++ nfs4-acl-tools-0.3.2/configure.ac 2008-10-29 14:42:02.427246000 -0400 -@@ -32,5 +32,6 @@ AC_PACKAGE_NEED_GETXATTR_LIBATTR - AC_MANUAL_FORMAT - - AC_FUNC_GCC_VISIBILITY -+AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE, [], [GCC supports visibility attributes]) - - AC_OUTPUT(include/builddefs) -diff -up nfs4-acl-tools-0.3.2/include/buildmacros.orig nfs4-acl-tools-0.3.2/include/buildmacros ---- nfs4-acl-tools-0.3.2/include/buildmacros.orig 2007-03-08 13:32:15.000000000 -0500 -+++ nfs4-acl-tools-0.3.2/include/buildmacros 2008-10-29 14:42:02.431244000 -0400 -@@ -54,7 +54,8 @@ OBJECTS = $(ASFILES:.s=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+#INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images -diff -up nfs4-acl-tools-0.3.2/Makefile.orig nfs4-acl-tools-0.3.2/Makefile ---- nfs4-acl-tools-0.3.2/Makefile.orig 2007-02-27 18:58:58.000000000 -0500 -+++ nfs4-acl-tools-0.3.2/Makefile 2008-10-29 14:42:02.413258000 -0400 -@@ -46,7 +46,7 @@ LDIRT = config.log .dep config.status co - - SUBDIRS = include libnfs4acl nfs4_getfacl nfs4_setfacl man - --default: $(CONFIGURE) -+default: - ifeq ($(HAVE_BUILDDEFS), no) - $(MAKE) -C . $@ - else diff -Nru nfs4-acl-tools-0.3.3/debian/patches/series nfs4-acl-tools-0.3.3/debian/patches/series --- nfs4-acl-tools-0.3.3/debian/patches/series 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/patches/series 2010-03-26 02:56:16.000000000 +0000 @@ -1 +1 @@ -nfs4acl-0.2.0-compile.patch +01-compile.patch diff -Nru nfs4-acl-tools-0.3.3/debian/rules nfs4-acl-tools-0.3.3/debian/rules --- nfs4-acl-tools-0.3.3/debian/rules 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/rules 2010-03-26 09:31:04.000000000 +0000 @@ -1,16 +1,9 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make - # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) @@ -21,12 +14,10 @@ CROSS= --build $(DEB_BUILD_GNU_TYPE) endif -configure: patch +config.status: dh_testdir + cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . autoreconf -vfi - -config.status: configure - dh_testdir ./configure $(CROSS) --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ @@ -41,13 +32,16 @@ $(MAKE) >$@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp # Add here commands to clean up after the build process. + cp -p include/builddefs include/builddefs.orig + sed "s|/usr/bin/gmake|/usr/bin/make|" include/builddefs.orig > include/builddefs [ ! -f Makefile ] || $(MAKE) distclean + mv include/builddefs.orig include/builddefs rm -f config.sub config.guess rm -f libnfs4acl/libnfs4acl.a @@ -62,7 +56,6 @@ # Add here commands to install the package into debian/nfs4-acl-tools. $(MAKE) prefix=$(CURDIR)/debian/nfs4-acl-tools/usr install - # Build architecture-independent files here. binary-indep: install # We have nothing to do by default. @@ -74,24 +67,11 @@ dh_installchangelogs dh_installdocs dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_python -# dh_installinit -# dh_installcron -# dh_installinfo dh_installman dh_link dh_strip dh_compress dh_fixperms -# dh_perl -# dh_makeshlibs dh_installdeb dh_shlibdeps dh_gencontrol diff -Nru nfs4-acl-tools-0.3.3/debian/source/format nfs4-acl-tools-0.3.3/debian/source/format --- nfs4-acl-tools-0.3.3/debian/source/format 1970-01-01 01:00:00.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/source/format 2010-05-24 20:36:18.000000000 +0100 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru nfs4-acl-tools-0.3.3/debian/source/options nfs4-acl-tools-0.3.3/debian/source/options --- nfs4-acl-tools-0.3.3/debian/source/options 1970-01-01 01:00:00.000000000 +0100 +++ nfs4-acl-tools-0.3.3/debian/source/options 2009-11-23 10:37:44.000000000 +0000 @@ -0,0 +1,2 @@ +compression = "bzip2" +compression-level = 9 diff -Nru nfs4-acl-tools-0.3.3/include/builddefs nfs4-acl-tools-0.3.3/include/builddefs --- nfs4-acl-tools-0.3.3/include/builddefs 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/include/builddefs 2008-12-03 22:18:24.000000000 +0000 @@ -40,9 +40,9 @@ MALLOCLIB = LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la -LIBATTR = /usr/lib/libattr.la +LIBATTR = -lattr -prefix = /usr +prefix = /usr/local exec_prefix = ${prefix} DESTDIR = @@ -51,7 +51,7 @@ PKG_USER = root PKG_GROUP = root PKG_RELEASE = 0 -PKG_VERSION = 0.3.3 +PKG_VERSION = 0.3.2 PKG_PLATFORM = linux PKG_DISTRIBUTION= Linux PKG_BIN_DIR = ${exec_prefix}/bin @@ -59,24 +59,24 @@ PKG_LIB_DIR = ${exec_prefix}/lib PKG_DEVLIB_DIR = ${exec_prefix}/libexec PKG_INC_DIR = ${prefix}/include -PKG_MAN_DIR = ${prefix}/share/man +PKG_MAN_DIR = ${prefix}/man PKG_DOC_DIR = ${prefix}/share/doc/nfs4acl PKG_LOCALE_DIR = ${prefix}/share/locale CC = gcc -AWK = /usr/bin/awk +AWK = /bin/awk SED = /bin/sed TAR = /bin/tar ZIP = /bin/gzip -MAKE = /usr/bin/make +MAKE = /usr/bin/gmake ECHO = /bin/echo -SORT = /usr/bin/sort +SORT = /bin/sort LN_S = ln -s LIBTOOL = /usr/bin/libtool -MAKEDEPEND = /bin/true +MAKEDEPEND = /usr/bin/makedepend ENABLE_SHARED = no -HAVE_ZIPPED_MANPAGES = true +HAVE_ZIPPED_MANPAGES = false ifneq "$(findstring $(PKG_PLATFORM), linux gnu gnu/kfreebsd gnu/knetbsd)" "" PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 diff -Nru nfs4-acl-tools-0.3.3/include/config.h.in nfs4-acl-tools-0.3.3/include/config.h.in --- nfs4-acl-tools-0.3.3/include/config.h.in 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/include/config.h.in 2008-12-03 22:18:24.000000000 +0000 @@ -1,100 +1,15 @@ -/* include/config.h.in. Generated from configure.ac by autoheader. */ +/* Define if you want Posix compliant getfacl and setfacl utilities + without extensions */ +#undef POSIXLY_CORRECT -/* Define to 1 if you have the header file. */ -#undef HAVE_ATTR_XATTR_H +/* The number of bytes in a int. */ +#undef SIZEOF_INT -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H +/* The number of bytes in a long. */ +#undef SIZEOF_LONG -/* Define to 1 if you have the `attr' library (-lattr). */ -#undef HAVE_LIBATTR +/* The number of bytes in a short. */ +#undef SIZEOF_SHORT -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* GCC supports visibility attributes */ +/* Define if you have attribute((visibility(hidden))) in gcc. */ #undef HAVE_VISIBILITY_ATTRIBUTE - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#undef LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `int' if doesn't define. */ -#undef gid_t - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - -/* Define to `int' if does not define. */ -#undef mode_t - -/* Define to `unsigned int' if does not define. */ -#undef size_t - -/* Define to `int' if doesn't define. */ -#undef uid_t diff -Nru nfs4-acl-tools-0.3.3/Makefile nfs4-acl-tools-0.3.3/Makefile --- nfs4-acl-tools-0.3.3/Makefile 2010-05-24 20:36:17.000000000 +0100 +++ nfs4-acl-tools-0.3.3/Makefile 2008-12-03 22:18:24.000000000 +0000 @@ -37,7 +37,7 @@ include $(TOPDIR)/include/builddefs endif -CONFIGURE = configure include/config.h +CONFIGURE = configure include/builddefs include/config.h LSRCFILES = configure configure.in aclocal.m4 Makepkgs install-sh exports \ README VERSION