[humanity-icon-theme/f16] Update to 0.6

[Mohamed ElMorabity]

commit 80abafe36769692c29899f6ef120a8b014e7bbc6
Author: Mohamed El Morabity <melmorabity at fedorapeople.org>
Date:   Fri Sep 21 02:50:06 2012 +0200

    Update to 0.6

 .gitignore                              |    5 +++++
 humanity-icon-theme-generate-tarball.sh |   10 ++++++++++
 humanity-icon-theme.spec                |   10 +++++-----
 sources                                 |    4 ++++
 4 files changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f420f72..5c0be35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,6 @@
 /humanity-icon-theme-0.5.3.11-without-logos.tar.bz2
+<<<<<<< HEAD
+=======
+/humanity-icon-theme-0.5.3.12-without-logos.tar.xz
+/humanity-icon-theme-0.6-without-logos.tar.xz
+>>>>>>> fca5416... Update to 0.6
diff --git a/humanity-icon-theme-generate-tarball.sh b/humanity-icon-theme-generate-tarball.sh
index 91b670c..c7ef883 100644
--- a/humanity-icon-theme-generate-tarball.sh
+++ b/humanity-icon-theme-generate-tarball.sh
@@ -12,11 +12,21 @@ find humanity-icon-theme/               \
         -name "distributor-logo.*"      \
      -o -name "*dropbox*.*"             \
      -o -name "drive-harddisk-system.*" \
+     -o -name "folder-ubuntu.*"         \
      -o -name "gnome-main-menu.*"       \
      -o -name "novell-button.*"         \
      -o -name "start-here.*"            \
      -o -name "ubiquity.*"              \
+<<<<<<< HEAD
      -o -name "*ubuntu*.*"              \
      -o -name "usb-creator*.*"          \
   \) -delete
 tar -cjf humanity-icon-theme-$VERSION-without-logos.tar.bz2 humanity-icon-theme/
+=======
+     -o -name "usb-creator*.*"          \
+  \) -delete
+# Delete dead icon symlinks
+find -L $FOLDER/ -type l -delete
+tar -cJf $PURGED_ARCHIVE $FOLDER/
+rm -r $FOLDER
+>>>>>>> fca5416... Update to 0.6
diff --git a/humanity-icon-theme.spec b/humanity-icon-theme.spec
index 53c377f..b03e089 100644
--- a/humanity-icon-theme.spec
+++ b/humanity-icon-theme.spec
@@ -1,6 +1,6 @@
 Name:           humanity-icon-theme
-Version:        0.5.3.11
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Humanity icon theme
 
 Group:          User Interface/Desktops
@@ -24,9 +24,6 @@ desktop.
 %prep
 %setup -q -n %{name}
 
-# Delete dead icon symlinks
-find -L . -type l -delete
-
 
 %build
 
@@ -67,6 +64,9 @@ fi
 
 
 %changelog
+* Fri Sep 21 2012 Mohamed El Morabity <melmorabity at fedorapeople.org> - 0.6-1
+- Update to 0.6
+
 * Tue Oct 11 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 0.5.3.11-2
 - Repack source to remove copyrighted Ubuntu logos
 - Remove dependency on fedora-logos
diff --git a/sources b/sources
index ceffcd6..4fbf39c 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 280ab8f9394080e9f704786c9af0316c  humanity-icon-theme-0.5.3.11-without-logos.tar.bz2
+=======
+aeb0c7e526f42c29c30335b7d056f034  humanity-icon-theme-0.6-without-logos.tar.xz
+>>>>>>> fca5416... Update to 0.6