diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2013-06-01 17:45:29 -0500 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2013-06-01 17:45:29 -0500 |
| commit | 6267268090d5c23664a5b13dfe02eb3594d5e5db (patch) | |
| tree | 1a33bb4d971b4cc4f4013e8fa847479e2e312d57 /main | |
| parent | 6e8d8f7559a5bcde7f49af5c9944fa642ad77fa2 (diff) | |
| download | aports-6267268090d5c23664a5b13dfe02eb3594d5e5db.tar.bz2 aports-6267268090d5c23664a5b13dfe02eb3594d5e5db.tar.xz | |
main/xen: rebase pod2man patch properly
Diffstat (limited to 'main')
| -rw-r--r-- | main/xen/APKBUILD | 6 | ||||
| -rw-r--r-- | main/xen/fix-pod2man-choking.patch | 11 |
2 files changed, 3 insertions, 14 deletions
diff --git a/main/xen/APKBUILD b/main/xen/APKBUILD index 9407f67227..0a972ff837 100644 --- a/main/xen/APKBUILD +++ b/main/xen/APKBUILD @@ -150,7 +150,7 @@ ed7d0399c6ca6aeee479da5d8f807fe0 xsa41b.patch 2f3dd7bdc59d104370066d6582725575 xsa41c.patch b3e3a57d189a4f86c9766eaf3b5207f4 xsa48-4.2.patch e70b9128ffc2175cea314a533a7d8457 xsa56.patch -dc1c1d28cbf5469e6edebf343ce21cb1 fix-pod2man-choking.patch +c1d1a415415b0192e5dae9032962bf61 fix-pod2man-choking.patch 95d8af17bf844d41a015ff32aae51ba1 xenstored.initd b017ccdd5e1c27bbf1513e3569d4ff07 xenstored.confd ed262f15fb880badb53575539468646c xenconsoled.initd @@ -172,7 +172,7 @@ a0c225d716d343fe041b63e3940900c5b3573ed3bcfc5b7c2d52ea2861c3fc28 docs-Fix-gener 683dd96a0a8899f794070c8c09643dfeeb39f92da531955cba961b45f6075914 xsa41c.patch dc23077028584e71a08dd0dc9e81552c76744a5ce9d39df5958a95ae9cf3107b xsa48-4.2.patch a691c5f5332a42c0d38ddb4dc037eb902f01ba31033b64c47d02909a8de0257d xsa56.patch -48b47a3aed56fa04913379fcf2a2d833bfc061cf3505ef1eb3559635c8c8722e fix-pod2man-choking.patch +b4e7d43364a06b2cb04527db3e9567524bc489fef475709fd8493ebf1e62406d fix-pod2man-choking.patch 81d335946c81311c86e2f2112b773a568a5a530c0db9802b2fe559e71bb8b381 xenstored.initd ea9171e71ab3d33061979bcf3bb737156192aa4b0be4d1234438ced75b6fdef3 xenstored.confd 93bea2eb90ea1b4628854c8141dd351bbd1fbc5959b12795447ea933ad025f01 xenconsoled.initd @@ -194,7 +194,7 @@ bda9105793f2327e1317991762120d0668af0e964076b18c9fdbfd509984b2e88d85df95702c46b2 36b60478660ff7748328f5ab9adff13286eee1a1bad06e42fdf7e6aafe105103988525725aacd660cf5b2a184a9e2d6b3818655203c1fa07e07dcebdf23f35d9 xsa41c.patch 31dd8c62d41cc0a01a79d9b24a5b793f5e2058230808d9c5364c6ff3477ab02f3258f1bbd761d97dc1b97ee120b41524b999eaac77f33b606496fc324b5fa2e4 xsa48-4.2.patch 26a1c2cc92ddd4c1ab6712b0e41a0135d0e76a7fe3a14b651fb0235e352e5a24077414371acccb93058b7ce4d882b667386811170ba74570c53165837bcd983d xsa56.patch -133af8806470abb1687ad6f2a3e6104ec2742894de7f1dfa0e58c2fd192e1ff41737792d5d01562cdeefc35b3cb5f291f2da6c7b93cf6764682919d71b0b284d fix-pod2man-choking.patch +ffb1113fcec0853b690c177655c7d1136388efdebf0d7f625b80481b98eadd3e9ef461442ced53e11acf0e347800a2b0a41e18b05065b5d04bffdd8a4e127cec fix-pod2man-choking.patch 792b062e8a16a2efd3cb4662d379d1500527f2a7ca9228d7831c2bd34f3b9141df949153ea05463a7758c3e3dd9a4182492ad5505fa38e298ecf8c99db77b4ee xenstored.initd 100cf4112f401f45c1e4e885a5074698c484b40521262f6268fad286498e95f4c51e746f0e94eb43a590bb8e813a397bb53801ccacebec9541020799d8d70514 xenstored.confd 12f981b2459c65d66e67ec0b32d0d19b95a029bc54c2a79138cfe488d3524a22e51860f755abfe25ddcdaf1b27f2ded59b6e350b9d5f8791193d00e2d3673137 xenconsoled.initd diff --git a/main/xen/fix-pod2man-choking.patch b/main/xen/fix-pod2man-choking.patch index 1c030a69f0..c4a4ac6a25 100644 --- a/main/xen/fix-pod2man-choking.patch +++ b/main/xen/fix-pod2man-choking.patch @@ -9,17 +9,6 @@ Note that, by default, GUS shares IRQ(7) with parallel ports and so qemu must be told to not have parallel ports to have working GUS ---- xen-4.2.2.orig/docs/man/xl.pod.1 -+++ xen-4.2.2/docs/man/xl.pod.1 -@@ -851,8 +851,6 @@ - - =item B<-p [pool] -d>... : Illegal - --=item -- - =back - - =item B<sched-credit2> [I<OPTIONS>] --- xen-4.2.2.orig/docs/man/xl.cfg.pod.5 +++ xen-4.2.2/docs/man/xl.cfg.pod.5 @@ -402,10 +402,10 @@ |