[gjs: 9/9] Merge commit '91a1ee156251133fb2d628f611cb40c26cee046b'

[Adam Williamson]

commit 5f7847a7f0d8370b193c315efd2bb3c9662a172e
Merge: 2af5412 91a1ee1
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Aug 23 15:21:14 2011 -0700

    Merge commit '91a1ee156251133fb2d628f611cb40c26cee046b'
    
    Conflicts:
    	gjs.spec

 .gitignore               |    2 +
 gjs.spec                 |   22 +++++++--------
 install-gi-headers.patch |   63 ++++++++++++++++++++++++++++++++++++++++++++++
 sources                  |    2 +-
 4 files changed, 76 insertions(+), 13 deletions(-)
---
diff --cc gjs.spec
index c507e80,621399e..e85e53d
--- a/gjs.spec
+++ b/gjs.spec
@@@ -1,8 -1,8 +1,7 @@@
  Name:           gjs
- Version:        1.29.0
- Release:        3%{?dist}
+ Version:        1.29.16
+ Release:        1%{?dist}
  Summary:        Javascript Bindings for GNOME
--
  Group:          System Environment/Libraries
  # The following files contain code from Mozilla which
  # is triple licensed under MPL1.1/LGPLv2+/GPLv2+:
@@@ -84,9 -80,18 +79,12 @@@ find %{buildroot} -name '*.la' -exec r
  %{_libdir}/*.so
  
  %changelog
+ * Thu Aug 18 2011 Matthias Clasen <mclasen at redhat.com> 1.29.16-1
+ - Update to 1.29.16
+ 
 -* Thu Aug 04 2011 Bastien Nocera <bnocera at redhat.com> 1.29.15-3
 -- Install missing headers
 -
 -* Thu Jul 28 2011 Colin Walters <walters at verbum.org> - 1.29.15-2
 +* Thu Jul 28 2011 Colin Walters <walters at verbum.org> - 1.29.0-3
  - BR latest g-i to fix build issue
  
 -* Wed Jul 27 2011 Matthias Clasen <mclasen at redhat.com> - 1.29.15-1
 -- Update to 1.29.15
 -
  * Mon Jun 27 2011 Adam Williamson <awilliam at redhat.com> - 1.29.0-2
  - build against js, not gecko (from f15 branch, but patch not needed)
  - BR cairo-devel (also from f15)