[lttng-tools/f19: 8/8] Merge branch 'master' into f19

[Yannick Brosseau]

commit 368e97696d4fffc1224739b29d4ff4c275964d80
Merge: 3ca0b6f a9d92b4
Author: Yannick Brosseau <yannick.brosseau at gmail.com>
Date:   Mon Oct 7 16:33:18 2013 -0400

    Merge branch 'master' into f19
    
    Update to 2.3.0

 .gitignore       |    4 ++++
 lttng-tools.spec |   18 ++++++++++++++----
 sources          |    2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index 788a289,ed798b7..988e137
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,7 +1,8 @@@
  /lttng-tools-2.0.3.tar.bz2
  /lttng-tools-2.0.4.tar.bz2
  /lttng-tools-2.1.1.tar.bz2
 +/lttng-tools-2.1.2.tar.bz2
+ /lttng-tools-2.2.1.tar.bz2
+ /lttng-tools-2.2.2.tar.bz2
+ /lttng-tools-2.2.3.tar.bz2
+ /lttng-tools-2.3.0.tar.bz2
diff --cc lttng-tools.spec
index 425e72c,13c1f87..44f92aa
--- a/lttng-tools.spec
+++ b/lttng-tools.spec
@@@ -94,10 -97,26 +97,17 @@@ exit 
  %files -n %{name}-devel
  %{_prefix}/include/lttng/*
  %{_libdir}/*.so
+ %{_libdir}/pkgconfig/lttng-ctl.pc
  
  %changelog
+ * Tue Sep 24 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.3.0-2
+ - Disable hardening flags on arm, since it does not build with them
+ 
+ * Fri Sep 20 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.3.0-1
+ - New upstream release
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.3-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Tue Jul 23 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.2.3-1
 -- New upstream bugfix version
 -
 -* Mon Jul 22 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.2.2-1
 -- New upstream bugfix version
 -
 -* Tue Jul 16 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.2.1-1
 -- New upstream version
 +* Mon Jul 22 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.1.2-1
 +- New upstream bugfix release
  
  * Fri May 17 2013 Yannick Brosseau <yannick.brosseau at gmail.com> - 2.1.1-2
  - Add hardening option (#955452)