merge of '132be09ee353f798eadc984f8f09e27e68180850'

     and 'c0e1d74b2a331789caaf72b458b57924d21c7da3'

11 files changed, 11 insertions, 11 deletions

diff --git a/packages/cairo/cairo_1.2.2.bb b/packages/cairo/cairo_1.2.2.bb
index 762ee405b4..f6667eae1b 100644
--- a/packages/cairo/cairo_1.2.2.bb
+++ b/packages/cairo/cairo_1.2.2.bb
@@ -6,7 +6,7 @@ LICENSE = "MPL LGPL"
 
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 autotools_stage_all
diff --git a/packages/cairo/cairo_1.2.4.bb b/packages/cairo/cairo_1.2.4.bb
index f23e376d1c..e274387195 100644
--- a/packages/cairo/cairo_1.2.4.bb
+++ b/packages/cairo/cairo_1.2.4.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://0002-Change-_cairo_fixed_from_double-to-use-the-magic-number-technique.diff;patch=1 \
   	   "
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/cairo_1.3.4.bb b/packages/cairo/cairo_1.3.4.bb
index 6d9a7c43ab..19e3f7a872 100644
--- a/packages/cairo/cairo_1.3.4.bb
+++ b/packages/cairo/cairo_1.3.4.bb
@@ -10,7 +10,7 @@ LICENSE = "MPL LGPL"
 SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \
            file://configure.in_requires_pkg-config-0.15.diff;patch=1;pnum=2"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
  	autotools_stage_all
diff --git a/packages/cairo/cairo_git.bb b/packages/cairo/cairo_git.bb
index 9d11c2685f..55bdc019f0 100644
--- a/packages/cairo/cairo_git.bb
+++ b/packages/cairo/cairo_git.bb
@@ -11,7 +11,7 @@ PV = "1.3.11+git${SRCDATE}"
 
 SRC_URI = "git://git.cairographics.org/git/cairo;protocol=git \
 	  "
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 S = "${WORKDIR}/git"
 
diff --git a/packages/cairo/libsvg-cairo_0.1.5.bb b/packages/cairo/libsvg-cairo_0.1.5.bb
index 438a630064..9cee27bf29 100644
--- a/packages/cairo/libsvg-cairo_0.1.5.bb
+++ b/packages/cairo/libsvg-cairo_0.1.5.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SVG rendering library"
 
 SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/cairo/libsvg-cairo_0.1.6.bb b/packages/cairo/libsvg-cairo_0.1.6.bb
index 438a630064..9cee27bf29 100644
--- a/packages/cairo/libsvg-cairo_0.1.6.bb
+++ b/packages/cairo/libsvg-cairo_0.1.6.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "SVG rendering library"
 
 SRC_URI = "http://cairographics.org/snapshots/libsvg-cairo-${PV}.tar.gz"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
diff --git a/packages/cairo/libsvg-cairo_20050601.bb b/packages/cairo/libsvg-cairo_20050601.bb
index 7a1f35135a..55e439a3c5 100644
--- a/packages/cairo/libsvg-cairo_20050601.bb
+++ b/packages/cairo/libsvg-cairo_20050601.bb
@@ -10,7 +10,7 @@ DEFAULT_PREFERENCE = "1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo;date=${FIXEDSRCDATE}"
 S = "${WORKDIR}/libsvg-cairo"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/libsvg-cairo_cvs.bb b/packages/cairo/libsvg-cairo_cvs.bb
index a90447a1df..6f9111e31b 100644
--- a/packages/cairo/libsvg-cairo_cvs.bb
+++ b/packages/cairo/libsvg-cairo_cvs.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg-cairo"
 S = "${WORKDIR}/libsvg-cairo"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/libsvg_0.1.4.bb b/packages/cairo/libsvg_0.1.4.bb
index 730f427c08..21127b77ff 100644
--- a/packages/cairo/libsvg_0.1.4.bb
+++ b/packages/cairo/libsvg_0.1.4.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://cairographics.org/snapshots/libsvg-${PV}.tar.gz \
 
 EXTRA_OECONF = "--with-expat"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index 2f4bd8aaad..95b360c041 100644
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -10,7 +10,7 @@ PR = "r2"
 
 EXTRA_OECONF = "--with-expat"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	autotools_stage_all
diff --git a/packages/cairo/xsvg_cvs.bb b/packages/cairo/xsvg_cvs.bb
index 89677d01fc..8f4f4bfdc4 100644
--- a/packages/cairo/xsvg_cvs.bb
+++ b/packages/cairo/xsvg_cvs.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/xsvg"
 # FIXME: add xcursor
 BROKEN = "1"
 
-inherit autotools pkgconfig 
+inherit autotools pkgconfig
 
 do_stage () {
 	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}