diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-19 15:16:11 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-10-23 20:53:48 +0200 |
| commit | c2be672c98b4e4438118c8927729f4944a52204b (patch) | |
| tree | cfa57f5180a7e6bc7c1188032ecaedb254c0afa3 /packages/dpkg/files | |
| parent | 98a50445aa93280e3aa11bcc1b312ca5a21df807 (diff) | |
dpkg: upgrade to 1.14.19 (from Poky)
git-svn-id: https://svn.o-hand.com/repos/poky@4709 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'packages/dpkg/files')
| -rw-r--r-- | packages/dpkg/files/ignore_extra_fields.patch | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/packages/dpkg/files/ignore_extra_fields.patch b/packages/dpkg/files/ignore_extra_fields.patch index 43878463e9..d09343c6e5 100644 --- a/packages/dpkg/files/ignore_extra_fields.patch +++ b/packages/dpkg/files/ignore_extra_fields.patch @@ -1,16 +1,19 @@ dpkg-deb/build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: dpkg-1.13.22/dpkg-deb/build.c -=================================================================== ---- dpkg-1.13.22.orig/dpkg-deb/build.c 2006-05-19 23:11:08.000000000 +0100 -+++ dpkg-1.13.22/dpkg-deb/build.c 2006-11-17 14:43:20.000000000 +0000 -@@ -220,11 +220,11 @@ void do_build(const char *const *argv) { +--- dpkg-1.14.19.orig/dpkg-deb/build.c ++++ dpkg-1.14.19/dpkg-deb/build.c +@@ -241,18 +241,18 @@ void do_build(const char *const *argv) { + if (checkedinfo->priority == pri_other) { + fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"), controlfile, checkedinfo->otherpriority); warns++; } - for (field= checkedinfo->available.arbs; field; field= field->next) { + /*for (field= checkedinfo->available.arbs; field; field= field->next) { + if (known_arbitrary_field(field)) + continue; + fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), controlfile, field->name); warns++; @@ -19,3 +22,5 @@ Index: dpkg-1.13.22/dpkg-deb/build.c checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); if (errs) ohshit(_("%d errors in control file"),errs); + + if (subdir) { |