[Parted-commits] GNU Parted Official Repository: Changes to 'master'

[Jim Meyering]

 README-release         |   11 +++++++----
 libparted/Makefile.am  |   11 +++++++++--
 libparted/labels/gpt.c |   10 ++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

New commits:
commit f65304f3cff63b4759c6f783adf1fe41688fe776
Author: Jim Meyering <meyering at redhat.com>
Date:   Sat Feb 13 10:04:44 2010 +0100

    doc: update release procedure to account for soname version number
    
    * README-release: Add a step "0", and update step 3 to match reality.

diff --git a/README-release b/README-release
index 7b7fcd1..a6f46a1 100644
--- a/README-release
+++ b/README-release
@@ -1,4 +1,8 @@
-Here is most of the steps we (maintainers) follow when making a release.
+Here are most of the steps a maintainer followas when making a release.
+
+0. Adjust the shared library version number in libparted/Makefile.am.
+   See the three variables there, CURRENT, REVISION, AGE, and follow
+   the guidelines in "info libtool".
 
 1. Execute build-aux/parted-release.  `parted-release --help` contains
    additional information.
@@ -7,8 +11,8 @@ Here is most of the steps we (maintainers) follow when making a release.
    builds and passes all tests.
 
 3. Write the release announcement that will be posted to the mailing lists.
-   There is a template generated at /tmp/announce-parted-$VERSION.
-   Remember to include the definition of parted.  You can find this at
+   Start with the generated template in ~/announce-parted-$VERSION.
+   Remember to include a description of parted.  You can find this at
    http://www.gnu.org/software/parted/index.shtml
 
 4. Run the gnupload command that was suggested by the release script.  You can
@@ -25,4 +29,3 @@ Here is most of the steps we (maintainers) follow when making a release.
      To: info-gnu at gnu.org, parted-devel at lists.alioth.debian.org
      Cc: coordinator at translationproject.org, bug-parted at gnu.org
      Subject: parted-$VERSION released [stable]
-

commit 885d60458ce6e980d57a3e28ecc2fcba2af4d26c
Author: Jim Meyering <meyering at redhat.com>
Date:   Sat Feb 13 09:25:56 2010 +0100

    libparted: set the shared library version number manually
    
    * libparted/Makefile.am (CURRENT, REVISION, AGE): Define here.
    (libparted_la_LDFLAGS): Use them, rather than using the
    automatically-defined LT_-prefixed variables.
    Stop using the "-release" option.
    Hans De Goede pointed out that the build process was automatically
    changing the shared library name.

diff --git a/libparted/Makefile.am b/libparted/Makefile.am
index 2bdadd8..fb8351e 100644
--- a/libparted/Makefile.am
+++ b/libparted/Makefile.am
@@ -21,8 +21,15 @@ SUBDIRS       = labels fs . $(SUBDIRS_CHECK)
 
 partedincludedir      = -I$(top_srcdir)/lib -I$(top_srcdir)/include
 lib_LTLIBRARIES	      =	libparted.la
-libparted_la_LDFLAGS  = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-						-release $(LT_RELEASE)
+
+# Set the shared library version, per Libtool's guidelines.
+# For details, see the "Libtool's versioning system" section of "info libtool"
+CURRENT = 0
+REVISION = 1
+AGE = 0
+
+libparted_la_LDFLAGS  = -version-info $(CURRENT):$(REVISION):$(AGE)
+
 libparted_la_SOURCES  = debug.c			\
 			architecture.c		\
 			architecture.h		\

commit ea4d764d5df16fa17ef77c55a59587ca33e7546a
Author: Jim Meyering <meyering at redhat.com>
Date:   Fri Feb 12 14:59:04 2010 +0100

    gpt: clean-up wrt write_back (no semantic change)
    
    * libparted/labels/gpt.c (gpt_read): Initialize write_back to 0
    once again, and set it to 1 on the sole path that requires that.

diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index 48d580e..40ee0c1 100644
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -898,7 +898,7 @@ gpt_read (PedDisk *disk)
   GPTDiskData *gpt_disk_data = disk->disk_specific;
   int i;
 #ifndef DISCOVER_ONLY
-  int write_back = 1;
+  int write_back = 0;
 #endif
 
   ped_disk_delete_all (disk);
@@ -949,16 +949,12 @@ gpt_read (PedDisk *disk)
             case PED_EXCEPTION_FIX:
               ptt_clear_sectors (disk->dev,
                                  PED_LE64_TO_CPU (primary_gpt->AlternateLBA), 1);
+              write_back = 1;
               break;
             default:
-              write_back = 0;
               break;
             }
         }
-      else
-	{
-	  write_back = 0;
-	}
 #endif /* !DISCOVER_ONLY */
       gpt = primary_gpt;
       pth_free (backup_gpt);
@@ -984,7 +980,6 @@ gpt_read (PedDisk *disk)
         goto error_free_gpt;
 
       gpt = primary_gpt;
-      write_back = 0;
     }
   else /* !primary_gpt && backup_gpt */
     {
@@ -997,7 +992,6 @@ gpt_read (PedDisk *disk)
         goto error_free_gpt;
 
       gpt = backup_gpt;
-      write_back = 0;
     }
   backup_gpt = NULL;
   primary_gpt = NULL;