[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2859d88277b44e89b6efbeac7de77d12f0ddd0ff

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  2859d88277b44e89b6efbeac7de77d12f0ddd0ff (commit)
       via  0835a6ee5b9fb387b49fb4e315562225957cd8cc (commit)
       via  dcc6f453225723945c55b5b1162d3cc667911f1e (commit)
       via  48cd176db46f0119d898cd010f5b16f335c8fe7d (commit)
      from  a8118d892da94aa4dbd04e1559b82b731baba1b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2859d88277b44e89b6efbeac7de77d12f0ddd0ff
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Sep 3 11:10:12 2013 -0400

    .gitignore installed files more generically
    
    Avoid naming specific versions to ignore when possible.
    
    * Ignore any files in root directory (Evergreen/) that match js
      or JavaScript (from the installer).
    * Ignore all xulrunner*.bz2 and xulrunner*.zip
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/.gitignore b/.gitignore
index feef74f..0be65d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -325,7 +325,6 @@ Open-ILS/xul/staff_client/server/locale/ru-RU/
 Open-ILS/xul/staff_client/server/locale/sv-SE/
 Open-ILS/xul/staff_client/server/locale/tr-TR/
 Open-ILS/xul/staff_client/evergreen_staff_client.tar.bz2
-Open-ILS/xul/staff_client/xulrunner-3.6.25.en-US.linux-i686.tar.bz2
 Open-ILS/xul/staff_client/xulrunner/
 README.html
 HACKING.html
@@ -348,11 +347,8 @@ Open-ILS/xul/staff_client/branding/
 Open-ILS/xul/staff_client/evergreen.xpi.md5
 Open-ILS/xul/staff_client/external/libmar/tool/mar
 Open-ILS/xul/staff_client/external/libmar/tool/mbsdiff
-Open-ILS/xul/staff_client/xulrunner-14.0.1.en-US.linux-i686.tar.bz2
-Open-ILS/xul/staff_client/xulrunner-14.0.1.en-US.linux-x86_64.tar.bz2
-Open-ILS/xul/staff_client/xulrunner-14.0.1.en-US.win32.zip
+Open-ILS/xul/staff_client/xulrunner*.bz2
+Open-ILS/xul/staff_client/xulrunner*.zip
 Open-ILS/xul/staff_client/xulrunner-stub.exe
-js-1.7.0.tar.gz
-js/
-JavaScript-SpiderMonkey-0.21.tar.gz
-JavaScript-SpiderMonkey-0.21/
+/js*
+/JavaScript*

commit 0835a6ee5b9fb387b49fb4e315562225957cd8cc
Author: Ben Shum <bshum at biblio.org>
Date:   Thu Aug 22 13:56:25 2013 -0400

    Add xulrunner 14, built libmar tools, and some javascript files to .gitignore
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/.gitignore b/.gitignore
index 2f63b6e..feef74f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -344,3 +344,15 @@ Open-ILS/xul/staff_client/external/libmar/tool/.deps/
 Open-ILS/src/c-apps/tests/.libs/
 Open-ILS/src/c-apps/tests/check_idl
 Open-ILS/src/c-apps/tests/check_util
+Open-ILS/xul/staff_client/branding/
+Open-ILS/xul/staff_client/evergreen.xpi.md5
+Open-ILS/xul/staff_client/external/libmar/tool/mar
+Open-ILS/xul/staff_client/external/libmar/tool/mbsdiff
+Open-ILS/xul/staff_client/xulrunner-14.0.1.en-US.linux-i686.tar.bz2
+Open-ILS/xul/staff_client/xulrunner-14.0.1.en-US.linux-x86_64.tar.bz2
+Open-ILS/xul/staff_client/xulrunner-14.0.1.en-US.win32.zip
+Open-ILS/xul/staff_client/xulrunner-stub.exe
+js-1.7.0.tar.gz
+js/
+JavaScript-SpiderMonkey-0.21.tar.gz
+JavaScript-SpiderMonkey-0.21/

commit dcc6f453225723945c55b5b1162d3cc667911f1e
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Aug 22 12:36:17 2013 -0400

    Add some 'make check' objects to .gitignore
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/.gitignore b/.gitignore
index 598c860..2f63b6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -341,3 +341,6 @@ Open-ILS/xul/staff_client/external/libmar/config.h.in
 Open-ILS/xul/staff_client/external/libmar/src/.deps/
 Open-ILS/xul/staff_client/external/libmar/stamp-h1
 Open-ILS/xul/staff_client/external/libmar/tool/.deps/
+Open-ILS/src/c-apps/tests/.libs/
+Open-ILS/src/c-apps/tests/check_idl
+Open-ILS/src/c-apps/tests/check_util

commit 48cd176db46f0119d898cd010f5b16f335c8fe7d
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Thu Aug 22 12:29:51 2013 -0400

    Add more built things to .gitignore for master
    
    Tired of seeing all this meaningless red from `git status`
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/.gitignore b/.gitignore
index 9c7a34d..598c860 100644
--- a/.gitignore
+++ b/.gitignore
@@ -333,3 +333,11 @@ Open-ILS/examples/apache/eg.conf
 Open-ILS/examples/apache/eg_startup
 Open-ILS/examples/apache/eg_vhost.conf
 Open-ILS/src/support-scripts/eg_db_config
+Open-ILS/examples/apache_24/eg_24.conf
+Open-ILS/examples/apache_24/eg_vhost_24.conf
+Open-ILS/src/c-apps/tests/.deps/
+Open-ILS/xul/staff_client/external/libmar/config.h
+Open-ILS/xul/staff_client/external/libmar/config.h.in
+Open-ILS/xul/staff_client/external/libmar/src/.deps/
+Open-ILS/xul/staff_client/external/libmar/stamp-h1
+Open-ILS/xul/staff_client/external/libmar/tool/.deps/

-----------------------------------------------------------------------

Summary of changes:
 .gitignore |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS