[systemtap/f18: 49/49] Merge branch 'f19' into f18

[fche]

commit aab7184036329f4ba2916dc2e4a1367bcaa475d4
Merge: 123d9b4 4c09063
Author: Frank Ch. Eigler <fche at redhat.com>
Date:   Tue May 14 12:41:37 2013 -0400

    Merge branch 'f19' into f18
    
    * f19: (46 commits)
      systemtap 2.2 release
      Automated weekly systemtap rawhide release: 0.125.ga88f5ee, disable publican
      Turned off doc generation until BZ920216 resolved
      Added stap-prep.1 man page
      BZ926602 Updated autoconf to version 2.69
      Automated weekly systemtap rawhide release: 0.94.g48bf64d
      Automated weekly systemtap rawhide release: 0.84.g74fc0fe
      Automated weekly systemtap rawhide release: 0.84.g74fc0fe
      Automated weekly systemtap rawhide release: 0.74.gb1e0e10
      Automated weekly systemtap rawhide release: 0.70.g23c2c25
      Automated weekly systemtap rawhide release: 0.68.g8d23893
      Automated weekly systemtap rawhide release: 0.54.g2cc83f4
      Automated weekly systemtap rawhide release: 0.53.g019e44d
      Update version number to 2.2 for weekly rawhide release: 0.38.g65fef87.1
      Automated weekly systemtap rawhide release: 0.38.g65fef87
      Automated weekly systemtap rawhide release: 0.385.gab733d5
      Automated weekly systemtap rawhide release: 0.354.g75c7136
      Automated weekly systemtap rawhide release: 0.353.g43e1259
      Automated weekly systemtap rawhide release: 0.280.gbddba05
      systemtap.spec: merge/tweak systemd conditionals from systemtap git
      ...
    
    Conflicts:
    	systemtap.spec

 .gitignore     |   34 +++++++++
 sources        |    2 +-
 systemtap.spec |  208 ++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 171 insertions(+), 73 deletions(-)
---
diff --cc systemtap.spec
index 8e25a6a,3b6a1a5..b2e1aae
--- a/systemtap.spec
+++ b/systemtap.spec
@@@ -702,12 -771,9 +779,15 @@@ don
  # ------------------------------------------------------------------------
  
  %changelog
+ * Tue May 14 2013 Frank Ch. Eigler <fche at redhat.com> - 2.2-1
+ - Upstream release.
+ 
 +* Tue Apr 09 2013 Josh Stone <jistone at redhat.com> 2.1-3
 +- Rebuild for Dyninst 8.1.
 +
 +* Tue Mar 05 2013 Serguei Makarov <smakarov at redhat.com> - 2.1-2
 +- Backported fixes for -mfentry (pr15148), bz905337
 +
  * Wed Feb 13 2013 Serguei Makarov <smakarov at redhat.com> - 2.1-1
  - Upstream release.