[tango/f14/master] Update to new revision 5543

[MERCIER Jonathan]

commit 751959c104d9518394a295a7b65f7ea6f7334cab
Author: bioinfornatics <bioinfornatics at gmail.com>
Date:   Mon Aug 30 13:09:00 2010 +0200

    Update to new revision 5543

 tango.spec |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)
---
diff --git a/tango.spec b/tango.spec
index 3c48633..5dbc055 100644
--- a/tango.spec
+++ b/tango.spec
@@ -1,15 +1,29 @@
+<<<<<<< HEAD
 %global     alphatag        20100802
 %global     svn_revision    svn5517
+=======
+%global     alphatag        20100826
+%global     svn_revision    svn5543
+>>>>>>> 17560df... add spec file
 %global     debug_package   %{nil}
 
 # The source for this package was pulled from upstream's subversion (svn).
 # Use the following commands to generate the tarball:
+<<<<<<< HEAD
 # svn export -r 5517 http://svn.dsource.org/projects/tango/trunk tango-20100802svn5517
 # tar -cJvf tango-20100802svn5517.tar.xz tango-20100802svn5517
 
 Name:           tango
 Version:        0.99.9
 Release:        15.%{alphatag}%{svn_revision}%{?dist}
+=======
+# svn export -r 5543 http://svn.dsource.org/projects/tango/trunk tango-20100826svn5543
+# tar -cJvf tango-20100826svn5543.tar.xz tango-20100826svn5543
+
+Name:           tango
+Version:        0.99.9
+Release:        19.%{alphatag}%{svn_revision}%{?dist}
+>>>>>>> 17560df... add spec file
 Summary:        The Developer's Library for D
 
 Group:          Development/Libraries
@@ -132,10 +146,17 @@ find . -type f \( -name "*.d" -or -name "*.xml" \) -exec sed -i 's/\r//' {} \;
 %install
 rm -rf      %{buildroot}
 rm -rf      %{name}/core/rt
+<<<<<<< HEAD
 mkdir -p    %{buildroot}%{_d_libdir}/
 mkdir -p    %{buildroot}%{_d_includedir}/%{name}
 
 cp -p ./libtango.a      %{buildroot}%{_d_libdir}/libtango.a
+=======
+mkdir -p    %{buildroot}%{_libdir}/
+mkdir -p    %{buildroot}%{_d_includedir}/%{name}
+
+cp -p ./libtango.a      %{buildroot}%{_libdir}/libtango.a
+>>>>>>> 17560df... add spec file
 cp -rp %{name}/*        %{buildroot}%{_d_includedir}/%{name}/
 cp -rp object.di        %{buildroot}%{_d_includedir}/
 
@@ -145,15 +166,37 @@ rm -rf %{buildroot}
 %files devel
 %defattr(-,root,root,-)
 %doc README.txt LICENSE.txt
+<<<<<<< HEAD
 %{_d_libdir}/libtango.a
+=======
+%{_libdir}/libtango.a
+>>>>>>> 17560df... add spec file
 %{_d_includedir}/%{name}   
 %{_d_includedir}/object.di
 %files doc
 %defattr(-,root,root,-)
+<<<<<<< HEAD
 %doc doc/html
 %doc doc/example
 
 %changelog
+=======
+%doc doc/example
+
+%changelog
+* Thu Aug 26 2010 Jonathan MERCIER <bioinfornatics at gmail.com>  0.99.9-19.20100826svn5543
+- Update to revision 5543
+
+* Sun Aug 22 2010 Jonathan MERCIER <bioinfornatics at gmail.com>  0.99.9-18.20100818svn5529
+- Update to revision 5529
+
+* Wed Aug 11 2010 Jonathan MERCIER <bioinfornatics at gmail.com>  0.99.9-17.20100818svn5525
+- Update to revision 5525
+
+* Wed Aug 11 2010 Jonathan MERCIER <bioinfornatics at gmail.com>  0.99.9-15.20100809svn5519
+- Update to revision 5519
+
+>>>>>>> 17560df... add spec file
 * Tue Aug 03 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.99.9-15.20100802svn5517
 - Update to revision 5517