Changeset 11512

Show
Ignore:
Timestamp:
02/20/11 19:04:41 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11511 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.7

................

r11511 | p_lindheimer | 2011-02-20 16:02:59 -0800 (Sun, 20 Feb 2011) | 16 lines


Merged revisions 11510 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.8


................

r11510 | p_lindheimer | 2011-02-20 16:00:39 -0800 (Sun, 20 Feb 2011) | 9 lines


Merged revisions 11509 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.9


........

r11509 | p_lindheimer | 2011-02-20 15:59:27 -0800 (Sun, 20 Feb 2011) | 1 line


remove non numerics form version info in sed

........

................

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.6

    • Property svnmerge-integrated changed from /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968,8036-8037,9751,10821 /modules/branches/2.7:1-8497,8576-8578,8581,8585,8662-8669,8690,8709,8821,8883,8944,9219,9543,10300,10340,10392,10399-10422,10424-10426,10428-10429,10432,10436-10458,10518,10859,11016 to /modules/branches/2.7:1-8497,8576-8578,8581,8585,8662-8669,8690,8709,8821,8883,8944,9219,9543,10300,10340,10392,10399-10422,10424-10426,10428-10429,10432,10436-10458,10518,10859,11016,11511 /modules/branches/2.5:1-7809,7812,7854,7858-7865,7878,7886,7890,7915,7967-7968,8036-8037,9751,10821

  • modules/branches/2.6/frameworksvn.pl

    r7959 r11512  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    33   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
    34  
     33  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 

  • modules/branches/2.6/fw_arisvn.pl

    r7959 r11512  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    33   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
     33  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 
    3434 

  • modules/branches/2.6/fw_fopsvn.pl

    r8193 r11512  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log since that version for $rver : .... \n\n"; 
    33   $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD"); 
    34  
     33  $svnver = system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs_panel -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD"); 

  • modules/branches/2.6/fw_langpackssvn.pl

    r8193 r11512  
    3131  system("tar -zxOf ".$filename." ".$moddir."/svnversion.txt"); 
    3232  print "Geting svn log of language updates since that version for $rver : .... \n\n"; 
    33   system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings/locale -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD | grep 'htdocs/recordings/locale'"); 
    34   system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/admin -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD | grep 'i18n/' | grep 'htdocs/admin'"); 
    35   system("svn log http://svn.freepbx.org/modules/branches/$rver -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION://`:HEAD | grep 'i18n/' | grep 'modules/branches'"); 
     33  system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/recordings/locale -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD | grep 'htdocs/recordings/locale'"); 
     34  system("svn log http://svn.freepbx.org/freepbx/$fwbranch/amp_conf/htdocs/admin -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD | grep 'i18n/' | grep 'htdocs/admin'"); 
     35  system("svn log http://svn.freepbx.org/modules/branches/$rver -v -r `tar -zxOf ".$filename." ".$moddir."/svnversion.txt | sed -e s/SVN\\\ VERSION:// | tr -cd '0-9'`:HEAD | grep 'i18n/' | grep 'modules/branches'"); 
    3636 
    3737