Wireshark · Wireshark-commits: [Wireshark-commits] rev 43169: /trunk-1.8/ /trunk-1.8/epan/: Makefile.am /trunk-1.8/tools/: git-comp

[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=43169

User: gerald
Date: 2012/06/08 04:02 PM

Log:
 Forward-port r43165 and r43168 from trunk-1.6.
 
   ------------------------------------------------------------------------
   r43165 | gerald | 2012-06-08 14:23:25 -0700 (Fri, 08 Jun 2012) | 4 lines
   Changed paths:
      M /trunk-1.6/epan/Makefile.am
      M /trunk-1.6/wiretap/Makefile.am
      M /trunk-1.6/wsutil/Makefile.am
   
   Use separate commands in the dumpabi recipes instead a big huge long
   chain. If abi-compliance-checker fails print the contents of its
   log file.
   ------------------------------------------------------------------------
   r43168 | gerald | 2012-06-08 15:43:50 -0700 (Fri, 08 Jun 2012) | 2 lines
   Changed paths:
      M /trunk-1.6/epan/Makefile.am
      M /trunk-1.6/wiretap/Makefile.am
      M /trunk-1.6/wsutil/Makefile.am
   
   Make sure ln happens in the right directory.
   ------------------------------------------------------------------------
 
 We don't currently have a usable tag for "git describe --tags
 --abbrev=0" to latch onto so just use the master-1.8 branch commit.
 Apparently if you gaze long into an abyss of commits CVS gazes back at
 you.

Directory: /trunk-1.8/epan/
  Changes    Path           Action
  +22 -14    Makefile.am    Modified

Directory: /trunk-1.8/tools/
  Changes    Path                   Action
  +14 -6     git-compare-abis.sh    Modified

Directory: /trunk-1.8/wiretap/
  Changes    Path           Action
  +7 -5      Makefile.am    Modified

Directory: /trunk-1.8/wsutil/
  Changes    Path           Action
  +7 -5      Makefile.am    Modified