summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2011-01-25 02:26:15 +0000
committerJeroen Roovers <jer@gentoo.org>2011-01-25 02:26:15 +0000
commit11e98fd9fb56d141181d341476eb3619b00033cf (patch)
tree71d601f69c5c99d7a879316c7238b3c4153d2ae8 /app-arch/dpkg
parentAdd src_test() to ensure the tests are run - make check does not do that. (diff)
downloadhistorical-11e98fd9fb56d141181d341476eb3619b00033cf.tar.gz
historical-11e98fd9fb56d141181d341476eb3619b00033cf.tar.bz2
historical-11e98fd9fb56d141181d341476eb3619b00033cf.zip
Clean up patch.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686
Diffstat (limited to 'app-arch/dpkg')
-rw-r--r--app-arch/dpkg/ChangeLog6
-rw-r--r--app-arch/dpkg/Manifest4
-rw-r--r--app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch10
3 files changed, 11 insertions, 9 deletions
diff --git a/app-arch/dpkg/ChangeLog b/app-arch/dpkg/ChangeLog
index fb498ad5de98..25320a7e6418 100644
--- a/app-arch/dpkg/ChangeLog
+++ b/app-arch/dpkg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-arch/dpkg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.149 2011/01/08 18:55:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/ChangeLog,v 1.150 2011/01/25 02:26:15 jer Exp $
+
+ 25 Jan 2011; Jeroen Roovers <jer@gentoo.org>
+ files/dpkg-1.15.5.6-bootstrap.patch:
+ Clean up patch.
08 Jan 2011; Jeroen Roovers <jer@gentoo.org> dpkg-1.15.8.8.ebuild:
Stable for HPPA (bug #350877).
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index 8dfde99aa2df..e6ffbd6216ac 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -1,5 +1,5 @@
-AUX dpkg-1.15.5.6-bootstrap.patch 1067 RMD160 9fe0761df7192424a5fb28de81761f478219e5fb SHA1 ec90b81e0bbf078e95732229afac5fd0943f3b38 SHA256 4144c9a1ae1d157c09418106f0f84a61251e3564f3a90cbe0506db669992646c
+AUX dpkg-1.15.5.6-bootstrap.patch 853 RMD160 b6e73361f662971730b2078afbe9ca2b679680a1 SHA1 4266da38c786a3a7d5111a35bb2fb5f0c8656cf6 SHA256 05ed4c2b265556767820fdf31ea9bf0da09eaafae1e39b75d634be385f05ab13
DIST dpkg_1.15.8.8.tar.bz2 5266200 RMD160 c22d064c86f472377d78402bbc472989cda5e5c5 SHA1 eb15f16714dfab4bdacc092261088f9fc13cc6d7 SHA256 cc9f699abf95848c4e5e3c236e7bef5af01afec63fd1fb9fc88a01af6a98f3c5
EBUILD dpkg-1.15.8.8.ebuild 2519 RMD160 8a2c0ced8a4a6ad023eafa5d152827813b0dc25a SHA1 68d7fb41784b6309a83fe179e14c90672cc0f7a5 SHA256 eca90b7c08f71aaf7036af43c84e640bca028ee989fafe8513ff9d05878d4476
-MISC ChangeLog 20354 RMD160 ed50bac40056cadaf609003b0a55030b4fc6441b SHA1 f9f3e1da2966973f85fcb1ef4840c1e15a2a7e42 SHA256 40f6a60871b034273f4217028c377856487b8f93072bc442fc2389b470edffdb
+MISC ChangeLog 20459 RMD160 0d3a8a8fe917276528c0597523c7de4712bbd3af SHA1 5970fb6cafd1cf604e67926f7d26159a410f2769 SHA256 e4066d5524f45f2bb54a92a3ce46b1278113129ca75a4ecbf9746658bc426d3a
MISC metadata.xml 249 RMD160 91de35e671db35d8e1c3fe50177b6ec889466712 SHA1 d6956b17015162642aa95088fc3abbaee87d69d3 SHA256 d6077d4b746902b16a584be1c22f32bd2f88f2f5eff566ba8fb7b0b78a6827b7
diff --git a/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch b/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch
index a29cca17b71d..dd5cbf1f8292 100644
--- a/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch
+++ b/app-arch/dpkg/files/dpkg-1.15.5.6-bootstrap.patch
@@ -1,6 +1,5 @@
-diff -Nur dpkg-1.15.5.6.org/m4/dpkg-arch.m4 dpkg-1.15.5.6/m4/dpkg-arch.m4
---- dpkg-1.15.5.6.org/m4/dpkg-arch.m4 2010-01-08 18:23:06.000000000 +0100
-+++ dpkg-1.15.5.6/m4/dpkg-arch.m4 2010-02-05 08:13:09.000000000 +0100
+--- a/m4/dpkg-arch.m4 2010-01-08 18:23:06.000000000 +0100
++++ b/m4/dpkg-arch.m4 2010-02-05 08:13:09.000000000 +0100
@@ -5,7 +5,7 @@
AC_DEFUN([_DPKG_ARCHITECTURE], [
AC_REQUIRE([AC_CANONICAL_HOST])dnl
@@ -10,9 +9,8 @@ diff -Nur dpkg-1.15.5.6.org/m4/dpkg-arch.m4 dpkg-1.15.5.6/m4/dpkg-arch.m4
])# _DPKG_ARCHITECURE
# DPKG_CPU_TYPE
-diff -Nur dpkg-1.15.5.6.org/scripts/Dpkg/Arch.pm dpkg-1.15.5.6/scripts/Dpkg/Arch.pm
---- dpkg-1.15.5.6.org/scripts/Dpkg/Arch.pm 2010-01-08 09:00:34.000000000 +0100
-+++ dpkg-1.15.5.6/scripts/Dpkg/Arch.pm 2010-02-05 08:49:42.000000000 +0100
+--- a/scripts/Dpkg/Arch.pm 2010-01-08 09:00:34.000000000 +0100
++++ b/scripts/Dpkg/Arch.pm 2010-02-05 08:49:42.000000000 +0100
@@ -47,8 +47,7 @@
return $build_arch if defined $build_arch;