From e7dd325ff68e8d2d2b2ded5f81bbff4ccd473d63 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 16 Sep 2016 11:45:12 +0200
Subject: [PATCH] Version leap to 1.4.6.

---
 configure.ac        | 10 +++++-----
 libisofs/libisofs.h | 39 ++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 02f4a21..56f24b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([libisofs], [1.4.5], [http://libburnia-project.org])
+AC_INIT([libisofs], [1.4.6], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -41,7 +41,7 @@ dnl If LIBISOFS_*_VERSION changes, be sure to change AC_INIT above to match.
 dnl
 LIBISOFS_MAJOR_VERSION=1
 LIBISOFS_MINOR_VERSION=4
-LIBISOFS_MICRO_VERSION=5
+LIBISOFS_MICRO_VERSION=6
 LIBISOFS_VERSION=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION.$LIBISOFS_MICRO_VERSION
 
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
@@ -52,9 +52,9 @@ AC_SUBST(LIBISOFS_VERSION)
 dnl Libtool versioning
 LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION
 # 2016.07.01 development jump has not yet happened
-# SONAME = 86 - 80 = 6 . Library name = libisofs.6.80.0
-LT_CURRENT=86
-LT_AGE=80
+# SONAME = 88 - 82 = 6 . Library name = libisofs.6.82.0
+LT_CURRENT=88
+LT_AGE=82
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h
index 8a7fe09..ced804a 100644
--- a/libisofs/libisofs.h
+++ b/libisofs/libisofs.h
@@ -94,7 +94,7 @@ extern "C" {
  */
 #define iso_lib_header_version_major  1
 #define iso_lib_header_version_minor  4
-#define iso_lib_header_version_micro  5
+#define iso_lib_header_version_micro  6
 
 /**
  * Get version of the libisofs library at runtime.
@@ -3507,17 +3507,22 @@ int iso_image_get_pvd_times(IsoImage *image,
  *      The image to make bootable. If it was already bootable this function
  *      returns an error and the image remains unmodified.
  * @param image_path
- *      The absolute path of a IsoFile to be used as default boot image.
-
->>> or  --interval:appended_partition_$number_start_$start_size_$size:...
-
+ *      The absolute path of a IsoFile to be used as default boot image or
+ *      --interval:appended_partition_$number[_start_$start_size_$size]:...
+ *      if type is ELTORITO_NO_EMUL. $number gives the partition number.
+ *      If _start_$start_size_$size is present, then it overrides the 2 KiB
+ *      start block of the partition and the partition size counted in
+ *      blocks of 512 bytes.
  * @param type
  *      The boot media type. This can be one of 3 types:
- *             - Floppy emulation: Boot image file must be exactly
- *               1200 kB, 1440 kB or 2880 kB.
- *             - Hard disc emulation: The image must begin with a master
+ *             - ELTORITO_FLOPPY_EMUL.
+ *               Floppy emulation: Boot image file must be exactly
+ *               1200 KiB, 1440 KiB or 2880 KiB.
+ *             - ELTORITO_HARD_DISC_EMUL.
+ *               Hard disc emulation: The image must begin with a master
  *               boot record with a single image.
- *             - No emulation. You should specify load segment and load size
+ *             - ELTORITO_NO_EMUL.
+ *               No emulation. You should specify load segment and load size
  *               of image.
  * @param catalog_path
  *      The absolute path in the image tree where the catalog will be stored.
@@ -3552,12 +3557,11 @@ int iso_image_set_boot_image(IsoImage *image, const char *image_path,
  *      The image to which the boot image shall be added.
  *      returns an error and the image remains unmodified.
  * @param image_path
- *      The absolute path of a IsoFile to be used as boot image.
-
->>> or  --interval:appended_partition_${number}s_start_${start}d_size_$size:...
-
+ *      The absolute path of a IsoFile to be used as boot image or
+ *      --interval:appended_partition_$number[_start_$start_size_$size]:...
+ *      if type is ELTORITO_NO_EMUL. See iso_image_set_boot_image.
  * @param type
- *      The boot media type. See iso_image_set_boot_image
+ *      The boot media type. See iso_image_set_boot_image.
  * @param flag
  *      Bitfield for control purposes. Unused yet. Submit 0.
  * @param boot
@@ -3600,9 +3604,7 @@ int iso_image_add_boot_image(IsoImage *image, const char *image_path,
  * @param imgnode
  *      When not NULL, it will be filled with the image tree node. No extra ref
  *      is added, you can use iso_node_ref() to get one if you need it.
-
->>> The returned value is NULL if the boot image source is no IsoFile.
-
+ *      The returned value is NULL if the boot image source is no IsoFile.
  * @param catnode
  *      When not NULL, it will be filled with the catnode tree node. No extra
  *      ref is added, you can use iso_node_ref() to get one if you need it.
@@ -3660,8 +3662,7 @@ int iso_image_get_bootcat(IsoImage *image, IsoBoot **catnode, uint32_t *lba,
  * @param bootnodes
  *      Returns NULL or an allocated array of pointers to the IsoFile nodes
  *      which bear the content of the boot images in boots.
-
->>> An array entry is NULL if the boot image source is no IsoFile.
+ *      An array entry is NULL if the boot image source is no IsoFile.
 
 >>> Need getter for partition index