[OE-core] [PATCH 25/60] avahi: upgrade to 0.6.31

[Shane Wang]

Signed-off-by: Shane Wang <shane.wang at intel.com>
---
 meta/recipes-connectivity/avahi/avahi.inc          |    2 +-
 .../avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb}     |    4 +-
 .../avahi/files/fix_for_automake_1.11.2.patch      |   24 ++++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)
 rename meta/recipes-connectivity/avahi/{avahi_0.6.30.bb => avahi_0.6.31.bb} (80%)

diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 5e29b9c..a710f95 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -14,7 +14,7 @@ SECTION = "network"
 # python scripts are under GPLv2+
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-INC_PR = "r11"
+INC_PR = "r0"
 
 DEPENDS = "expat libcap libdaemon dbus glib-2.0"
 
diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
similarity index 80%
rename from meta/recipes-connectivity/avahi/avahi_0.6.30.bb
rename to meta/recipes-connectivity/avahi/avahi_0.6.31.bb
index 692a5df..bfbe1ba 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.6.30.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.6.31.bb
@@ -12,5 +12,5 @@ DEPENDS += "intltool-native"
 
 PACKAGES =+ "libavahi-gobject"
 
-SRC_URI[md5sum] = "e4db89a2a403ff4c47d66ac66fad1f43"
-SRC_URI[sha256sum] = "f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f"
+SRC_URI[md5sum] = "2f22745b8f7368ad5a0a3fddac343f2d"
+SRC_URI[sha256sum] = "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
diff --git a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
index e7a1908..33938e3 100644
--- a/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
+++ b/meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
@@ -2,7 +2,7 @@ Upstream-Status: Pending
 
 automake version 1.11.2 has made use of dir variables more strict.
 the use of pkglibdir with DATA var results in automake errors.
-  This commits uses pkgdatadir var instead of pkglibdir to avoid 
+  This commits uses pkgdatadir var instead of pkglibdir to avoid
 the strict check errors.
 
 Fixes this error:
@@ -12,32 +12,32 @@ ERROR: autoreconf execution failed.
 
 Signed-Off-By: Nitin A Kamble <nitin.a.kamble at intel.com>
 2011/12/28
+Signed-off-by: Shane Wang <shane.wang at intel.com>
+2012/03/14
 
-
-Index: avahi-0.6.30/service-type-database/Makefile.am
-===================================================================
---- avahi-0.6.30.orig/service-type-database/Makefile.am
-+++ avahi-0.6.30/service-type-database/Makefile.am
-@@ -18,13 +18,12 @@
- EXTRA_DIST=build-db.in service-types
+diff -r b88fdefa6104 service-type-database/Makefile.am
+--- a/service-type-database/Makefile.am	Wed Mar 14 17:16:44 2012 +0800
++++ b/service-type-database/Makefile.am	Wed Mar 14 17:19:20 2012 +0800
+@@ -20,13 +20,12 @@
+ pkglibdatadir=$(libdir)/avahi
  
  pkgdata_DATA=service-types
--pkglib_DATA=
+-pkglibdata_DATA=
  
  if HAVE_PYTHON
  if HAVE_GDBM
  
  noinst_SCRIPTS=build-db
--pkglib_DATA+=service-types.db
+-pkglibdata_DATA+=service-types.db
 +pkgdata_DATA+=service-types.db
  
  build-db: build-db.in
  	$(AM_V_GEN)sed -e 's, at PYTHON\@,$(PYTHON),g' \
-@@ -41,7 +40,7 @@ endif
+@@ -43,7 +42,7 @@
  if HAVE_DBM
  
  noinst_SCRIPTS=build-db
--pkglib_DATA+=service-types.db.pag service-types.db.dir
+-pkglibdata_DATA+=service-types.db.pag service-types.db.dir
 +pkgdata_DATA+=service-types.db.pag service-types.db.dir
  
  build-db: build-db.in
-- 
1.7.6