Version 10.1.1 final packaging.

Updated spec and lsm files. Updated CHANGES file.

diff --git a/CHANGES b/CHANGES
index ccbc5f2ae0ce0d5521b8134c54acf8a9afb2f03e..95c5ee337ad8c60048cbcc4e14edfdf2850cc97d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Changes:
 
-xxxx/xx/xx: Version 10.1.1 - Sebastien Godard (sysstat <at> orange.fr)
+2012/07/29: Version 10.1.1 - Sebastien Godard (sysstat <at> orange.fr)
        * Added option -[0-9]+ to sar to show data of that days ago.
        * [Peter Schiffer]: Persistent device names support added to
          sar and iostat (option -j).

diff --git a/common.c b/common.c
index 101650476942dafd8dec2c8f6b40bff84178874b..3b1dbbddab3b6be906921caa834157cff2c392a5 100644 (file)
--- a/common.c
+++ b/common.c
@@ -70,7 +70,7 @@ void print_version(void)
  *
  * IN:
  * @d_off      Day offset (number of days to go back in the past).
- * 
+ *
  * OUT:
  * @rectime    Current local date and time.
  *
@@ -97,7 +97,7 @@ time_t get_localtime(struct tm *rectime, int d_off)
  *
  * IN:
  * @d_off      Day offset (number of days to go back in the past).
- * 
+ *
  * OUT:
  * @rectime    Current date and time expressed in UTC.
  *
@@ -124,7 +124,7 @@ time_t get_gmtime(struct tm *rectime, int d_off)
  *
  * IN:
  * @d_off      Day offset (number of days to go back in the past).
- * 
+ *
  * OUT:
  * @rectime    Current date and time.
  *

diff --git a/nls/sysstat.pot b/nls/sysstat.pot
index f5ae340665c0a6aa3015c55002666a553175d422..6c1a3baa924437a4e7764778d1b04a32f9685dc2 100644 (file)
--- a/nls/sysstat.pot
+++ b/nls/sysstat.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2012-07-21 21:46+0200\n"
+"POT-Creation-Date: 2012-07-24 21:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: sadf_misc.c:595
-#, c-format
-msgid "System activity data file: %s (%#x)\n"
-msgstr ""
-
-#: sadf_misc.c:604
-#, c-format
-msgid "Host: "
-msgstr ""
-
-#: sadf_misc.c:610
-#, c-format
-msgid "Size of a long int: %d\n"
-msgstr ""
-
-#: sadf_misc.c:612
-#, c-format
-msgid "List of activities:\n"
-msgstr ""
-
-#: sadf_misc.c:625
-#, c-format
-msgid "\t[Unknown activity format]"
-msgstr ""
-
-#: iostat.c:84 cifsiostat.c:69 mpstat.c:86 pidstat.c:78 sar.c:90
+#: iostat.c:84 cifsiostat.c:69 mpstat.c:86 sar.c:90 pidstat.c:78
 #: nfsiostat.c:68
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
@@ -131,20 +106,6 @@ msgid ""
 "[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
 msgstr ""
 
-#: sadf.c:86
-#, c-format
-msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> ]\n"
-msgstr ""
-
-#: sadf.c:89
-#, c-format
-msgid ""
-"Options are:\n"
-"[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T | -t | -U ] [ -V ]\n"
-"[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
-"[ -- <sar_options> ]\n"
-msgstr ""
-
 #: mpstat.c:89
 #, c-format
 msgid ""
@@ -153,7 +114,7 @@ msgid ""
 "[ -P { <cpu> [,...] | ON | ALL } ]\n"
 msgstr ""
 
-#: mpstat.c:581 pidstat.c:1822 sar.c:382
+#: mpstat.c:581 sar.c:382 pidstat.c:1822
 msgid "Average:"
 msgstr ""
 
@@ -162,62 +123,43 @@ msgstr ""
 msgid "Not that many processors!\n"
 msgstr ""
 
