[R-AnnotationDbi/f14] Merge to master

[Pierre-YvesChibon]

commit 525d1fae377d8edf697418799d6ac1a78c9a1e05
Author: Pierre-Yves Chibon py at chibon.fr <pingou at pingoured.fr>
Date:   Thu Jun 30 09:59:47 2011 +0200

    Merge to master

 .gitignore           |    3 +--
 R-AnnotationDbi.spec |   11 ++++++++++-
 sources              |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 23b33f6..e96f6f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-AnnotationDbi_1.10.1.tar.gz
-/AnnotationDbi_1.10.2.tar.gz
+/AnnotationDbi_1.14.1.tar.gz
diff --git a/R-AnnotationDbi.spec b/R-AnnotationDbi.spec
index 4df23e8..6a0b8e1 100644
--- a/R-AnnotationDbi.spec
+++ b/R-AnnotationDbi.spec
@@ -2,7 +2,7 @@
 %global Rvers     2.11.0
 
 Name:             R-%{packname}
-Version:          1.10.2
+Version:          1.14.1
 Release:          1%{dist}
 Summary:          Annotation Database Interface
 
@@ -73,6 +73,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 22 2011 pingou <pingou at pingoured.fr> 1.14.1-1
+- Update to version 1.14.1
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Oct 26 2010 pingou <pingou at pingoured.fr> 1.12.0-1
+- Update to version 1.12.0
+
 * Sat Sep 11 2010 pingou <pingou at pingoured.fr> 1.10.2-1
 - Update to version 1.10.2
 
diff --git a/sources b/sources
index 10f80ef..b26ce9c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c70abdedf2e994b3026398e545927eb6  AnnotationDbi_1.10.2.tar.gz
+8549eb5debb0bc0e403d106bcf297831  AnnotationDbi_1.14.1.tar.gz