From 03837afa1081d3bdfdb7081b51f836d2ce25e815 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 21 Jun 2010 02:30:37 -0700 Subject: intltool: upgrade from 0.40.5 to 0.40.6 Signed-off-by: Nitin A Kamble --- .../intltool-0.40.5/intltool-nowarn-0.40.0.patch | 50 ---------------------- .../intltool-0.40.6/intltool-nowarn-0.40.0.patch | 50 ++++++++++++++++++++++ meta/packages/intltool/intltool.inc | 2 - meta/packages/intltool/intltool_0.40.5.bb | 3 -- meta/packages/intltool/intltool_0.40.6.bb | 5 +++ 5 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 meta/packages/intltool/intltool-0.40.5/intltool-nowarn-0.40.0.patch create mode 100644 meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch delete mode 100644 meta/packages/intltool/intltool_0.40.5.bb create mode 100644 meta/packages/intltool/intltool_0.40.6.bb (limited to 'meta') diff --git a/meta/packages/intltool/intltool-0.40.5/intltool-nowarn-0.40.0.patch b/meta/packages/intltool/intltool-0.40.5/intltool-nowarn-0.40.0.patch deleted file mode 100644 index 61ecba266..000000000 --- a/meta/packages/intltool/intltool-0.40.5/intltool-nowarn-0.40.0.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: intltool-0.40.0/intltool-extract.in -=================================================================== ---- intltool-0.40.0.orig/intltool-extract.in 2008-12-17 11:50:19.000000000 +0000 -+++ intltool-0.40.0/intltool-extract.in 2008-12-17 11:50:31.000000000 +0000 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # -Index: intltool-0.40.0/intltool-merge.in -=================================================================== ---- intltool-0.40.0.orig/intltool-merge.in 2008-12-17 11:50:19.000000000 +0000 -+++ intltool-0.40.0/intltool-merge.in 2008-12-17 11:50:38.000000000 +0000 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # -Index: intltool-0.40.0/intltool-prepare.in -=================================================================== ---- intltool-0.40.0.orig/intltool-prepare.in 2008-12-17 11:50:19.000000000 +0000 -+++ intltool-0.40.0/intltool-prepare.in 2008-12-17 11:50:42.000000000 +0000 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # Intltool .desktop, .directory Prepare Tool -Index: intltool-0.40.0/intltool-unicodify.in -=================================================================== ---- intltool-0.40.0.orig/intltool-unicodify.in 2008-12-17 11:50:19.000000000 +0000 -+++ intltool-0.40.0/intltool-unicodify.in 2008-12-17 11:50:46.000000000 +0000 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - - # - # The i18n Unicode Encoding Utility -Index: intltool-0.40.0/intltool-update.in -=================================================================== ---- intltool-0.40.0.orig/intltool-update.in 2008-12-17 11:50:19.000000000 +0000 -+++ intltool-0.40.0/intltool-update.in 2008-12-17 11:50:49.000000000 +0000 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # diff --git a/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch b/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch new file mode 100644 index 000000000..61ecba266 --- /dev/null +++ b/meta/packages/intltool/intltool-0.40.6/intltool-nowarn-0.40.0.patch @@ -0,0 +1,50 @@ +Index: intltool-0.40.0/intltool-extract.in +=================================================================== +--- intltool-0.40.0.orig/intltool-extract.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-extract.in 2008-12-17 11:50:31.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.40.0/intltool-merge.in +=================================================================== +--- intltool-0.40.0.orig/intltool-merge.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-merge.in 2008-12-17 11:50:38.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +Index: intltool-0.40.0/intltool-prepare.in +=================================================================== +--- intltool-0.40.0.orig/intltool-prepare.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-prepare.in 2008-12-17 11:50:42.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # Intltool .desktop, .directory Prepare Tool +Index: intltool-0.40.0/intltool-unicodify.in +=================================================================== +--- intltool-0.40.0.orig/intltool-unicodify.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-unicodify.in 2008-12-17 11:50:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + + # + # The i18n Unicode Encoding Utility +Index: intltool-0.40.0/intltool-update.in +=================================================================== +--- intltool-0.40.0.orig/intltool-update.in 2008-12-17 11:50:19.000000000 +0000 ++++ intltool-0.40.0/intltool-update.in 2008-12-17 11:50:49.000000000 +0000 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # diff --git a/meta/packages/intltool/intltool.inc b/meta/packages/intltool/intltool.inc index 132c264b3..f9bdf93b7 100644 --- a/meta/packages/intltool/intltool.inc +++ b/meta/packages/intltool/intltool.inc @@ -7,8 +7,6 @@ URLV="${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" SRC_URI = "${GNOME_MIRROR}/intltool/${URLV}/intltool-${PV}.tar.bz2" S = "${WORKDIR}/intltool-${PV}" -PR = "r3" - DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" RRECOMMENDS = "perl-modules" diff --git a/meta/packages/intltool/intltool_0.40.5.bb b/meta/packages/intltool/intltool_0.40.5.bb deleted file mode 100644 index fe700f21e..000000000 --- a/meta/packages/intltool/intltool_0.40.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require intltool.inc - -SRC_URI_append = " file://intltool-nowarn-0.40.0.patch;patch=1" diff --git a/meta/packages/intltool/intltool_0.40.6.bb b/meta/packages/intltool/intltool_0.40.6.bb new file mode 100644 index 000000000..1f23a41f8 --- /dev/null +++ b/meta/packages/intltool/intltool_0.40.6.bb @@ -0,0 +1,5 @@ +require intltool.inc + +PR = "r0" + +SRC_URI_append = " file://intltool-nowarn-0.40.0.patch" -- cgit v1.2.3