From 3e69117b708114924531e2ef2ac5ea6c1e96dba1 Mon Sep 17 00:00:00 2001 From: Daniel Henrique Barboza Date: Wed, 18 Feb 2015 16:38:36 -0200 Subject: [PATCH] Github #9, #10 and #12 fixes Issues #9 and #10 describe errors related to the absence of the VERSION file in the zip/tarball downloaded from Ginger webpage in Github. This happens because Github does not include in the compressed file any file that are in .gitignore. Excluding the VERSION file from .gitignore fixes both issues. Issue #12 says that the ChangeLog is missing from the zip/tarball. This was fixed before in a previous commit, but to make it available we need to retag Ginger to force Github to create a new tarball. There's also a minor issue with the previous naming used for the Ginger tags. Naming the tags as 'ginger-' forces Github to create a tarball with name 'ginger-', thus the file name becomes 'ginger-ginger-'. Since we need to retag the project due to these issues, the tag name will be changed to just ''. To reflect that, pkg-version was changed. Signed-off-by: Daniel Henrique Barboza --- .gitignore | 1 - ChangeLog | 48 ++++++++++++++++++++++++++++++++++++++++++- VERSION | 1 + build-aux/pkg-version | 29 ++++++++++++++------------ 4 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 VERSION diff --git a/.gitignore b/.gitignore index b308dce7..90b0dfbb 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ .*.swp Makefile Makefile.in -VERSION aclocal.m4 autom4te.cache build-aux/config.guess diff --git a/ChangeLog b/ChangeLog index 9455f852..84db4821 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ CHANGELOG ========= +#### [1.3.0.1] #### + * [0e1c801] Github #9, #10 and #12 fixes (Daniel Henrique Barboza) + * [9a5567a] i18n.py: deleting the merge with kimchi messages (Daniel Henrique Barboza) + * [a8a6514] Enhancing Power Management error messages (Daniel Henrique Barboza) + * [8c5ea3a] ChangeLog file for Ginger (Daniel Henrique Barboza) + * [4c81977] Make check fixes (Daniel Henrique Barboza) + #### [ginger-1.3.0] #### * [0e4806c] Debian/Ubuntu packaging files (Daniel Henrique Barboza) * [23ded96] README: adding Ubuntu/Debian info. (Daniel Henrique Barboza) @@ -39,7 +46,46 @@ CHANGELOG * [4fac9cc] Updated .gitignore to Address Generated Files (hlwang@linux.vnet.ibm.com) * [5ce4a73] Adapt to new Kimchi authorization scheme (Zhou Zheng Sheng) -#### [ginger-1.2.1] #### +#### [1.3.0.1] #### + * [0e1c801] Github #9, #10 and #12 fixes (Daniel Henrique Barboza) + * [9a5567a] i18n.py: deleting the merge with kimchi messages (Daniel Henrique Barboza) + * [a8a6514] Enhancing Power Management error messages (Daniel Henrique Barboza) + * [8c5ea3a] ChangeLog file for Ginger (Daniel Henrique Barboza) + * [4c81977] Make check fixes (Daniel Henrique Barboza) + * [0e4806c] Debian/Ubuntu packaging files (Daniel Henrique Barboza) + * [23ded96] README: adding Ubuntu/Debian info. (Daniel Henrique Barboza) + * [f0c3be7] models/ibm_sep.py: adding 'is_feature_available()' method (Daniel Henrique Barboza) + * [c332517] models/interfaces.py: fixing an 'is not defined' error (Daniel Henrique Barboza) + * [fd5c176] UI: Capabilities for ginger (wenwang@linux.vnet.ibm.com) + * [b60e80a] Capabilities API: adding support to some existing models (Daniel Henrique Barboza) + * [b911174] Adding capabilities API to Makefiles (Daniel Henrique Barboza) + * [6441dbf] Adding new API: Capabilities (Daniel Henrique Barboza) + * [8aa841f] Fix delete user return error (Rodrigo Trujillo) + * [e8453fc] Have Firmware inherit from Object (christy@linux.vnet.ibm.com) + * [b7589c6] Changing the network interfaces listing (Daniel Henrique Barboza) + * [a7f2e08] UI: Ginger User Management (Wen Wang) + * [b76a7e2] models/interfaces.py: removing ip/netmask on blank input (danielhb@linux.vnet.ibm.com) + * [1e1011f] Add Ginger Help files (Rodrigo Trujillo) + * [a8bff3e] Packaging: Let Ginger Depend on Latest Kimchi (Zhou Zheng Sheng) + * [3345353] Deal with bad hdd sensor data (christy@linux.vnet.ibm.com) + * [6eb90a5] Bugfix: Make buttons display properly when the text is long (Wen Wang) + * [e7ed072] Enhancement: Change the SEP status style from text to a status dot (Wen Wang) + * [468149e] host-admin.js: disabling OK button when processing (danielhb@linux.vnet.ibm.com) + * [daecbfc] Update Makefile.am to add autogen.sh in tarball. (Paulo Vital) + * [3cc5181] Add timeout check for configuration backup (Zhou Zheng Sheng) + * [9a3b682] Bugfix Takes time to activate tuned profile in "Power Options" (Wen Wang) + * [db95b9e] IBM SEP bug fix: Update _get_subscribe info (Paulo Vital) + * [eac260e] Bugfix: Change ginger's text for translation (wenwang@linux.vnet.ibm.com) + * [1e1905b] UI: SEP(ESA) initial setup (Wen Wang) + * [b6f83bc] IBM Serviceable Event Provider (SEP): Update build files (Paulo Vital) + * [c5869b6] IBM Serviceable Event Provider (SEP): Backend support (Paulo Vital) + * [66db9fd] IBM Serviceable Event Provider (SEP): Update configuration files (Paulo Vital) + * [646a0c1] UI: Host sensors data visualization (Wen Wang) + * [ea67e95] 'tuned' troubleshot information in README file (danielhb@linux.vnet.ibm.com) + * [91ebfc3] Add sensors backend functionality (christy@linux.vnet.ibm.com) + * [9e5dccc] Fix pyflakes and pep 8 errors (Zhou Zheng Sheng) + * [4fac9cc] Updated .gitignore to Address Generated Files (hlwang@linux.vnet.ibm.com) + * [5ce4a73] Adapt to new Kimchi authorization scheme (Zhou Zheng Sheng) * [77a3b53] Removed all author references from Ginger files. (Paulo Vital) * [f19cf68] Changed the year of all IBM copyright mention to 2014. (Paulo Vital) * [28450db] Change project name in all files from Kimchi-ginger to Ginger. (Paulo Vital) diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..d0399b85 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.3.0.1 diff --git a/build-aux/pkg-version b/build-aux/pkg-version index 50d27158..200f2d41 100755 --- a/build-aux/pkg-version +++ b/build-aux/pkg-version @@ -17,32 +17,35 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # tags and output versions: -# - ginger-1.2.0 => 1.2.0 (upstream clean) -# - ginger-1.2.0-1 => 1.2.0 (downstream clean) -# - ginger-1.2.0-2-g34e62f => 1.2.0 (upstream dirty) -# - ginger-1.2.0-1-2-g34e62f => 1.2.0 (downstream dirty) +# - 1.2.0 => 1.2.0 (upstream clean) +# - 1.2.0-1 => 1.2.0 (downstream clean) +# - 1.2.0-2-g34e62f => 1.2.0 (upstream dirty) +# - 1.2.0-1-2-g34e62f => 1.2.0 (downstream dirty) AWK_VERSION=' BEGIN { FS="-" } - /^ginger-[0-9]/ { - sub(/^ginger-/,"") ; print $1 + /^[0-9]/ { + print $1 }' # tags and output releases: -# - ginger-1.2.0 => 0 (upstream clean) -# - ginger-1.2.0-1 => 1 (downstream clean) -# - ginger-1.2.0-2-g34e62f1 => 2.git34e62f1 (upstream dirty) -# - ginger-1.2.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty) +# - 1.2.0 => 0 (upstream clean) +# - 1.2.0-1 => 1 (downstream clean) +# - 1.2.0-2-g34e62f1 => 2.git34e62f1 (upstream dirty) +# - 1.2.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty) AWK_RELEASE=' BEGIN { FS="-"; OFS="." } - /^ginger-[0-9]/ { - sub(/^ginger-/,"") + /^[0-9]/ { if (NF == 1) print 0 else if (NF == 2) print $2 else if (NF == 3) print $2, "git" substr($3, 2) else if (NF == 4) print $2, $3, "git" substr($4, 2) }' -PKG_VERSION=`git describe --tags --match "ginger-[0-9]*" 2> /dev/null || cat VERSION 2> /dev/null` +if [ ! -d .git ]; then + PKG_VERSION=`cat VERSION` +else + PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION` +fi if test "x$1" = "x--full"; then echo $PKG_VERSION | tr -d '[:space:]'