diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-10-09 00:35:01 +0800 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-10-08 13:51:29 -0700 |
| commit | 0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc (patch) | |
| tree | 61b040ad38a35fd930ee18329d67350507c4bf93 /meta/recipes-devtools/dpkg/dpkg/noman.patch | |
| parent | c449c78c25eacb17797097377802af291247b8c0 (diff) | |
| download | poky-0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc.tar.gz | |
dpkg: upgrade to version 1.15.8.5
Rebase several patches to fit the latest version
Fix a compile issue related with snprintf.
Reset PR in dpkg.inc
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/noman.patch')
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg/noman.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch index f5984fe14a..d8fc9c45cc 100644 --- a/meta/recipes-devtools/dpkg/dpkg/noman.patch +++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch | |||
| @@ -1,16 +1,13 @@ | |||
| 1 | --- | 1 | diff -ruN dpkg-1.15.8.5-orig/Makefile.am dpkg-1.15.8.5/Makefile.am |
| 2 | Makefile.am | 3 +-- | 2 | --- dpkg-1.15.8.5-orig/Makefile.am 2010-10-08 12:27:15.042083703 +0800 |
| 3 | 1 file changed, 1 insertion(+), 2 deletions(-) | 3 | +++ dpkg-1.15.8.5/Makefile.am 2010-10-08 12:27:27.755148228 +0800 |
| 4 | 4 | @@ -12,8 +12,7 @@ | |
| 5 | --- dpkg-1.13.22.orig/Makefile.am | ||
| 6 | +++ dpkg-1.13.22/Makefile.am | ||
| 7 | @@ -15,8 +15,7 @@ SUBDIRS = \ | ||
| 8 | utils \ | 5 | utils \ |
| 6 | $(MAYBE_DSELECT) \ | ||
| 9 | scripts \ | 7 | scripts \ |
| 10 | po \ | 8 | - po \ |
| 11 | - origins \ | ||
| 12 | - man | 9 | - man |
| 13 | + origins | 10 | + po |
| 14 | 11 | ||
| 15 | ACLOCAL_AMFLAGS = -I m4 | 12 | ACLOCAL_AMFLAGS = -I m4 |
| 16 | 13 | ||