-#: rd_stats.c:2163
-#, c-format
-msgid "Cannot handle so many processors!\n"
-msgstr ""
-
-#: pr_stats.c:2329 pr_stats.c:2342
-msgid "Summary"
-msgstr ""
-
-#: pr_stats.c:2380
-msgid "Other devices not listed here"
-msgstr ""
-
-#: sa_common.c:917
+#: sadf_misc.c:595
 #, c-format
-msgid "Error while reading system activity file: %s\n"
+msgid "System activity data file: %s (%#x)\n"
 msgstr ""
 
-#: sa_common.c:927
+#: sadf_misc.c:604
 #, c-format
-msgid "End of system activity file unexpected\n"
+msgid "Host: "
 msgstr ""
 
-#: sa_common.c:946
+#: sadf_misc.c:610
 #, c-format
-msgid "File created using sar/sadc from sysstat version %d.%d.%d"
+msgid "Size of a long int: %d\n"
 msgstr ""
 
-#: sa_common.c:977
+#: sadf_misc.c:612
 #, c-format
-msgid "Invalid system activity file: %s\n"
+msgid "List of activities:\n"
 msgstr ""
 
-#: sa_common.c:984
+#: sadf_misc.c:625
 #, c-format
-msgid ""
-"Current sysstat version can no longer read the format of this file (%#x)\n"
+msgid "\t[Unknown activity format]"
 msgstr ""
 
-#: sa_common.c:1216
+#: sadf.c:86
 #, c-format
-msgid "Requested activities not available in file %s\n"
+msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> ]\n"
 msgstr ""
 
-#: pidstat.c:81
+#: sadf.c:89
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ] [ -t ] [ -u ] [ -V ]\n"
-"[ -w ] [ -C <command> ] [ -p { <pid> [,...] | SELF | ALL } ]\n"
-"[ -T { TASK | CHILD | ALL } ]\n"
-msgstr ""
-
-#: pidstat.c:199 sar.c:1014
-#, c-format
-msgid "Requested activities not available\n"
+"[ -C ] [ -d | -j | -p | -x ] [ -H ] [ -h ] [ -T | -t | -U ] [ -V ]\n"
+"[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
+"[ -- <sar_options> ]\n"
 msgstr ""
 
 #: sar.c:105
@@ -372,6 +314,11 @@ msgstr ""
 msgid "Inconsistent input data\n"
 msgstr ""
 
+#: sar.c:1014 pidstat.c:199
+#, c-format
+msgid "Requested activities not available\n"
+msgstr ""
+
 #: sar.c:1272
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
@@ -386,3 +333,56 @@ msgstr ""
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr ""
+
+#: rd_stats.c:2163
+#, c-format
+msgid "Cannot handle so many processors!\n"
+msgstr ""
+
+#: sa_common.c:917
+#, c-format
+msgid "Error while reading system activity file: %s\n"
+msgstr ""
+
+#: sa_common.c:927
+#, c-format
+msgid "End of system activity file unexpected\n"
+msgstr ""
+
+#: sa_common.c:946
+#, c-format
+msgid "File created using sar/sadc from sysstat version %d.%d.%d"
+msgstr ""
+
+#: sa_common.c:977
+#, c-format
+msgid "Invalid system activity file: %s\n"
+msgstr ""
+
+#: sa_common.c:984
+#, c-format
+msgid ""
+"Current sysstat version can no longer read the format of this file (%#x)\n"
+msgstr ""
+
+#: sa_common.c:1216
+#, c-format
+msgid "Requested activities not available in file %s\n"
+msgstr ""
+
+#: pidstat.c:81
+#, c-format
+msgid ""
+"Options are:\n"
+"[ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ] [ -t ] [ -u ] [ -V ]\n"
+"[ -w ] [ -C <command> ] [ -p { <pid> [,...] | SELF | ALL } ]\n"
+"[ -T { TASK | CHILD | ALL } ]\n"
+msgstr ""
+
+#: pr_stats.c:2329 pr_stats.c:2342
+msgid "Summary"
+msgstr ""
+
+#: pr_stats.c:2380
+msgid "Other devices not listed here"
+msgstr ""

