updates for libhandle licensing, libuuid link strategy configurable.

diff --git a/VERSION b/VERSION
index 4de6827344c81c8d89403e4efa6de84b22a68720..9a8caf3c1d060da361c9a051632039868e8c262b 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=3
-PKG_REVISION=6
+PKG_REVISION=7
 PKG_BUILD=0

diff --git a/configure.in b/configure.in
index 7cb376448d33323754beb218adb4acb42e385b7f..ecf1cbec711d5c5c90a4669b7bc552ceb524bad3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -133,9 +133,22 @@ AC_CHECK_LIB(uuid, uuid_generate,, [
        echo 'Install either the e2fsprogs-devel (rpm) or the uuid-dev (deb) package.'
        exit 1
 ])
-libuuid="/usr/lib/libuuid.a"
+dnl
+dnl Caution - using libuuid shared adds an additional runtime dependency,
+dnl but the rpm spec file and debian control file do _not_ enforce this.
+dnl We want to keep our runtime dependencies to an absolute minimum for
+dnl this particular package, but the option is there.
+dnl
+AC_ARG_ENABLE(shared-uuid,
+       [ --enable-shared-uuid=[yes/no] Link shared libuuid [default=no].],
+       libuuid="/usr/lib/libuuid.a"
+       if test "$enable_shared_uuid" = yes; then
+               libuuid="-luuid"
+       fi,
+       libuuid="/usr/lib/libuuid.a")
 AC_SUBST(libuuid)
 
+dnl Note - the plan is for liblvm to go away soon...
 dnl Checks for LVM library
 AC_MSG_CHECKING([for liblvm.a])
 liblvm=""

diff --git a/debian/changelog b/debian/changelog
index ea7799156cc9a98ccebeb6a721b1b25303797773..7f81c06a05a7450c07cfd570f78942dda7bce551 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfsprogs (1.3.7-0) unstable; urgency=low
+
+  * New upstream release
+  * Make libuuid link strategy a build time option (closes: #111426)
+  * Change to libhandle licensing (was GPL, now LGPL-2.1)
+
+ -- Nathan Scott <nathans@debian.org>  Mon, 10 Sep 2001 10:52:04 +1000
+
 xfsprogs (1.3.5-0) unstable; urgency=low
 
   * Upstream bugfix release; fixes listed below

diff --git a/debian/copyright b/debian/copyright
index d956166f166b0d2af8260bc0a443b8b7e4c0e6d9..30a97e951c6f88a9fde4e4520f9cbadd2e1011ae 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,3 +12,8 @@ the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL file.
 
+The library named "libhandle" is licensed under Version 2.1
+of the GNU Lesser General Public License.
+On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
+for the complete text of the GNU Lesser General Public License.
+

diff --git a/doc/CHANGES b/doc/CHANGES
index 965958c15f291b9df2943d1acabc49dd86f24964..ca20b4695035f877ca17749d63f1d1c276c5811c 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,11 @@
-xfsprogs-current
+xfsprogs-1.3.7 (10 September 2001)
        - enable preallocation in xfs_mkfile [missed during port?]
        - fix xfs_db core dump when reporting freespace
+       - allow libuuid to be linked dynamically if desired (based
+         on a patch from Colin Walters <walters@verbum.org>, helps
+         the folk working on the Debian installer for XFS)
+       - licensing change for "libhandle" (was GPL, now LGPL-2.1)
+         and some related header files
 
 xfsprogs-1.3.6 (31 August 2001)
        - make mkfs.xfs aware of geometries that might cause