[Rt-commit] r15163 - in rtfm/branches/2.4.0-releng: inc/Module/Install lib/RT

[falcone at bestpractical.com]

Author: falcone
Date: Thu Aug 14 14:18:05 2008
New Revision: 15163

Removed:
   rtfm/branches/2.4.0-releng/inc/Module/Install/Substitute.pm
Modified:
   rtfm/branches/2.4.0-releng/   (props changed)
   rtfm/branches/2.4.0-releng/META.yml
   rtfm/branches/2.4.0-releng/Makefile.PL
   rtfm/branches/2.4.0-releng/lib/RT/FM.pm

Log:
- Merge //mirror/bps-public/rtfm/trunk to //mirror/bps-public/rtfm/branches/2.4.0-releng

Modified: rtfm/branches/2.4.0-releng/META.yml
==============================================================================
--- rtfm/branches/2.4.0-releng/META.yml	(original)
+++ rtfm/branches/2.4.0-releng/META.yml	Thu Aug 14 14:18:05 2008
@@ -1,23 +1,22 @@
----
-abstract: 'RT FM Extension'
+--- 
+abstract: RT FM Extension
 author: ~
 distribution_type: module
-generated_by: 'Module::Install version 0.72'
-license: 'GPL version 2'
-meta-spec:
+generated_by: Module::Install version 0.70
+license: GPL version 2
+meta-spec: 
   url: http://module-build.sourceforge.net/META-spec-v1.3.html
   version: 1.3
 name: RTFM
-no_index:
-  directory:
-    - bin
+no_index: 
+  directory: 
     - etc
     - html
     - po
-    - sbin
+    - var
     - inc
     - t
-requires:
+requires: 
   HTML::FormatText: 0
   HTML::TreeBuilder: 0
   RT: 3.004002
@@ -25,4 +24,4 @@
   Time::ParseDate: 0
   Tree::Simple: 0
   perl: 5.8.3
-version: 2.3.1
+version: 2.4.HEAD

Modified: rtfm/branches/2.4.0-releng/Makefile.PL
==============================================================================
--- rtfm/branches/2.4.0-releng/Makefile.PL	(original)
+++ rtfm/branches/2.4.0-releng/Makefile.PL	Thu Aug 14 14:18:05 2008
@@ -1,9 +1,10 @@
 use inc::Module::Install;
 RTx('RT-FM');
 name('RTFM');
-version_from('lib/RT/FM.pm');
 license('GPL version 2');
 perl_version('5.008003');
+#version_from('lib/RT/FM.pm');
+all_from('lib/RT/FM.pm');
 requires(
     RT                => '3.004002',
     Text::WikiFormat  => 0,
@@ -14,18 +15,4 @@
 );
 auto_install();
 
-my ($lp) = ($INC{'RT.pm'} =~ /^(.*)[\\\/]/);
-my $lib_path = join( ' ', "$RT::LocalPath/lib", $lp );
-my $sbin_path = $RT::SbinPath || "$RT::BasePath/sbin" || "/opt/rt3/sbin";
-my $bin_path = $RT::BinPath || "$RT::BasePath/bin" || "/opt/rt3/bin";
-
-substitute(
-    {
-        RT_LIB_PATH  => $lib_path,
-        RT_BIN_PATH  => $bin_path,
-        RT_SBIN_PATH => $sbin_path,
-    },
-    qw(t/utils.pl),
-);
-
 WriteAll();

Modified: rtfm/branches/2.4.0-releng/lib/RT/FM.pm
==============================================================================
--- rtfm/branches/2.4.0-releng/lib/RT/FM.pm	(original)
+++ rtfm/branches/2.4.0-releng/lib/RT/FM.pm	Thu Aug 14 14:18:05 2008
@@ -52,7 +52,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '2.3.1';
+our $VERSION = '2.4.HEAD';
 
 # Create a system object for RTFM
 use RT::FM::System;