moblin-icon-theme: 0.3 -> 0.7

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.3/configurehack.patch b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.3/configurehack.patch
deleted file mode 100644 (file)
index 35fe605..0000000
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.3/configurehack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: moblin-icon-theme-0.3/configure.ac
-===================================================================
---- moblin-icon-theme-0.3.orig/configure.ac    2009-05-16 17:49:28.000000000 +0100
-+++ moblin-icon-theme-0.3/configure.ac 2009-05-16 17:53:34.000000000 +0100
-@@ -10,20 +10,9 @@
- 
- UTILS_REQUIRED=0.8.7
- 
--AC_MSG_CHECKING([icon-naming-utils >= $UTILS_REQUIRED])
--PKG_CHECK_EXISTS(icon-naming-utils >= $UTILS_REQUIRED,
--                 have_utils=yes, have_utils=no)
--if test "x$have_utils" = "xyes"; then
--   UTILS_PATH="`$PKG_CONFIG --variable=program_path icon-naming-utils`"
--   ICONMAP="$UTILS_PATH/icon-name-mapping"
--   AC_SUBST(ICONMAP)
--   AC_MSG_RESULT([yes])
--else
--   AC_MSG_RESULT([no])
--   AC_MSG_ERROR([icon-naming-utils >= $UTILS_REQUIRED is required to build
--                 and install sato-icon-theme])
--fi
- 
-+AC_PATH_PROG(ICONMAP, icon-name-mapping, icon-name-mapping)
-+AC_SUBST(ICONMAP)
- 
- AC_CONFIG_FILES([
- Makefile

diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.3/moblin-icon-theme-0.3.tar.gz b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.3/moblin-icon-theme-0.3.tar.gz
deleted file mode 100644 (file)
index be5cf88..0000000
Binary files a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.3/moblin-icon-theme-0.3.tar.gz and /dev/null differ

diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.7/moblin-icon-theme-0.7.tar.gz b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.7/moblin-icon-theme-0.7.tar.gz
new file mode 100644 (file)
index 0000000..361e19f
Binary files /dev/null and b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme-0.7/moblin-icon-theme-0.7.tar.gz differ

diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.3.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
similarity index 56%
rename from meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.3.bb
rename to meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
index 80fd22b892bc31db1301d64c91ee3b8b4224ecd1..1a92a082f737f9c76f8241e9618f72ea0c51eb73 100644 (file)
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.3.bb
+++ b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
@@ -1,13 +1,9 @@
 
 SRC_URI = "file://${PN}-${PV}.tar.gz"
-PR = "r1"
+PR = "r0"
 
 DEPENDS = "icon-naming-utils-native"
 
 FILES_${PN} += "${datadir}/icons/"
 
 inherit autotools_stage
-
-do_install_append () {
-       mv "${D}${datadir}/icons/Moblin Netbook" ${D}${datadir}/icons/moblin
-}