From 88de83a0dc939217e0f53c43d2bf2b2c09d92d24 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 5 Nov 2009 13:34:02 +0000 Subject: intltool: Drop old version Signed-off-by: Richard Purdie --- .../intltool/files/intltool-nowarn-0.40.0.patch | 50 ---------------------- meta/packages/intltool/files/intltool-nowarn.patch | 40 ----------------- .../intltool-0.40.5/intltool-nowarn-0.40.0.patch | 50 ++++++++++++++++++++++ .../intltool/intltool-0.40.5/intltool-nowarn.patch | 40 +++++++++++++++++ meta/packages/intltool/intltool-native_0.37.1.bb | 11 ----- meta/packages/intltool/intltool_0.37.1.bb | 8 ---- 6 files changed, 90 insertions(+), 109 deletions(-) delete mode 100644 meta/packages/intltool/files/intltool-nowarn-0.40.0.patch delete mode 100644 meta/packages/intltool/files/intltool-nowarn.patch create mode 100644 meta/packages/intltool/intltool-0.40.5/intltool-nowarn-0.40.0.patch create mode 100644 meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch delete mode 100644 meta/packages/intltool/intltool-native_0.37.1.bb delete mode 100644 meta/packages/intltool/intltool_0.37.1.bb (limited to 'meta/packages') diff --git a/meta/packages/intltool/files/intltool-nowarn-0.40.0.patch b/meta/packages/intltool/files/intltool-nowarn-0.40.0.patch deleted file mode 100644 index 61ecba266e..0000000000 --- a/meta/packages/intltool/files/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/files/intltool-nowarn.patch b/meta/packages/intltool/files/intltool-nowarn.patch deleted file mode 100644 index 546db5f119..0000000000 --- a/meta/packages/intltool/files/intltool-nowarn.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- intltool-0.35.0/intltool-extract.in.in.orig 2006-06-16 15:49:14.000000000 -0600 -+++ intltool-0.35.0/intltool-extract.in.in 2006-06-16 15:49:18.000000000 -0600 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # ---- intltool-0.35.0/intltool-merge.in.in.orig 2006-06-16 15:49:18.000000000 -0600 -+++ intltool-0.35.0/intltool-merge.in.in 2006-06-16 15:49:23.000000000 -0600 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # ---- intltool-0.35.0/intltool-prepare.in.orig 2006-06-16 15:49:23.000000000 -0600 -+++ intltool-0.35.0/intltool-prepare.in 2006-06-16 15:49:26.000000000 -0600 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- - - # Intltool .desktop, .directory Prepare Tool ---- intltool-0.35.0/intltool-unicodify.in.orig 2006-06-16 15:49:26.000000000 -0600 -+++ intltool-0.35.0/intltool-unicodify.in 2006-06-16 15:49:30.000000000 -0600 -@@ -1,4 +1,4 @@ --#!@INTLTOOL_PERL@ -w -+#!@INTLTOOL_PERL@ - - # - # The i18n Unicode Encoding Utility ---- intltool-0.35.0/intltool-update.in.in.orig 2006-06-16 15:49:30.000000000 -0600 -+++ intltool-0.35.0/intltool-update.in.in 2006-06-16 15:49:35.000000000 -0600 -@@ -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.5/intltool-nowarn-0.40.0.patch b/meta/packages/intltool/intltool-0.40.5/intltool-nowarn-0.40.0.patch new file mode 100644 index 0000000000..61ecba266e --- /dev/null +++ b/meta/packages/intltool/intltool-0.40.5/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-0.40.5/intltool-nowarn.patch b/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch new file mode 100644 index 0000000000..546db5f119 --- /dev/null +++ b/meta/packages/intltool/intltool-0.40.5/intltool-nowarn.patch @@ -0,0 +1,40 @@ +--- intltool-0.35.0/intltool-extract.in.in.orig 2006-06-16 15:49:14.000000000 -0600 ++++ intltool-0.35.0/intltool-extract.in.in 2006-06-16 15:49:18.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +--- intltool-0.35.0/intltool-merge.in.in.orig 2006-06-16 15:49:18.000000000 -0600 ++++ intltool-0.35.0/intltool-merge.in.in 2006-06-16 15:49:23.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # +--- intltool-0.35.0/intltool-prepare.in.orig 2006-06-16 15:49:23.000000000 -0600 ++++ intltool-0.35.0/intltool-prepare.in 2006-06-16 15:49:26.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*- + + # Intltool .desktop, .directory Prepare Tool +--- intltool-0.35.0/intltool-unicodify.in.orig 2006-06-16 15:49:26.000000000 -0600 ++++ intltool-0.35.0/intltool-unicodify.in 2006-06-16 15:49:30.000000000 -0600 +@@ -1,4 +1,4 @@ +-#!@INTLTOOL_PERL@ -w ++#!@INTLTOOL_PERL@ + + # + # The i18n Unicode Encoding Utility +--- intltool-0.35.0/intltool-update.in.in.orig 2006-06-16 15:49:30.000000000 -0600 ++++ intltool-0.35.0/intltool-update.in.in 2006-06-16 15:49:35.000000000 -0600 +@@ -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-native_0.37.1.bb b/meta/packages/intltool/intltool-native_0.37.1.bb deleted file mode 100644 index 04c433051f..0000000000 --- a/meta/packages/intltool/intltool-native_0.37.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require intltool_${PV}.bb - -PR = "r1" - -inherit native -DEPENDS = "libxml-parser-perl-native" - -export PERL = "/usr/bin/env perl" -SRC_URI_append = " file://intltool-nowarn.patch;patch=1" - -RRECOMMENDS = "" diff --git a/meta/packages/intltool/intltool_0.37.1.bb b/meta/packages/intltool/intltool_0.37.1.bb deleted file mode 100644 index 6626ed54fe..0000000000 --- a/meta/packages/intltool/intltool_0.37.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require intltool.inc - -DEPENDS = "libxml-parser-perl-native" -#RDEPENDS = "libxml-parser-perl" - -PR = "r0" - -RRECOMMENDS = "perl-modules" -- cgit v1.2.3