[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.5-142-g2549e86

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  2549e8699ab9d4b888e21e863dc9874f70215ff9 (commit)
       via  ab424465bbdfa3183708652a3ee582c46d206128 (commit)
       via  4a88ea8d1dcf42272ab19d0da52302d68c304a87 (commit)
       via  3be470c207d15a4171684ed048b53d93fc0f99fd (commit)
       via  6d885610e96775ca60d7e9d5b4e017738160bbc1 (commit)
       via  d1ee71d8b650b7f3ffdb97076b80374fe6f3fa7e (commit)
       via  9874a599183a4e23416acfb889a6b48d31b58f71 (commit)
       via  c434f2b407da53de6ed35d9888aebffd252829be (commit)
       via  a315627dbaf5a6af2820c310177396847e0af656 (commit)
       via  3a64944dbc1d3ef4d63116ac9fd1829dfed9a1d0 (commit)
       via  96d9bce5a22bc73a34cf6d446e471f794206ab9b (commit)
       via  4cd0b9c7c258b985159d96f6aa75d871f0300777 (commit)
       via  61c41182285a4de9ed7aeaaee89d45413f34a4f7 (commit)
       via  e93f58570a691314ee9e230d8f1ed1ba63b56375 (commit)
       via  b32a81812a9ef80238ceeaf248476d8f46d290f7 (commit)
       via  e688a797cbf842de3c1f6c481313e00e7af788a0 (commit)
       via  638214540c268f2d3a9996b5a2fc21d62d63853a (commit)
       via  45b632455d002a77e4592a09535d8ffa9fd3dcfd (commit)
       via  9ec3b7df17d5caa4d997161e98713f373d6c6719 (commit)
       via  eb939ac13712d04544c6aa892563e95aab0ee3a4 (commit)
       via  da5169809e13d63faf1bca3cac6806dcb258593b (commit)
       via  d1f38786d048d1320f68cfbac8e6b583f3d2c073 (commit)
      from  dce526063ed2bcf3ad1689ce153d855283b99639 (commit)

Summary of changes:
 configure.ac                    |  2 +-
 docs/customizing/lifecycles.pod | 42 +++++++++++++++++++++++++++++++++++------
 lib/RT/Shredder/Plugin/Users.pm |  1 +
 lib/RT/Ticket.pm                |  2 +-
 share/html/index.html           |  2 +-
 5 files changed, 40 insertions(+), 9 deletions(-)

- Log -----------------------------------------------------------------
commit 2549e8699ab9d4b888e21e863dc9874f70215ff9
Merge: dce5260 ab42446
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Jul 2 17:13:49 2014 -0400

    Merge branch '4.0-trunk' into 4.2-trunk
    
    Conflicts:
    	lib/RT/Tickets.pm
    	share/html/Admin/Tools/Theme.html
    	share/html/Elements/ValidateCustomFields

diff --cc configure.ac
index cd55c3e,2dfda93..8cd71d0
--- a/configure.ac
+++ b/configure.ac
@@@ -241,22 -243,30 +241,22 @@@ AS_IF([ test "$DB_TYPE" = "mysql" ]
       )
  
  
 -dnl Set the value of apachectl
 -AC_ARG_WITH(apachectl,
 -            AC_HELP_STRING([--with-apachectl],
 -                           [instruct RT where to find your apachectl]),
 -            APACHECTL=$withval, 
 -            APACHECTL=`which apachectl`)
 -AC_SUBST(APACHECTL)
 -
 -dnl RT's "maintainer mode"
 -AC_ARG_WITH(devel-mode,[],RT_DEVEL_MODE=$withval,RT_DEVEL_MODE="0")
 -AC_ARG_ENABLE(devel-mode,
 -            AC_HELP_STRING([--enable-devel-mode],
 -                           [Turn on development aids that might hurt you in production]),
 -            RT_DEVEL_MODE=$enableval,
 -            RT_DEVEL_MODE=$RT_DEVEL_MODE)
 -if test "$RT_DEVEL_MODE" = yes; then
 -        RT_DEVEL_MODE="1"
 +dnl Dependencies for testing and developing RT
 +AC_ARG_WITH(developer,[],RT_DEVELOPER=$withval,RT_DEVELOPER="0")
 +AC_ARG_ENABLE(developer,
 +            AC_HELP_STRING([--enable-developer],
 +                           [Add dependencies needed for testing and developing RT]),
 +            RT_DEVELOPER=$enableval,
 +            RT_DEVELOPER=$RT_DEVELOPER)
 +if test "$RT_DEVELOPER" = yes; then
 +        RT_DEVELOPER="1"
  else
 -        RT_DEVEL_MODE="0"
 +        RT_DEVELOPER="0"
  fi
 -AC_SUBST(RT_DEVEL_MODE)
 +AC_SUBST(RT_DEVELOPER)
  
  dnl RT's GraphViz dependency charts
- AC_CHECK_LIB([graph],[aginitlib],RT_GRAPHVIZ="1")
+ AC_CHECK_PROG([RT_GRAPHVIZ], [dot], "yes", "no")
  AC_ARG_WITH(graphviz,[],RT_GRAPHVIZ=$withval)
  AC_ARG_ENABLE(graphviz,
              AC_HELP_STRING([--enable-graphviz],

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