diff --git a/sa_common.c b/sa_common.c
index b077de9835aac340f364900caaa0b81aa67bd04d..f0d294f3b9a1f7586896a2d7376cc31d7b0885bb 100644 (file)
--- a/sa_common.c
+++ b/sa_common.c
@@ -115,7 +115,7 @@ void free_structures(struct activity *act[])
 /*
   ***************************************************************************
   * Try to get device real name from sysfs tree.
-  * 
+  *
   * IN:
   * @major     Major number of the device.
   * @minor     Minor number of the device.
@@ -346,7 +346,7 @@ int parse_timestamp(char *argv[], int *opt, struct tstamp *tse,
  *
  * IN:
  * @d_off      Day offset (number of days to go back in the past).
- * 
+ *
  * OUT:
  * @rectime    Current date and time.
  * @datafile   Name of daily data file.

diff --git a/sysstat-10.0.5.lsm b/sysstat-10.1.1.lsm
similarity index 81%
rename from sysstat-10.0.5.lsm
rename to sysstat-10.1.1.lsm
index b117786e381b817d5c7ad15c44c24d29acd857ec..1e27226621023c29ad65c9dbd67f1e7672be6622 100644 (file)
--- a/sysstat-10.0.5.lsm
+++ b/sysstat-10.1.1.lsm
@@ -1,7 +1,7 @@
 Begin4
 Title:         sysstat - the sar, sadf, mpstat, iostat, nfsiostat, cifsiostat and pidstat commands for Linux
-Version:       10.0.5
-Entered-date:  2012-05-16
+Version:       10.1.1
+Entered-date:  2012-07-29
 Description:   The sysstat package contains the sar, sadf, mpstat, iostat,
                pidstat, nfsiostat, cifsiostat and sa tools for Linux.
                The sar command collects and reports system activity
@@ -22,16 +22,16 @@ Description:        The sysstat package contains the sar, sadf, mpstat, iostat,
                The nfsiostat command reports I/O statistics for network filesystems.
                The cifsiostat command reports I/O statistics for CIFS filesystems.
                NB: Send bugs, patches, suggestions and/or questions to
-               (sysstat [at] orange.fr) and not to the address below!
+               (sysstat [at] orange.fr).
                URL: http://pagesperso-orange.fr/sebastien.godard/ 
 Keywords:      system administration, sar, sadf, iostat, mpstat, pidstat, nfsiostat, cifsiostat, system accounting, performance, tuning
-Author:                sebastien.godard@orange.fr (Sebastien Godard)
-Maintained-by: sebastien.godard@orange.fr (Sebastien Godard)
+Author:                sysstat [at] orange.fr (Sebastien Godard)
+Maintained-by: sysstat [at] orange.fr (Sebastien Godard)
 Primary-site:  http://pagesperso-orange.fr/sebastien.godard/
-               348kB sysstat-10.0.5.tar.gz
-               276kB sysstat-10.0.5.tar.bz2
-               352kB sysstat-10.0.5-1.src.rpm
-               345kB sysstat-10.0.5-1.i586.rpm
+               364kB sysstat-10.1.1.tar.gz
+               285kB sysstat-10.1.1.tar.bz2
+               368kB sysstat-10.1.1-1.src.rpm
+               362kB sysstat-10.1.1-1.x86_64.rpm
 Alternate-site:
 Copying-policy:        GPL
 End

diff --git a/sysstat-10.0.5.spec b/sysstat-10.1.1.spec
similarity index 99%
rename from sysstat-10.0.5.spec
rename to sysstat-10.1.1.spec
index a7f7f4923e7f90a5bd830c40bba57c4d4bd99508..e15dd8bd6083fb48b618dcfeedfa20f07597daab 100644 (file)
--- a/sysstat-10.0.5.spec
+++ b/sysstat-10.1.1.spec
@@ -1,6 +1,6 @@
 Summary:       SAR, SADF, MPSTAT, IOSTAT, NFSIOSTAT, CIFSIOSTAT and PIDSTAT for Linux
 Name:          sysstat
-Version:       10.0.5
+Version:       10.1.1
 Release:       1
 License:       GPL
 Group:                 Applications/System