--- yum-3.2.21.orig/po/yum.pot
+++ yum-3.2.21/po/yum.pot
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-25 11:29+0100\n"
+"POT-Creation-Date: 2009-03-21 06:37+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,23 +16,24 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../callback.py:48 ../output.py:512
+#: ../callback.py:48 ../output.py:911 ../yum/rpmtrans.py:71
 msgid "Updating"
 msgstr ""
 
-#: ../callback.py:49
+#: ../callback.py:49 ../yum/rpmtrans.py:72
 msgid "Erasing"
 msgstr ""
 
-#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:511
+#: ../callback.py:50 ../callback.py:51 ../callback.py:53 ../output.py:910
+#: ../yum/rpmtrans.py:73 ../yum/rpmtrans.py:74 ../yum/rpmtrans.py:76
 msgid "Installing"
 msgstr ""
 
-#: ../callback.py:52 ../callback.py:58
+#: ../callback.py:52 ../callback.py:58 ../yum/rpmtrans.py:75
 msgid "Obsoleted"
 msgstr ""
 
-#: ../callback.py:54 ../output.py:558
+#: ../callback.py:54 ../output.py:1016
 msgid "Updated"
 msgstr ""
 
@@ -40,7 +41,7 @@
 msgid "Erased"
 msgstr ""
 
-#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:556
+#: ../callback.py:56 ../callback.py:57 ../callback.py:59 ../output.py:1014
 msgid "Installed"
 msgstr ""
 
@@ -62,615 +63,710 @@
 msgid "Erased: %s"
 msgstr ""
 
-#: ../callback.py:217 ../output.py:513
+#: ../callback.py:217 ../output.py:912
 msgid "Removing"
 msgstr ""
 
-#: ../callback.py:219
+#: ../callback.py:219 ../yum/rpmtrans.py:77
 msgid "Cleanup"
 msgstr ""
 
-#: ../cli.py:103
+#: ../cli.py:105
 #, python-format
 msgid "Command \"%s\" already defined"
 msgstr ""
 
-#: ../cli.py:115
+#: ../cli.py:117
 msgid "Setting up repositories"
 msgstr ""
 
-#: ../cli.py:126
+#: ../cli.py:128
 msgid "Reading repository metadata in from local files"
 msgstr ""
 
-#: ../cli.py:183 ../utils.py:72
+#: ../cli.py:187 ../utils.py:79
 #, python-format
 msgid "Config Error: %s"
 msgstr ""
 
-#: ../cli.py:186 ../cli.py:1068 ../utils.py:75
+#: ../cli.py:190 ../cli.py:1170 ../utils.py:82
 #, python-format
 msgid "Options Error: %s"
 msgstr ""
 
-#: ../cli.py:229
+#: ../cli.py:218
+#, python-format
+msgid "  Installed: %s-%s at %s"
+msgstr ""
+
+#: ../cli.py:220
+#, python-format
+msgid "  Built    : %s at %s"
+msgstr ""
+
+#: ../cli.py:222
+#, python-format
+msgid "  Committed: %s at %s"
+msgstr ""
+
+#: ../cli.py:259
 msgid "You need to give some command"
 msgstr ""
 
-#: ../cli.py:271
+#: ../cli.py:301
 msgid "Disk Requirements:\n"
 msgstr ""
 
-#: ../cli.py:273
+#: ../cli.py:303
 #, python-format
 msgid "  At least %dMB needed on the %s filesystem.\n"
 msgstr ""
 
 #. TODO: simplify the dependency errors?
 #. Fixup the summary
-#: ../cli.py:278
+#: ../cli.py:308
 msgid ""
 "Error Summary\n"
 "-------------\n"
 msgstr ""
 
-#: ../cli.py:317
+#: ../cli.py:351
 msgid "Trying to run the transaction but nothing to do. Exiting."
 msgstr ""
 
-#: ../cli.py:347
+#: ../cli.py:381
 msgid "Exiting on user Command"
 msgstr ""
 
-#: ../cli.py:351
+#: ../cli.py:385
 msgid "Downloading Packages:"
 msgstr ""
 
-#: ../cli.py:356
+#: ../cli.py:390
 msgid "Error Downloading Packages:\n"
 msgstr ""
 
-#: ../cli.py:370 ../yum/__init__.py:2746
+#: ../cli.py:404 ../yum/__init__.py:3339
 msgid "Running rpm_check_debug"
 msgstr ""
 
-#: ../cli.py:373 ../yum/__init__.py:2749
+#: ../cli.py:407 ../yum/__init__.py:3342
 msgid "ERROR with rpm_check_debug vs depsolve:"
 msgstr ""
 
-#: ../cli.py:377 ../yum/__init__.py:2751
-msgid "Please report this error in bugzilla"
+#: ../cli.py:411
+#, python-format
+msgid "Please report this error in %s"
 msgstr ""
 
-#: ../cli.py:383
+#: ../cli.py:417
 msgid "Running Transaction Test"
 msgstr ""
 
-#: ../cli.py:399
+#: ../cli.py:433
 msgid "Finished Transaction Test"
 msgstr ""
 
-#: ../cli.py:401
+#: ../cli.py:435
 msgid "Transaction Check Error:\n"
 msgstr ""
 
-#: ../cli.py:408
+#: ../cli.py:442
 msgid "Transaction Test Succeeded"
 msgstr ""
 
-#: ../cli.py:429
+#: ../cli.py:463
 msgid "Running Transaction"
 msgstr ""
 
-#: ../cli.py:459
+#: ../cli.py:493
 msgid ""
 "Refusing to automatically import keys when running unattended.\n"
 "Use \"-y\" to override."
 msgstr ""
 
-#: ../cli.py:491
-msgid "Parsing package install arguments"
+#: ../cli.py:512 ../cli.py:546
+msgid "  * Maybe you meant: "
 msgstr ""
 
-#: ../cli.py:501
+#: ../cli.py:529 ../cli.py:537
 #, python-format
-msgid "No package %s available."
+msgid "Package(s) %s%s%s available, but not installed."
 msgstr ""
 
-#: ../cli.py:505 ../cli.py:623 ../yumcommands.py:748
-msgid "Package(s) to install"
+#: ../cli.py:543 ../cli.py:578
+#, python-format
+msgid "No package %s%s%s available."
 msgstr ""
 
-#: ../cli.py:506 ../cli.py:624 ../yumcommands.py:146 ../yumcommands.py:749
-msgid "Nothing to do"
+#: ../cli.py:568
+msgid "Parsing package install arguments"
 msgstr ""
 
-#: ../cli.py:536 ../yum/__init__.py:2232 ../yum/__init__.py:2311
-#: ../yum/__init__.py:2340
-#, python-format
-msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
+#: ../cli.py:583 ../cli.py:658 ../yumcommands.py:984
+msgid "Package(s) to install"
 msgstr ""
 
-#: ../cli.py:568
-#, python-format
-msgid "Could not find update match for %s"
+#: ../cli.py:584 ../cli.py:659 ../yumcommands.py:151 ../yumcommands.py:985
+msgid "Nothing to do"
 msgstr ""
 
-#: ../cli.py:580
+#: ../cli.py:617
 #, python-format
 msgid "%d packages marked for Update"
 msgstr ""
 
-#: ../cli.py:583
+#: ../cli.py:620
 msgid "No Packages marked for Update"
 msgstr ""
 
-#: ../cli.py:599
+#: ../cli.py:634
 #, python-format
 msgid "%d packages marked for removal"
 msgstr ""
 
-#: ../cli.py:602
+#: ../cli.py:637
 msgid "No Packages marked for removal"
 msgstr ""
 
-#: ../cli.py:614
+#: ../cli.py:649
 msgid "No Packages Provided"
 msgstr ""
 
-#: ../cli.py:654
+#: ../cli.py:704
 msgid "Matching packages for package list to user args"
 msgstr ""
 
-#: ../cli.py:701
+#: ../cli.py:753
 #, python-format
 msgid "Warning: No matches found for: %s"
 msgstr ""
 
-#: ../cli.py:704
+#: ../cli.py:756
 msgid "No Matches found"
 msgstr ""
 
-#: ../cli.py:745
+#: ../cli.py:795
+#, python-format
+msgid ""
+"Warning: 3.0.x versions of yum would erronously match against filenames.\n"
+" You can use \"%s*/%s%s\" and/or \"%s*bin/%s%s\" to get that behaviour"
+msgstr ""
+
+#: ../cli.py:811
 #, python-format
 msgid "No Package Found for %s"
 msgstr ""
 
-#: ../cli.py:757
+#: ../cli.py:823
 msgid "Cleaning up Everything"
 msgstr ""
 
-#: ../cli.py:771
+#: ../cli.py:837
 msgid "Cleaning up Headers"
 msgstr ""
 
-#: ../cli.py:774
+#: ../cli.py:840
 msgid "Cleaning up Packages"
 msgstr ""
 
-#: ../cli.py:777
+#: ../cli.py:843
 msgid "Cleaning up xml metadata"
 msgstr ""
 
-#: ../cli.py:780
+#: ../cli.py:846
 msgid "Cleaning up database cache"
 msgstr ""
 
-#: ../cli.py:783
+#: ../cli.py:849
 msgid "Cleaning up expire-cache metadata"
 msgstr ""
 
-#: ../cli.py:786
+#: ../cli.py:852
 msgid "Cleaning up plugins"
 msgstr ""
 
-#: ../cli.py:807
+#: ../cli.py:877
 msgid "Installed Groups:"
 msgstr ""
 
-#: ../cli.py:814
+#: ../cli.py:884
 msgid "Available Groups:"
 msgstr ""
 
-#: ../cli.py:820
+#: ../cli.py:890
 msgid "Done"
 msgstr ""
 
-#: ../cli.py:829 ../cli.py:841 ../cli.py:847
+#: ../cli.py:901 ../cli.py:919 ../cli.py:925 ../yum/__init__.py:2388
 #, python-format
 msgid "Warning: Group %s does not exist."
 msgstr ""
 
-#: ../cli.py:853
+#: ../cli.py:929
 msgid "No packages in any requested group available to install or update"
 msgstr ""
 
-#: ../cli.py:855
+#: ../cli.py:931
 #, python-format
 msgid "%d Package(s) to Install"
 msgstr ""
 
-#: ../cli.py:865
+#: ../cli.py:941 ../yum/__init__.py:2400
 #, python-format
 msgid "No group named %s exists"
 msgstr ""
 
-#: ../cli.py:871
+#: ../cli.py:947
 msgid "No packages to remove from groups"
 msgstr ""
 
-#: ../cli.py:873
+#: ../cli.py:949
 #, python-format
 msgid "%d Package(s) to remove"
 msgstr ""
 
-#: ../cli.py:915
+#: ../cli.py:991
 #, python-format
 msgid "Package %s is already installed, skipping"
 msgstr ""
 
-#: ../cli.py:926
+#: ../cli.py:1002
 #, python-format
 msgid "Discarding non-comparable pkg %s.%s"
 msgstr ""
 
 #. we've not got any installed that match n or n+a
-#: ../cli.py:952
+#: ../cli.py:1028
 #, python-format
 msgid "No other %s installed, adding to list for potential install"
 msgstr ""
 
-#: ../cli.py:971
+#: ../cli.py:1047
 #, python-format
 msgid "Command line error: %s"
 msgstr ""
 
-#: ../cli.py:1101
+#: ../cli.py:1060
+#, python-format
+msgid ""
+"\n"
+"\n"
+"%s: %s option requires an argument"
+msgstr ""
+
+#: ../cli.py:1110
+msgid "--color takes one of: auto, always, never"
+msgstr ""
+
+#: ../cli.py:1212
+msgid "show this help message and exit"
+msgstr ""
+
+#: ../cli.py:1216
 msgid "be tolerant of errors"
 msgstr ""
 
-#: ../cli.py:1103
+#: ../cli.py:1218
 msgid "run entirely from cache, don't update cache"
 msgstr ""
 
-#: ../cli.py:1105
+#: ../cli.py:1220
 msgid "config file location"
 msgstr ""
 
-#: ../cli.py:1107
+#: ../cli.py:1222
 msgid "maximum command wait time"
 msgstr ""
 
-#: ../cli.py:1109
+#: ../cli.py:1224
 msgid "debugging output level"
 msgstr ""
 
-#: ../cli.py:1113
+#: ../cli.py:1228
 msgid "show duplicates, in repos, in list/search commands"
 msgstr ""
 
-#: ../cli.py:1115
+#: ../cli.py:1230
 msgid "error output level"
 msgstr ""
 
-#: ../cli.py:1118
+#: ../cli.py:1233
 msgid "quiet operation"
 msgstr ""
 
-#: ../cli.py:1122
+#: ../cli.py:1235
+msgid "verbose operation"
+msgstr ""
+
+#: ../cli.py:1237
 msgid "answer yes for all questions"
 msgstr ""
 
-#: ../cli.py:1124
+#: ../cli.py:1239
 msgid "show Yum version and exit"
 msgstr ""
 
-#: ../cli.py:1125
+#: ../cli.py:1240
 msgid "set install root"
 msgstr ""
 
-#: ../cli.py:1129
+#: ../cli.py:1244
 msgid "enable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1133
+#: ../cli.py:1248
 msgid "disable one or more repositories (wildcards allowed)"
 msgstr ""
 
-#: ../cli.py:1136
+#: ../cli.py:1251
 msgid "exclude package(s) by name or glob"
 msgstr ""
 
-#: ../cli.py:1138
+#: ../cli.py:1253
 msgid "disable exclude from main, for a repo or for everything"
 msgstr ""
 
-#: ../cli.py:1141
+#: ../cli.py:1256
 msgid "enable obsoletes processing during updates"
 msgstr ""
 
-#: ../cli.py:1143
+#: ../cli.py:1258
 msgid "disable Yum plugins"
 msgstr ""
 
-#: ../cli.py:1145
+#: ../cli.py:1260
 msgid "disable gpg signature checking"
 msgstr ""
 
-#: ../cli.py:1147
+#: ../cli.py:1262
 msgid "disable plugins by name"
 msgstr ""
 
-#: ../cli.py:1150
+#: ../cli.py:1265
+msgid "enable plugins by name"
+msgstr ""
+
+#: ../cli.py:1268
 msgid "skip packages with depsolving problems"
 msgstr ""
 
-#: ../output.py:229
+#: ../cli.py:1270
+msgid "control whether color is used"
+msgstr ""
+
+#: ../output.py:300
 msgid "Jan"
 msgstr ""
 
-#: ../output.py:229
+#: ../output.py:300
 msgid "Feb"
 msgstr ""
 
-#: ../output.py:229
+#: ../output.py:300
 msgid "Mar"
 msgstr ""
 
-#: ../output.py:229
+#: ../output.py:300
 msgid "Apr"
 msgstr ""
 
-#: ../output.py:229
+#: ../output.py:300
 msgid "May"
 msgstr ""
 
-#: ../output.py:229
+#: ../output.py:300
 msgid "Jun"
 msgstr ""
 
-#: ../output.py:230
+#: ../output.py:301
 msgid "Jul"
 msgstr ""
 
-#: ../output.py:230
+#: ../output.py:301
 msgid "Aug"
 msgstr ""
 
-#: ../output.py:230
+#: ../output.py:301
 msgid "Sep"
 msgstr ""
 
-#: ../output.py:230
+#: ../output.py:301
 msgid "Oct"
 msgstr ""
 
-#: ../output.py:230
+#: ../output.py:301
 msgid "Nov"
 msgstr ""
 
-#: ../output.py:230
+#: ../output.py:301
 msgid "Dec"
 msgstr ""
 
-#: ../output.py:240
+#: ../output.py:311
 msgid "Trying other mirror."
 msgstr ""
 
-#: ../output.py:293
+#: ../output.py:527
 #, python-format
-msgid "Name       : %s"
+msgid "Name       : %s%s%s"
 msgstr ""
 
-#: ../output.py:294
+#: ../output.py:528
 #, python-format
 msgid "Arch       : %s"
 msgstr ""
 
-#: ../output.py:296
+#: ../output.py:530
 #, python-format
 msgid "Epoch      : %s"
 msgstr ""
 
-#: ../output.py:297
+#: ../output.py:531
 #, python-format
 msgid "Version    : %s"
 msgstr ""
 
-#: ../output.py:298
+#: ../output.py:532
 #, python-format
 msgid "Release    : %s"
 msgstr ""
 
-#: ../output.py:299
+#: ../output.py:533
 #, python-format
 msgid "Size       : %s"
 msgstr ""
 
-#: ../output.py:300
+#: ../output.py:534
 #, python-format
 msgid "Repo       : %s"
 msgstr ""
 
-#: ../output.py:302
+#: ../output.py:536
 #, python-format
 msgid "Committer  : %s"
 msgstr ""
 
-#: ../output.py:303
+#: ../output.py:537
+#, python-format
+msgid "Committime : %s"
+msgstr ""
+
+#: ../output.py:538
+#, python-format
+msgid "Buildtime  : %s"
+msgstr ""
+
+#: ../output.py:540
+#, python-format
+msgid "Installtime: %s"
+msgstr ""
+
+#: ../output.py:541
 msgid "Summary    : "
 msgstr ""
 
-#: ../output.py:305
+#: ../output.py:543
 #, python-format
 msgid "URL        : %s"
 msgstr ""
 
-#: ../output.py:306
+#: ../output.py:544
 #, python-format
 msgid "License    : %s"
 msgstr ""
 
-#: ../output.py:307
+#: ../output.py:545
 msgid "Description: "
 msgstr ""
 
-#: ../output.py:351
-# REMEMBER to Translate [Y/N] to the current locale
-msgid "Is this ok [y/N]: "
+#: ../output.py:609
+msgid "y"
 msgstr ""
 
-#: ../output.py:357 ../output.py:360
-msgid "y"
+#: ../output.py:609
+msgid "yes"
 msgstr ""
 
-#: ../output.py:357
+#: ../output.py:610
 msgid "n"
 msgstr ""
 
-#: ../output.py:357 ../output.py:360
-msgid "yes"
+#: ../output.py:610
+msgid "no"
 msgstr ""
 
-#: ../output.py:357
-msgid "no"
+#: ../output.py:614
+msgid "Is this ok [y/N]: "
 msgstr ""
 
-#: ../output.py:367
+#: ../output.py:702
 #, python-format
 msgid ""
 "\n"
 "Group: %s"
 msgstr ""
 
-#: ../output.py:369
+#: ../output.py:709
 #, python-format
 msgid " Description: %s"
 msgstr ""
 
-#: ../output.py:371
+#: ../output.py:711
 msgid " Mandatory Packages:"
 msgstr ""
 
-#: ../output.py:376
+#: ../output.py:712
 msgid " Default Packages:"
 msgstr ""
 
-#: ../output.py:381
+#: ../output.py:713
 msgid " Optional Packages:"
 msgstr ""
 
-#: ../output.py:386
+#: ../output.py:714
 msgid " Conditional Packages:"
 msgstr ""
 
-#: ../output.py:394
+#: ../output.py:734
 #, python-format
 msgid "package: %s"
 msgstr ""
 
-#: ../output.py:396
+#: ../output.py:736
 msgid "  No dependencies for this package"
 msgstr ""
 
-#: ../output.py:401
+#: ../output.py:741
 #, python-format
 msgid "  dependency: %s"
 msgstr ""
 
-#: ../output.py:403
+#: ../output.py:743
 msgid "   Unsatisfied dependency"
 msgstr ""
 
-#: ../output.py:461
+#: ../output.py:815
+#, python-format
+msgid "Repo        : %s"
+msgstr ""
+
+#: ../output.py:816
 msgid "Matched from:"
 msgstr ""
 
-#: ../output.py:487
-msgid "There was an error calculating total download size"
+#: ../output.py:824
+msgid "Description : "
 msgstr ""
 
-#: ../output.py:492
+#: ../output.py:827
 #, python-format
-msgid "Total size: %s"
+msgid "URL         : %s"
 msgstr ""
 
-#: ../output.py:495
+#: ../output.py:830
 #, python-format
-msgid "Total download size: %s"
+msgid "License     : %s"
 msgstr ""
 
-#: ../output.py:507
-msgid "Package"
+#: ../output.py:833
+#, python-format
+msgid "Filename    : %s"
 msgstr ""
 
-#: ../output.py:507
-msgid "Arch"
+#: ../output.py:837
+msgid "Other       : "
 msgstr ""
 
-#: ../output.py:507
-msgid "Version"
+#: ../output.py:870
+msgid "There was an error calculating total download size"
 msgstr ""
 
-#: ../output.py:507
-msgid "Repository"
+#: ../output.py:875
+#, python-format
+msgid "Total size: %s"
 msgstr ""
 
-#: ../output.py:507
-msgid "Size"
+#: ../output.py:878
+#, python-format
+msgid "Total download size: %s"
 msgstr ""
 
-#: ../output.py:514
+#: ../output.py:913
 msgid "Installing for dependencies"
 msgstr ""
 
-#: ../output.py:515
+#: ../output.py:914
 msgid "Updating for dependencies"
 msgstr ""
 
-#: ../output.py:516
+#: ../output.py:915
 msgid "Removing for dependencies"
 msgstr ""
 
-#: ../output.py:528
+#: ../output.py:922 ../output.py:1018
+msgid "Skipped (dependency problems)"
+msgstr ""
+
+#: ../output.py:943
+msgid "Package"
+msgstr ""
+
+#: ../output.py:943
+msgid "Arch"
+msgstr ""
+
+#: ../output.py:944
+msgid "Version"
+msgstr ""
+
+#: ../output.py:944
+msgid "Repository"
+msgstr ""
+
+#: ../output.py:945
+msgid "Size"
+msgstr ""
+
+#: ../output.py:956
 #, python-format
 msgid ""
 "     replacing  %s.%s %s\n"
 "\n"
 msgstr ""
 
-#: ../output.py:536
+#: ../output.py:964
 #, python-format
 msgid ""
 "\n"
 "Transaction Summary\n"
-"=============================================================================\n"
+"%s\n"
 "Install  %5.5s Package(s)         \n"
 "Update   %5.5s Package(s)         \n"
 "Remove   %5.5s Package(s)         \n"
 msgstr ""
 
-#: ../output.py:554
+#: ../output.py:1012
 msgid "Removed"
 msgstr ""
 
-#: ../output.py:555
+#: ../output.py:1013
 msgid "Dependency Removed"
 msgstr ""
 
-#: ../output.py:557
+#: ../output.py:1015
 msgid "Dependency Installed"
 msgstr ""
 
-#: ../output.py:559
+#: ../output.py:1017
 msgid "Dependency Updated"
 msgstr ""
 
-#: ../output.py:560
+#: ../output.py:1019
 msgid "Replaced"
 msgstr ""
 
-#: ../output.py:618
+#: ../output.py:1092
 #, python-format
 msgid ""
 "\n"
@@ -678,72 +774,76 @@
 "seconds to exit.\n"
 msgstr ""
 
-#: ../output.py:628
+#: ../output.py:1102
 msgid "user interrupt"
 msgstr ""
 
-#: ../output.py:639
+#: ../output.py:1118
+msgid "Total"
+msgstr ""
+
+#: ../output.py:1132
 msgid "installed"
 msgstr ""
 
-#: ../output.py:640
+#: ../output.py:1133
 msgid "updated"
 msgstr ""
 
-#: ../output.py:641
+#: ../output.py:1134
 msgid "obsoleted"
 msgstr ""
 
-#: ../output.py:642
+#: ../output.py:1135
 msgid "erased"
 msgstr ""
 
-#: ../output.py:646
+#: ../output.py:1139
 #, python-format
 msgid "---> Package %s.%s %s:%s-%s set to be %s"
 msgstr ""
 
-#: ../output.py:653
+#: ../output.py:1146
 msgid "--> Running transaction check"
 msgstr ""
 
-#: ../output.py:658
+#: ../output.py:1151
 msgid "--> Restarting Dependency Resolution with new changes."
 msgstr ""
 
-#: ../output.py:663
+#: ../output.py:1156
 msgid "--> Finished Dependency Resolution"
 msgstr ""
 
-#: ../output.py:668
+#: ../output.py:1161
 #, python-format
 msgid "--> Processing Dependency: %s for package: %s"
 msgstr ""
 
-#: ../output.py:673
+#: ../output.py:1166
 #, python-format
 msgid "--> Unresolved Dependency: %s"
 msgstr ""
 
-#: ../output.py:679
+#: ../output.py:1172
 #, python-format
 msgid "--> Processing Conflict: %s conflicts %s"
 msgstr ""
 
-#: ../output.py:682
+#: ../output.py:1175
 msgid "--> Populating transaction set with selected packages. Please wait."
 msgstr ""
 
-#: ../output.py:686
+#: ../output.py:1179
 #, python-format
 msgid "---> Downloading header for %s to pack into transaction set."
 msgstr ""
 
-#: ../yumcommands.py:36
+#: ../yumcommands.py:41
 msgid "You need to be root to perform this command."
 msgstr ""
 
-#: ../yumcommands.py:43
+#: ../yumcommands.py:48
 msgid ""
 "\n"
 "You have enabled checking of packages via GPG keys. This is a good thing. \n"
@@ -761,267 +861,325 @@
 "For more information contact your distribution or package provider.\n"
 msgstr ""
 
-#: ../yumcommands.py:63
+#: ../yumcommands.py:68
 #, python-format
 msgid "Error: Need to pass a list of pkgs to %s"
 msgstr ""
 
-#: ../yumcommands.py:69
+#: ../yumcommands.py:74
 msgid "Error: Need an item to match"
 msgstr ""
 
-#: ../yumcommands.py:75
+#: ../yumcommands.py:80
 msgid "Error: Need a group or list of groups"
 msgstr ""
 
-#: ../yumcommands.py:84
+#: ../yumcommands.py:89
 #, python-format
 msgid "Error: clean requires an option: %s"
 msgstr ""
 
-#: ../yumcommands.py:89
+#: ../yumcommands.py:94
 #, python-format
 msgid "Error: invalid clean argument: %r"
 msgstr ""
 
-#: ../yumcommands.py:102
+#: ../yumcommands.py:107
 msgid "No argument to shell"
 msgstr ""
 
-#: ../yumcommands.py:105
+#: ../yumcommands.py:110
 #, python-format
 msgid "Filename passed to shell: %s"
 msgstr ""
 
-#: ../yumcommands.py:109
+#: ../yumcommands.py:114
 #, python-format
 msgid "File %s given as argument to shell does not exist."
 msgstr ""
 
-#: ../yumcommands.py:115
+#: ../yumcommands.py:120
 msgid "Error: more than one file given as argument to shell."
 msgstr ""
 
-#: ../yumcommands.py:156
+#: ../yumcommands.py:161
 msgid "PACKAGE..."
 msgstr ""
 
-#: ../yumcommands.py:159
+#: ../yumcommands.py:164
 msgid "Install a package or packages on your system"
 msgstr ""
 
-#: ../yumcommands.py:168
+#: ../yumcommands.py:173
 msgid "Setting up Install Process"
 msgstr ""
 
-#: ../yumcommands.py:179
+#: ../yumcommands.py:184
 msgid "[PACKAGE...]"
 msgstr ""
 
-#: ../yumcommands.py:182
+#: ../yumcommands.py:187
 msgid "Update a package or packages on your system"
 msgstr ""
 
-#: ../yumcommands.py:190
+#: ../yumcommands.py:195
 msgid "Setting up Update Process"
 msgstr ""
 
-#: ../yumcommands.py:204
+#: ../yumcommands.py:237
 msgid "Display details about a package or group of packages"
 msgstr ""
 
-#: ../yumcommands.py:212
+#: ../yumcommands.py:278
 msgid "Installed Packages"
 msgstr ""
 
-#: ../yumcommands.py:213
+#: ../yumcommands.py:285
 msgid "Available Packages"
 msgstr ""
 
-#: ../yumcommands.py:214
+#: ../yumcommands.py:289
 msgid "Extra Packages"
 msgstr ""
 
-#: ../yumcommands.py:215
+#: ../yumcommands.py:291
 msgid "Updated Packages"
 msgstr ""
 
-#: ../yumcommands.py:221 ../yumcommands.py:225
+#: ../yumcommands.py:298 ../yumcommands.py:305 ../yumcommands.py:574
 msgid "Obsoleting Packages"
 msgstr ""
 
-#: ../yumcommands.py:226
+#: ../yumcommands.py:307
 msgid "Recently Added Packages"
 msgstr ""
 
-#: ../yumcommands.py:232
+#: ../yumcommands.py:314
 msgid "No matching Packages to list"
 msgstr ""
 
-#: ../yumcommands.py:246
+#: ../yumcommands.py:328
 msgid "List a package or groups of packages"
 msgstr ""
 
-#: ../yumcommands.py:258
+#: ../yumcommands.py:340
 msgid "Remove a package or packages from your system"
 msgstr ""
 
-#: ../yumcommands.py:266
+#: ../yumcommands.py:348
 msgid "Setting up Remove Process"
 msgstr ""
 
-#: ../yumcommands.py:278
+#: ../yumcommands.py:363
 msgid "Setting up Group Process"
 msgstr ""
 
-#: ../yumcommands.py:284
+#: ../yumcommands.py:369
 msgid "No Groups on which to run command"
 msgstr ""
 
-#: ../yumcommands.py:297
+#: ../yumcommands.py:382
 msgid "List available package groups"
 msgstr ""
 
-#: ../yumcommands.py:314
+#: ../yumcommands.py:399
 msgid "Install the packages in a group on your system"
 msgstr ""
 
-#: ../yumcommands.py:336
+#: ../yumcommands.py:421
 msgid "Remove the packages in a group from your system"
 msgstr ""
 
-#: ../yumcommands.py:360
+#: ../yumcommands.py:448
 msgid "Display details about a package group"
 msgstr ""
 
-#: ../yumcommands.py:384
+#: ../yumcommands.py:472
 msgid "Generate the metadata cache"
 msgstr ""
 
-#: ../yumcommands.py:390
+#: ../yumcommands.py:478
 msgid "Making cache files for all metadata files."
 msgstr ""
 
-#: ../yumcommands.py:391
+#: ../yumcommands.py:479
 msgid "This may take a while depending on the speed of this computer"
 msgstr ""
 
-#: ../yumcommands.py:412
+#: ../yumcommands.py:500
 msgid "Metadata Cache Created"
 msgstr ""
 
-#: ../yumcommands.py:426
+#: ../yumcommands.py:514
 msgid "Remove cached data"
 msgstr ""
 
-#: ../yumcommands.py:447
+#: ../yumcommands.py:535
 msgid "Find what package provides the given value"
 msgstr ""
 
-#: ../yumcommands.py:467
+#: ../yumcommands.py:555
 msgid "Check for available package updates"
 msgstr ""
 
-#: ../yumcommands.py:490
+#: ../yumcommands.py:594
 msgid "Search package details for the given string"
 msgstr ""
 
-#: ../yumcommands.py:496
+#: ../yumcommands.py:600
 msgid "Searching Packages: "
 msgstr ""
 
-#: ../yumcommands.py:513
+#: ../yumcommands.py:617
 msgid "Update packages taking obsoletes into account"
 msgstr ""
 
-#: ../yumcommands.py:522
+#: ../yumcommands.py:626
 msgid "Setting up Upgrade Process"
 msgstr ""
 
-#: ../yumcommands.py:536
+#: ../yumcommands.py:640
 msgid "Install a local RPM"
 msgstr ""
 
-#: ../yumcommands.py:545
+#: ../yumcommands.py:649
 msgid "Setting up Local Package Process"
 msgstr ""
 
-#: ../yumcommands.py:564
+#: ../yumcommands.py:668
 msgid "Determine which package provides the given dependency"
 msgstr ""
 
-#: ../yumcommands.py:567
+#: ../yumcommands.py:671
 msgid "Searching Packages for Dependency:"
 msgstr ""
 
-#: ../yumcommands.py:581
+#: ../yumcommands.py:685
 msgid "Run an interactive yum shell"
 msgstr ""
 
-#: ../yumcommands.py:587
+#: ../yumcommands.py:691
 msgid "Setting up Yum Shell"
 msgstr ""
 
-#: ../yumcommands.py:605
+#: ../yumcommands.py:709
 msgid "List a package's dependencies"
 msgstr ""
 
-#: ../yumcommands.py:611
+#: ../yumcommands.py:715
 msgid "Finding dependencies: "
 msgstr ""
 
-#: ../yumcommands.py:627
+#: ../yumcommands.py:731
 msgid "Display the configured software repositories"
 msgstr ""
 
-#: ../yumcommands.py:645
-msgid "repo id"
+#: ../yumcommands.py:779 ../yumcommands.py:780
+msgid "enabled"
 msgstr ""
 
-#: ../yumcommands.py:645
-msgid "repo name"
+#: ../yumcommands.py:788 ../yumcommands.py:789
+msgid "disabled"
 msgstr ""
 
-#: ../yumcommands.py:645
-msgid "status"
+#: ../yumcommands.py:800
+msgid "Repo-id     : "
 msgstr ""
 
-#: ../yumcommands.py:651
-msgid "enabled"
+#: ../yumcommands.py:801
+msgid "Repo-name   : "
 msgstr ""
 
-#: ../yumcommands.py:654
-msgid "disabled"
+#: ../yumcommands.py:802
+msgid "Repo-status : "
 msgstr ""
 
-#: ../yumcommands.py:671
+#: ../yumcommands.py:804
+msgid "Repo-revision: "
+msgstr ""
+
+#: ../yumcommands.py:808
+msgid "Repo-tags   : "
+msgstr ""
+
+#: ../yumcommands.py:814
+msgid "Repo-distro-tags: "
+msgstr ""
+
+#: ../yumcommands.py:819
+msgid "Repo-updated: "
+msgstr ""
+
+#: ../yumcommands.py:821
+msgid "Repo-pkgs   : "
+msgstr ""
+
+#: ../yumcommands.py:822
+msgid "Repo-size   : "
+msgstr ""
+
+#: ../yumcommands.py:829
+msgid "Repo-baseurl: "
+msgstr ""
+
+#: ../yumcommands.py:833
+msgid "Repo-metalink: "
+msgstr ""
+
+#: ../yumcommands.py:836
+msgid "Repo-mirrors: "
+msgstr ""
+
+#: ../yumcommands.py:840
+msgid "Repo-exclude: "
+msgstr ""
+
+#: ../yumcommands.py:844
+msgid "Repo-include: "
+msgstr ""
+
+#. Work out the first (id) and last (enabled/disalbed/count),
+#. then chop the middle (name)...
+#: ../yumcommands.py:854 ../yumcommands.py:880
+msgid "repo id"
+msgstr ""
+
+#: ../yumcommands.py:868 ../yumcommands.py:869 ../yumcommands.py:883
+msgid "status"
+msgstr ""
+
+#: ../yumcommands.py:881
+msgid "repo name"
+msgstr ""
+
+#: ../yumcommands.py:907
 msgid "Display a helpful usage message"
 msgstr ""
 
-#: ../yumcommands.py:705
+#: ../yumcommands.py:941
 #, python-format
 msgid "No help available for %s"
 msgstr ""
 
-#: ../yumcommands.py:710
+#: ../yumcommands.py:946
 msgid ""
 "\n"
 "\n"
 "aliases: "
 msgstr ""
 
-#: ../yumcommands.py:712
+#: ../yumcommands.py:948
 msgid ""
 "\n"
 "\n"
 "alias: "
 msgstr ""
 
-#: ../yumcommands.py:741
+#: ../yumcommands.py:977
 msgid "Setting up Reinstall Process"
 msgstr ""
 
-#: ../yumcommands.py:755
+#: ../yumcommands.py:991
 msgid "reinstall a package"
 msgstr ""
 
@@ -1039,722 +1197,756 @@
 "Exiting on Broken Pipe"
 msgstr ""
 
-#: ../yummain.py:105
+#: ../yummain.py:98
 msgid ""
 "Another app is currently holding the yum lock; waiting for it to exit..."
 msgstr ""
 
-#: ../yummain.py:132 ../yummain.py:171
+#: ../yummain.py:125 ../yummain.py:164
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../yummain.py:142 ../yummain.py:178
+#: ../yummain.py:135 ../yummain.py:171
 #, python-format
 msgid "Unknown Error(s): Exit Code: %d:"
 msgstr ""
 
 #. Depsolve stage
-#: ../yummain.py:149
+#: ../yummain.py:142
 msgid "Resolving Dependencies"
 msgstr ""
 
-#: ../yummain.py:184
+#: ../yummain.py:177
 msgid ""
 "\n"
 "Dependencies Resolved"
 msgstr ""
 
-#: ../yummain.py:198
+#: ../yummain.py:191
 msgid "Complete!"
 msgstr ""
 
-#: ../yummain.py:245
+#: ../yummain.py:238
 msgid ""
 "\n"
 "\n"
 "Exiting on user cancel."
 msgstr ""
 
-#: ../yum/depsolve.py:82
+#: ../yum/depsolve.py:84
 msgid "doTsSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/depsolve.py:95
+#: ../yum/depsolve.py:99
 msgid "Setting up TransactionSets before config class is up"
 msgstr ""
 
-#: ../yum/depsolve.py:136
+#: ../yum/depsolve.py:150
 #, python-format
 msgid "Invalid tsflag in config file: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:147
+#: ../yum/depsolve.py:161
 #, python-format
 msgid "Searching pkgSack for dep: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:170
+#: ../yum/depsolve.py:184
 #, python-format
 msgid "Potential match for %s from %s"
 msgstr ""
 
-#: ../yum/depsolve.py:178
+#: ../yum/depsolve.py:192
 #, python-format
 msgid "Matched %s to require for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:219
+#: ../yum/depsolve.py:233
 #, python-format
 msgid "Member: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:233 ../yum/depsolve.py:696
+#: ../yum/depsolve.py:247 ../yum/depsolve.py:738
 #, python-format
 msgid "%s converted to install"
 msgstr ""
 
-#: ../yum/depsolve.py:240
+#: ../yum/depsolve.py:254
 #, python-format
 msgid "Adding Package %s in mode %s"
 msgstr ""
 
-#: ../yum/depsolve.py:250
+#: ../yum/depsolve.py:264
 #, python-format
 msgid "Removing Package %s"
 msgstr ""
 
-#: ../yum/depsolve.py:261
+#: ../yum/depsolve.py:275
 #, python-format
 msgid "%s requires: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:312
+#: ../yum/depsolve.py:333
 msgid "Needed Require has already been looked up, cheating"
 msgstr ""
 
-#: ../yum/depsolve.py:322
+#: ../yum/depsolve.py:343
 #, python-format
 msgid "Needed Require is not a package name. Looking up: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:329
+#: ../yum/depsolve.py:350
 #, python-format
 msgid "Potential Provider: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:352
+#: ../yum/depsolve.py:373
 #, python-format
 msgid "Mode is %s for provider of %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:356
+#: ../yum/depsolve.py:377
 #, python-format
 msgid "Mode for pkg providing %s: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:360
+#: ../yum/depsolve.py:381
 #, python-format
 msgid "TSINFO: %s package requiring %s marked as erase"
 msgstr ""
 
-#: ../yum/depsolve.py:372
+#: ../yum/depsolve.py:394
 #, python-format
 msgid "TSINFO: Obsoleting %s with %s to resolve dep."
 msgstr ""
 
-#: ../yum/depsolve.py:375
+#: ../yum/depsolve.py:397
 #, python-format
 msgid "TSINFO: Updating %s to resolve dep."
 msgstr ""
 
-#: ../yum/depsolve.py:378
+#: ../yum/depsolve.py:405
 #, python-format
 msgid "Cannot find an update path for dep for: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:388
+#: ../yum/depsolve.py:415
 #, python-format
 msgid "Unresolvable requirement %s for %s"
 msgstr ""
 
+#: ../yum/depsolve.py:438
+#, python-format
+msgid "Quick matched %s to require for %s"
+msgstr ""
+
 #. is it already installed?
-#: ../yum/depsolve.py:434
+#: ../yum/depsolve.py:480
 #, python-format
 msgid "%s is in providing packages but it is already installed, removing."
 msgstr ""
 
-#: ../yum/depsolve.py:449
+#: ../yum/depsolve.py:495
 #, python-format
 msgid "Potential resolving package %s has newer instance in ts."
 msgstr ""
 
-#: ../yum/depsolve.py:460
+#: ../yum/depsolve.py:506
 #, python-format
 msgid "Potential resolving package %s has newer instance installed."
 msgstr ""
 
-#: ../yum/depsolve.py:468 ../yum/depsolve.py:527
+#: ../yum/depsolve.py:514 ../yum/depsolve.py:563
 #, python-format
 msgid "Missing Dependency: %s is needed by package %s"
 msgstr ""
 
-#: ../yum/depsolve.py:481
+#: ../yum/depsolve.py:527
 #, python-format
 msgid "%s already in ts, skipping this one"
 msgstr ""
 
-#: ../yum/depsolve.py:510
-#, python-format
-msgid ""
-"Failure finding best provider of %s for %s, exceeded maximum loop length"
-msgstr ""
-
-#: ../yum/depsolve.py:537
+#: ../yum/depsolve.py:573
 #, python-format
 msgid "TSINFO: Marking %s as update for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:544
+#: ../yum/depsolve.py:581
 #, python-format
 msgid "TSINFO: Marking %s as install for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:635 ../yum/depsolve.py:714
+#: ../yum/depsolve.py:674 ../yum/depsolve.py:756
 msgid "Success - empty transaction"
 msgstr ""
 
-#: ../yum/depsolve.py:673 ../yum/depsolve.py:686
+#: ../yum/depsolve.py:713 ../yum/depsolve.py:728
 msgid "Restarting Loop"
 msgstr ""
 
-#: ../yum/depsolve.py:702
+#: ../yum/depsolve.py:744
 msgid "Dependency Process ending"
 msgstr ""
 
-#: ../yum/depsolve.py:708
+#: ../yum/depsolve.py:750
 #, python-format
 msgid "%s from %s has depsolving problems"
 msgstr ""
 
-#: ../yum/depsolve.py:715
+#: ../yum/depsolve.py:757
 msgid "Success - deps resolved"
 msgstr ""
 
-#: ../yum/depsolve.py:729
+#: ../yum/depsolve.py:771
 #, python-format
 msgid "Checking deps for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:782
+#: ../yum/depsolve.py:854
 #, python-format
 msgid "looking for %s as a requirement of %s"
 msgstr ""
 
-#: ../yum/depsolve.py:933
-#, python-format
-msgid "Comparing best: %s to po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:937
-#, python-format
-msgid "Same: best %s == po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:952 ../yum/depsolve.py:963
-#, python-format
-msgid "best %s obsoletes po: %s"
-msgstr ""
-
-#: ../yum/depsolve.py:955
+#: ../yum/depsolve.py:996
 #, python-format
-msgid "po %s obsoletes best: %s"
+msgid "Running compare_providers() for %s"
 msgstr ""
 
-#: ../yum/depsolve.py:972 ../yum/depsolve.py:979 ../yum/depsolve.py:1036
+#: ../yum/depsolve.py:1024 ../yum/depsolve.py:1030
 #, python-format
 msgid "better arch in po %s"
 msgstr ""
 
-#: ../yum/depsolve.py:988 ../yum/depsolve.py:1010
+#: ../yum/depsolve.py:1084
 #, python-format
-msgid "po %s shares a sourcerpm with %s"
+msgid "%s obsoletes %s"
 msgstr ""
 
-#: ../yum/depsolve.py:992 ../yum/depsolve.py:1015
+#: ../yum/depsolve.py:1100
 #, python-format
-msgid "best %s shares a sourcerpm with %s"
+msgid ""
+"archdist compared %s to %s on %s\n"
+"  Winner: %s"
 msgstr ""
 
-#: ../yum/depsolve.py:999 ../yum/depsolve.py:1020
+#: ../yum/depsolve.py:1107
 #, python-format
-msgid "po %s shares more of the name prefix with %s"
+msgid "common sourcerpm %s and %s"
 msgstr ""
 
-#: ../yum/depsolve.py:1003 ../yum/depsolve.py:1029
+#: ../yum/depsolve.py:1113
 #, python-format
-msgid "po %s has a shorter name than best %s"
+msgid "common prefix of %s between %s and %s"
 msgstr ""
 
-#: ../yum/depsolve.py:1025
+#: ../yum/depsolve.py:1121
 #, python-format
-msgid "bestpkg %s shares more of the name prefix with %s"
+msgid "Best Order: %s"
 msgstr ""
 
-#: ../yum/__init__.py:119
+#: ../yum/__init__.py:135
 msgid "doConfigSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:296
+#: ../yum/__init__.py:315
 #, python-format
 msgid "Repository %r is missing name in configuration, using id"
 msgstr ""
 
-#: ../yum/__init__.py:332
+#: ../yum/__init__.py:353
 msgid "plugins already initialised"
 msgstr ""
 
-#: ../yum/__init__.py:339
+#: ../yum/__init__.py:360
 msgid "doRpmDBSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:349
+#: ../yum/__init__.py:370
 msgid "Reading Local RPMDB"
 msgstr ""
 
-#: ../yum/__init__.py:367
+#: ../yum/__init__.py:388
 msgid "doRepoSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:387
+#: ../yum/__init__.py:408
 msgid "doSackSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:404
+#: ../yum/__init__.py:425
 msgid "Setting up Package Sacks"
 msgstr ""
 
-#: ../yum/__init__.py:447
+#: ../yum/__init__.py:468
 #, python-format
 msgid "repo object for repo %s lacks a _resetSack method\n"
 msgstr ""
 
-#: ../yum/__init__.py:448
+#: ../yum/__init__.py:469
 msgid "therefore this repo cannot be reset.\n"
 msgstr ""
 
-#: ../yum/__init__.py:453
+#: ../yum/__init__.py:474
 msgid "doUpdateSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:465
+#: ../yum/__init__.py:486
 msgid "Building updates object"
 msgstr ""
 
-#: ../yum/__init__.py:496
+#: ../yum/__init__.py:517
 msgid "doGroupSetup() will go away in a future version of Yum.\n"
 msgstr ""
 
-#: ../yum/__init__.py:520
+#: ../yum/__init__.py:541
 msgid "Getting group metadata"
 msgstr ""
 
-#: ../yum/__init__.py:546
+#: ../yum/__init__.py:567
 #, python-format
 msgid "Adding group file from repository: %s"
 msgstr ""
 
-#: ../yum/__init__.py:555
+#: ../yum/__init__.py:576
 #, python-format
 msgid "Failed to add groups file for repository: %s - %s"
 msgstr ""
 
-#: ../yum/__init__.py:561
+#: ../yum/__init__.py:582
 msgid "No Groups Available in any repository"
 msgstr ""
 
-#: ../yum/__init__.py:611
+#: ../yum/__init__.py:632
 msgid "Importing additional filelist information"
 msgstr ""
 
-#: ../yum/__init__.py:657
+#: ../yum/__init__.py:641
+msgid ""
+"There are unfinished transactions remaining. You might consider running yum-"
+"complete-transaction first to finish them."
+msgstr ""
+
+#: ../yum/__init__.py:707
 #, python-format
 msgid "Skip-broken round %i"
 msgstr ""
 
-#: ../yum/__init__.py:680
+#: ../yum/__init__.py:759
 #, python-format
 msgid "Skip-broken took %i rounds "
 msgstr ""
 
-#: ../yum/__init__.py:681
+#: ../yum/__init__.py:760
 msgid ""
 "\n"
 "Packages skipped because of dependency problems:"
 msgstr ""
 
-#: ../yum/__init__.py:685
+#: ../yum/__init__.py:764
 #, python-format
 msgid "    %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:774
+#: ../yum/__init__.py:908
+msgid ""
+"Warning: scriptlet or other non-fatal errors occurred during transaction."
+msgstr ""
+
+#: ../yum/__init__.py:924
 #, python-format
 msgid "Failed to remove transaction file %s"
 msgstr ""
 
-#: ../yum/__init__.py:814
+#: ../yum/__init__.py:965
 #, python-format
 msgid "excluding for cost: %s from %s"
 msgstr ""
 
-#: ../yum/__init__.py:845
+#: ../yum/__init__.py:996
 msgid "Excluding Packages in global exclude list"
 msgstr ""
 
-#: ../yum/__init__.py:847
+#: ../yum/__init__.py:998
 #, python-format
 msgid "Excluding Packages from %s"
 msgstr ""
 
-#: ../yum/__init__.py:875
+#: ../yum/__init__.py:1025
 #, python-format
 msgid "Reducing %s to included packages only"
 msgstr ""
 
-#: ../yum/__init__.py:880
+#: ../yum/__init__.py:1031
 #, python-format
 msgid "Keeping included package %s"
 msgstr ""
 
-#: ../yum/__init__.py:886
+#: ../yum/__init__.py:1037
 #, python-format
 msgid "Removing unmatched package %s"
 msgstr ""
 
-#: ../yum/__init__.py:889
+#: ../yum/__init__.py:1040
 msgid "Finished"
 msgstr ""
 
 #. Whoa. What the heck happened?
-#: ../yum/__init__.py:919
+#: ../yum/__init__.py:1070
 #, python-format
 msgid "Unable to check if PID %s is active"
 msgstr ""
 
 #. Another copy seems to be running.
-#: ../yum/__init__.py:923
+#: ../yum/__init__.py:1074
 #, python-format
 msgid "Existing lock %s: another copy is running as pid %s."
 msgstr ""
 
-#: ../yum/__init__.py:970 ../yum/__init__.py:977
+#: ../yum/__init__.py:1145
 msgid "Package does not match intended download"
 msgstr ""
 
-#: ../yum/__init__.py:991
+#: ../yum/__init__.py:1160
 msgid "Could not perform checksum"
 msgstr ""
 
-#: ../yum/__init__.py:994
+#: ../yum/__init__.py:1163
 msgid "Package does not match checksum"
 msgstr ""
 
-#: ../yum/__init__.py:1036
+#: ../yum/__init__.py:1206
 #, python-format
 msgid "package fails checksum but caching is enabled for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1042
+#: ../yum/__init__.py:1209 ../yum/__init__.py:1237
 #, python-format
 msgid "using local copy of %s"
 msgstr ""
 
-#: ../yum/__init__.py:1061
+#: ../yum/__init__.py:1251
 #, python-format
-msgid "Insufficient space in download directory %s to download"
+msgid ""
+"Insufficient space in download directory %s\n"
+"    * free   %s\n"
+"    * needed %s"
 msgstr ""
 
-#: ../yum/__init__.py:1094
+#: ../yum/__init__.py:1298
 msgid "Header is not complete."
 msgstr ""
 
-#: ../yum/__init__.py:1134
+#: ../yum/__init__.py:1338
 #, python-format
 msgid ""
 "Header not in local cache and caching-only mode enabled. Cannot download %s"
 msgstr ""
 
-#: ../yum/__init__.py:1189
+#: ../yum/__init__.py:1393
 #, python-format
 msgid "Public key for %s is not installed"
 msgstr ""
 
-#: ../yum/__init__.py:1193
+#: ../yum/__init__.py:1397
 #, python-format
 msgid "Problem opening package %s"
 msgstr ""
 
-#: ../yum/__init__.py:1201
+#: ../yum/__init__.py:1405
 #, python-format
 msgid "Public key for %s is not trusted"
 msgstr ""
 
-#: ../yum/__init__.py:1205
+#: ../yum/__init__.py:1409
 #, python-format
 msgid "Package %s is not signed"
 msgstr ""
 
-#: ../yum/__init__.py:1243
+#: ../yum/__init__.py:1447
 #, python-format
 msgid "Cannot remove %s"
 msgstr ""
 
-#: ../yum/__init__.py:1247
+#: ../yum/__init__.py:1451
 #, python-format
 msgid "%s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1283
+#: ../yum/__init__.py:1488
 #, python-format
 msgid "Cannot remove %s file %s"
 msgstr ""
 
-#: ../yum/__init__.py:1287
+#: ../yum/__init__.py:1492
 #, python-format
 msgid "%s file %s removed"
 msgstr ""
 
-#: ../yum/__init__.py:1289
+#: ../yum/__init__.py:1494
 #, python-format
 msgid "%d %s files removed"
 msgstr ""
 
-#: ../yum/__init__.py:1329
+#: ../yum/__init__.py:1563
 #, python-format
 msgid "More than one identical match in sack for %s"
 msgstr ""
 
-#: ../yum/__init__.py:1335
+#: ../yum/__init__.py:1569
 #, python-format
 msgid "Nothing matches %s.%s %s:%s-%s from update"
 msgstr ""
 
-#: ../yum/__init__.py:1543
+#: ../yum/__init__.py:1787
 msgid ""
 "searchPackages() will go away in a future version of "
 "Yum.                      Use searchGenerator() instead. \n"
 msgstr ""
 
-#: ../yum/__init__.py:1580
+#: ../yum/__init__.py:1825
 #, python-format
 msgid "Searching %d packages"
 msgstr ""
 
-#: ../yum/__init__.py:1584
+#: ../yum/__init__.py:1829
 #, python-format
 msgid "searching package %s"
 msgstr ""
 
-#: ../yum/__init__.py:1596
+#: ../yum/__init__.py:1841
 msgid "searching in file entries"
 msgstr ""
 
-#: ../yum/__init__.py:1603
+#: ../yum/__init__.py:1848
 msgid "searching in provides entries"
 msgstr ""
 
-#: ../yum/__init__.py:1633
+#: ../yum/__init__.py:1881
 #, python-format
 msgid "Provides-match: %s"
 msgstr ""
 
-#: ../yum/__init__.py:1702 ../yum/__init__.py:1720 ../yum/__init__.py:1748
-#: ../yum/__init__.py:1753 ../yum/__init__.py:1808 ../yum/__init__.py:1812
+#: ../yum/__init__.py:1930
+msgid "No group data available for configured repositories"
+msgstr ""
+
+#: ../yum/__init__.py:1961 ../yum/__init__.py:1980 ../yum/__init__.py:2011
+#: ../yum/__init__.py:2017 ../yum/__init__.py:2090 ../yum/__init__.py:2094
 #, python-format
 msgid "No Group named %s exists"
 msgstr ""
 
-#: ../yum/__init__.py:1731 ../yum/__init__.py:1824
+#: ../yum/__init__.py:1992 ../yum/__init__.py:2107
 #, python-format
 msgid "package %s was not marked in group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1770
+#: ../yum/__init__.py:2039
 #, python-format
 msgid "Adding package %s from group %s"
 msgstr ""
 
-#: ../yum/__init__.py:1774
+#: ../yum/__init__.py:2043
 #, python-format
 msgid "No package named %s available to be installed"
 msgstr ""
 
-#: ../yum/__init__.py:1849
+#: ../yum/__init__.py:2132
 #, python-format
 msgid "Package tuple %s could not be found in packagesack"
 msgstr ""
 
-#: ../yum/__init__.py:1917 ../yum/__init__.py:1960
+#: ../yum/__init__.py:2147
+msgid ""
+"getInstalledPackageObject() will go away, use self.rpmdb.searchPkgTuple().\n"
+msgstr ""
+
+#: ../yum/__init__.py:2199 ../yum/__init__.py:2242
 msgid "Invalid versioned dependency string, try quoting it."
 msgstr ""
 
-#: ../yum/__init__.py:1919 ../yum/__init__.py:1962
+#: ../yum/__init__.py:2201 ../yum/__init__.py:2244
 msgid "Invalid version flag"
 msgstr ""
 
-#: ../yum/__init__.py:1934 ../yum/__init__.py:1938
+#: ../yum/__init__.py:2216 ../yum/__init__.py:2220
 #, python-format
 msgid "No Package found for %s"
 msgstr ""
 
-#: ../yum/__init__.py:2066
+#: ../yum/__init__.py:2427
 msgid "Package Object was not a package object instance"
 msgstr ""
 
-#: ../yum/__init__.py:2070
+#: ../yum/__init__.py:2431
 msgid "Nothing specified to install"
 msgstr ""
 
 #. only one in there
-#: ../yum/__init__.py:2085
+#: ../yum/__init__.py:2449
 #, python-format
 msgid "Checking for virtual provide or file-provide for %s"
 msgstr ""
 
-#: ../yum/__init__.py:2091 ../yum/__init__.py:2380
+#: ../yum/__init__.py:2455 ../yum/__init__.py:2703 ../yum/__init__.py:2872
 #, python-format
 msgid "No Match for argument: %s"
 msgstr ""
 
-#. FIXME - this is where we could check to see if it already installed
-#. for returning better errors
-#: ../yum/__init__.py:2146
+#: ../yum/__init__.py:2521
+#, python-format
+msgid "Package %s installed and not available"
+msgstr ""
+
+#: ../yum/__init__.py:2524
 msgid "No package(s) available to install"
 msgstr ""
 
-#: ../yum/__init__.py:2158
+#: ../yum/__init__.py:2536
 #, python-format
 msgid "Package: %s  - already in transaction set"
 msgstr ""
 
-#: ../yum/__init__.py:2171
+#: ../yum/__init__.py:2551
+#, python-format
+msgid "Package %s is obsoleted by %s, trying to install %s instead"
+msgstr ""
+
+#: ../yum/__init__.py:2559
 #, python-format
 msgid "Package %s already installed and latest version"
 msgstr ""
 
-#: ../yum/__init__.py:2178
+#: ../yum/__init__.py:2566
 #, python-format
 msgid "Package matching %s already installed. Checking for update."
 msgstr ""
 
 #. update everything (the easy case)
-#: ../yum/__init__.py:2220
+#: ../yum/__init__.py:2647
 msgid "Updating Everything"
 msgstr ""
 
-#: ../yum/__init__.py:2304
+#: ../yum/__init__.py:2665 ../yum/__init__.py:2775 ../yum/__init__.py:2796
+#: ../yum/__init__.py:2821
 #, python-format
-msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgid "Not Updating Package that is already obsoleted: %s.%s %s:%s-%s"
 msgstr ""
 
-#: ../yum/__init__.py:2377
+#: ../yum/__init__.py:2700 ../yum/__init__.py:2869
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: ../yum/__init__.py:2392
+#: ../yum/__init__.py:2766
+#, python-format
+msgid "Package is already obsoleted: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:2799 ../yum/__init__.py:2824
+#, python-format
+msgid "Not Updating Package that is already updated: %s.%s %s:%s-%s"
+msgstr ""
+
+#: ../yum/__init__.py:2885
 msgid "No package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2426
+#: ../yum/__init__.py:2919
 #, python-format
 msgid "Cannot open file: %s. Skipping."
 msgstr ""
 
-#: ../yum/__init__.py:2429
+#: ../yum/__init__.py:2922
 #, python-format
 msgid "Examining %s: %s"
 msgstr ""
 
-#: ../yum/__init__.py:2436
+#: ../yum/__init__.py:2930
+#, python-format
+msgid "Cannot add package %s to transaction. Not a compatible architecture: %s"
+msgstr ""
+
+#: ../yum/__init__.py:2938
 #, python-format
 msgid ""
 "Package %s not installed, cannot update it. Run yum install to install it "
 "instead."
 msgstr ""
 
-#: ../yum/__init__.py:2468
+#: ../yum/__init__.py:2971
 #, python-format
 msgid "Excluding %s"
 msgstr ""
 
-#: ../yum/__init__.py:2473
+#: ../yum/__init__.py:2976
 #, python-format
 msgid "Marking %s to be installed"
 msgstr ""
 
-#: ../yum/__init__.py:2479
+#: ../yum/__init__.py:2982
 #, python-format
 msgid "Marking %s as an update to %s"
 msgstr ""
 
-#: ../yum/__init__.py:2486
+#: ../yum/__init__.py:2989
 #, python-format
 msgid "%s: does not update installed package."
 msgstr ""
 
-#: ../yum/__init__.py:2504
+#: ../yum/__init__.py:3007
 msgid "Problem in reinstall: no package matched to remove"
 msgstr ""
 
-#: ../yum/__init__.py:2515
+#: ../yum/__init__.py:3018
 #, python-format
 msgid "Package %s is allowed multiple installs, skipping"
 msgstr ""
 
-#: ../yum/__init__.py:2522
+#: ../yum/__init__.py:3025
 msgid "Problem in reinstall: no package matched to install"
 msgstr ""
 
-#: ../yum/__init__.py:2570
+#: ../yum/__init__.py:3060
 #, python-format
 msgid "Retrieving GPG key from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2576
+#: ../yum/__init__.py:3080
 msgid "GPG key retrieval failed: "
 msgstr ""
 
-#: ../yum/__init__.py:2589
-msgid "GPG key parsing failed: "
+#: ../yum/__init__.py:3091
+#, python-format
+msgid "GPG key parsing failed: key does not have value %s"
 msgstr ""
 
-#: ../yum/__init__.py:2593
+#: ../yum/__init__.py:3123
 #, python-format
 msgid "GPG key at %s (0x%s) is already installed"
 msgstr ""
 
 #. Try installing/updating GPG key
-#: ../yum/__init__.py:2598
+#: ../yum/__init__.py:3128 ../yum/__init__.py:3190
 #, python-format
 msgid "Importing GPG key 0x%s \"%s\" from %s"
 msgstr ""
 
-#: ../yum/__init__.py:2610
+#: ../yum/__init__.py:3145
 msgid "Not installing key"
 msgstr ""
 
-#: ../yum/__init__.py:2616
+#: ../yum/__init__.py:3151
 #, python-format
 msgid "Key import failed (code %d)"
 msgstr ""
 
-#: ../yum/__init__.py:2619
+#: ../yum/__init__.py:3152 ../yum/__init__.py:3211
 msgid "Key imported successfully"
 msgstr ""
 
-#: ../yum/__init__.py:2624
+#: ../yum/__init__.py:3157 ../yum/__init__.py:3216
 #, python-format
 msgid ""
 "The GPG keys listed for the \"%s\" repository are already installed but they "
@@ -1762,74 +1954,103 @@
 "Check that the correct key URLs are configured for this repository."
 msgstr ""
 
-#: ../yum/__init__.py:2633
+#: ../yum/__init__.py:3166
 msgid "Import of key(s) didn't help, wrong key(s)?"
 msgstr ""
 
-#: ../yum/__init__.py:2707
+#: ../yum/__init__.py:3185
+#, python-format
+msgid "GPG key at %s (0x%s) is already imported"
+msgstr ""
+
+#: ../yum/__init__.py:3205
+#, python-format
+msgid "Not installing key for repo %s"
+msgstr ""
+
+#: ../yum/__init__.py:3210
+msgid "Key import failed"
+msgstr ""
+
+#: ../yum/__init__.py:3301
 msgid "Unable to find a suitable mirror."
 msgstr ""
 
-#: ../yum/__init__.py:2709
+#: ../yum/__init__.py:3303
 msgid "Errors were encountered while downloading packages."
 msgstr ""
 
-#: ../yum/__init__.py:2774
+#: ../yum/__init__.py:3344
+#, python-format
+msgid "Please report this error at %s"
+msgstr ""
+
+#: ../yum/__init__.py:3368
 msgid "Test Transaction Errors: "
 msgstr ""
 
 #. Mostly copied from YumOutput._outKeyValFill()
-#: ../yum/plugins.py:195
+#: ../yum/plugins.py:201
 msgid "Loaded plugins: "
 msgstr ""
 
-#: ../yum/plugins.py:206
+#: ../yum/plugins.py:215 ../yum/plugins.py:221
 #, python-format
 msgid "No plugin match for: %s"
 msgstr ""
 
-#: ../yum/plugins.py:219
+#: ../yum/plugins.py:251
 #, python-format
 msgid "\"%s\" plugin is disabled"
 msgstr ""
 
-#: ../yum/plugins.py:231
+#. Give full backtrace:
+#: ../yum/plugins.py:263
+#, python-format
+msgid "Plugin \"%s\" can't be imported"
+msgstr ""
+
+#: ../yum/plugins.py:270
 #, python-format
 msgid "Plugin \"%s\" doesn't specify required API version"
 msgstr ""
 
-#: ../yum/plugins.py:235
+#: ../yum/plugins.py:275
 #, python-format
 msgid "Plugin \"%s\" requires API %s. Supported API is %s."
 msgstr ""
 
-#: ../yum/plugins.py:264
+#: ../yum/plugins.py:308
 #, python-format
 msgid "Loading \"%s\" plugin"
 msgstr ""
 
-#: ../yum/plugins.py:271
+#: ../yum/plugins.py:315
 #, python-format
 msgid ""
 "Two or more plugins with the name \"%s\" exist in the plugin search path"
 msgstr ""
 
-#: ../yum/plugins.py:291
+#: ../yum/plugins.py:335
 #, python-format
 msgid "Configuration file %s not found"
 msgstr ""
 
 #. for
 #. Configuration files for the plugin not found
-#: ../yum/plugins.py:294
+#: ../yum/plugins.py:338
 #, python-format
 msgid "Unable to find configuration file for plugin %s"
 msgstr ""
 
-#: ../yum/plugins.py:448
+#: ../yum/plugins.py:492
 msgid "registration of commands not supported"
 msgstr ""
 
+#: ../yum/rpmtrans.py:78
+msgid "Repackaging"
+msgstr ""
+
 #: ../rpmUtils/oldUtils.py:26
 #, python-format
 msgid "Header cannot be opened or does not match %s, %s."
--- yum-3.2.21.orig/debian/control
+++ yum-3.2.21/debian/control
@@ -0,0 +1,27 @@
+Source: yum
+Section: admin
+Priority: extra
+Maintainer: GPLHost yum packaging team <yumpackage@gplhost.com>
+Dm-Upload-Allowed: yes
+Build-Depends: debhelper (>= 4.0.0), python-dev, python-support (>= 0.4), intltool, dpatch
+Standards-Version: 3.7.3
+
+Package: yum
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-celementtree, python-libxml2, python-urlgrabber, rpm (>= 4.4.1), python-rpm, python-sqlitecachec, python-sqlite
+Description: Advanced front-end for rpm
+ Yum (Yellow dog Updater, Modified) is an automatic updater and package 
+ installer/remover for rpm systems. It automatically computes dependencies 
+ and figures out what things should occur to install packages. It makes it 
+ easier to maintain groups of machines without having to manually update 
+ each one using rpm.
+ .
+ Features include:
+ .
+     * Multiple Repositories
+     * Simple config file
+     * Correct dependency calculation
+     * Fast operation
+     * rpm-consistent behavior
+     * comps.xml group support, including multiple repository groups
+     * Simple interface
--- yum-3.2.21.orig/debian/README.Debian
+++ yum-3.2.21/debian/README.Debian
@@ -0,0 +1,16 @@
+yum for Debian
+--------------
+
+yum requires a working rpm installation. By default the rpm package does not
+create a completely working one lest beginners shoot themselves in the foot.
+
+You should:
+	- mkdir /var/lib/rpm
+	- rpm --initdb
+prior to using yum.
+
+Be aware that my only usage of yum is to perform chroot (Xen, UML) installs
+of both Fedora and Redhat Enterprise. A good place to start might be
+step 5 from <URL: http://www.fedoraproject.org/wiki/FedoraXenQuickstart>.
+
+ -- Anand Kumria <wildfire@progsoc.org>, Wed, 26 Oct 2005 03:48:14 +1000
--- yum-3.2.21.orig/debian/docs
+++ yum-3.2.21/debian/docs
@@ -0,0 +1,3 @@
+PLUGINS
+README
+TODO
--- yum-3.2.21.orig/debian/yum-doc.docs
+++ yum-3.2.21/debian/yum-doc.docs
@@ -0,0 +1,2 @@
+#DOCS#
+
--- yum-3.2.21.orig/debian/dirs
+++ yum-3.2.21/debian/dirs
@@ -0,0 +1,7 @@
+usr/bin
+usr/sbin
+etc/yum/repos.d
+etc/init.d
+etc/dbus-1/system.d
+var/cache/yum
+var/lib/yum
--- yum-3.2.21.orig/debian/rules
+++ yum-3.2.21/debian/rules
@@ -0,0 +1,144 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+	dh_testdir
+	# Add here commands to configure the package.
+	
+	touch configure-stamp
+
+
+#Architecture 
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp 
+
+	# Add here commands to compile the arch part of the package.
+	#$(MAKE) 
+	touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp 
+
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	$(MAKE) 
+	touch build-indep-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) clean
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i 
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	#INSTALLDOC#
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/yum
+	rm -rf $(CURDIR)/debian/yum/etc/rc.d
+	chmod 644 $(CURDIR)/debian/yum/etc/yum/yum-updatesd.conf
+	chmod 644 $(CURDIR)/debian/yum/etc/dbus-1/system.d/yum-updatesd.conf
+
+	dh_install -i
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+
+	# Add here commands to install the arch part of the package into 
+	# debian/tmp.
+	#$(MAKE) install DESTDIR=$(CURDIR)/debian/yum
+
+	dh_install -s
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate	
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+	dh_installinit --name=yum-updatesd
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress 
+	dh_fixperms
+#	dh_perl
+	dh_pysupport /usr/share/yum-cli
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
--- yum-3.2.21.orig/debian/copyright
+++ yum-3.2.21/debian/copyright
@@ -0,0 +1,28 @@
+This package was debianized by Anand Kumria <wildfire@progsoc.org> on
+Wed, 26 Oct 2005 03:48:14 +1000.
+
+It was downloaded from <http://linux.duke.edu/projects/yum/>
+
+Copyright:
+
+   Copyright (C) 2003-2004 Seth Vidal, Duke University <skvidal@phy.duke.edu>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- yum-3.2.21.orig/debian/compat
+++ yum-3.2.21/debian/compat
@@ -0,0 +1 @@
+4
--- yum-3.2.21.orig/debian/yum-updatesd.init
+++ yum-3.2.21/debian/yum-updatesd.init
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# yum   Yum updates daemon.
+#
+#       Written by Andres Salomon <dilinger@debian.org>
+#
+### BEGIN INIT INFO
+# Provides:          yum-updatesd
+# Required-Start:    $syslog $network
+# Required-Stop:     $syslog $network
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Yum updates daemon
+# Description:       yum-updatesd is a daemon which periodically checks for
+#                    (rpm) package updates, and can send notifications via
+#                    mail, dbus, or syslog.
+### END INIT INFO
+
+DAEMON=/usr/sbin/yum-updatesd
+NAME=yum-updatesd
+DESC=yum-updatesd
+CONFIG=/etc/yum/yum-updatesd.conf
+PIDFILE=/var/run/yum-updatesd.pid
+
+test -f $DAEMON || exit 0
+test -f $CONFIG || exit 0
+
+. /lib/lsb/init-functions
+
+case "$1" in
+start)
+	log_daemon_msg "Starting $DESC" "$NAME"
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+			--nicelevel 19 --exec $DAEMON
+	log_end_msg $?
+	;;
+stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+			--exec $DAEMON
+        log_end_msg $?
+        ;;
+restart)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+        start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
+			--exec $DAEMON
+        start-stop-daemon --start --quiet --pidfile $PIDFILE \
+			--nicelevel 19 --exec $DAEMON
+        log_end_msg $?
+        ;;
+reload|force-reload)
+	log_daemon_msg "Reloading configuration files for $DESC" "$NAME"
+	if start-stop-daemon --stop --quiet --signal 1 --pidfile $PIDFILE \
+			--exec $DAEMON; then
+		log_end_msg 0
+	else
+		log_action_end_msg 1
+	fi
+        ;;
+*)
+	log_action_msg "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload}" >&2
+        exit 2
+        ;;
+esac
+
+exit 0
--- yum-3.2.21.orig/debian/changelog
+++ yum-3.2.21/debian/changelog
@@ -0,0 +1,97 @@
+yum (3.2.21-1) unstable; urgency=low
+
+  * Adopting package. Former maintainer retired from Debian recently, and
+    co-maintainer expressed he had no further interest in yum in
+    http://lists.debian.org/debian-release/2009/02/msg00413.html.
+    I (Thomas Goirand) will be co-maintaining this package with my employee
+    Manuel Amador: I feel comfortable with Debian packaging, while Manuel is
+    a python and RPM system specialist. The maintainer email address of this
+    package (signed with my Debian GPG key) forwards to both of us.
+  * New upstream release
+  * Added Dm-Upload-Allowed: yes field.
+  * Forward-ported documentation, sqlite and Makefile patch from last Debian
+    package in Lenny, added build-dep dpatch (patches are now separate and not
+    generated in the diff.gz which I think is ugly packaging).
+  * Removed upstream dependency on python-iniparse and patched to be able to
+    work without it as python-iniparse is not in Debian (yet).
+  * Removed Debian dependency on python-pyme (which is a mistake of the last
+    NMU that thought it was the same as python-gpgme), removed upstream
+    dependency on python-gpgme, patched to work without it (Closes: #496137).
+  * Note: this is only a temporary package before we can have python-gpgme,
+    and python-iniparse inside Debian. This package version aims at a qa upload
+    to fix the current situation in Lenny where the yum package is broken
+    because it is trying to call a python module that doesn't exists in Lenny
+    (see src/misc.py and our patch for it). It seems that 2 other maintainers
+    have already started working on packaging python-gpgme and python-iniparse.
+
+ -- GPLHost yum packaging team <yumpackage@gplhost.com>  Sun, 01 Mar 2009 18:08:07 +0800
+
+yum (3.2.12-1.2) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Updated for compatibility with current python-pyme (Closes: #490368)
+    based on patch by Martin Meredith <mez@ubuntu.com>
+    - Changed import in yum/misc.py
+    - Set versioned dependency on python-pyme
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 28 Jul 2008 23:20:59 +0100
+
+yum (3.2.12-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with dash (Closes: #471758)
+  * Fix 'copyright-without-copyright-notice' lintian warning.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk>  Fri, 11 Apr 2008 19:21:33 +0100
+
+yum (3.2.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Add a build-dep on intltool.
+
+ -- Andres Salomon <dilinger@debian.org>  Fri, 07 Mar 2008 15:02:44 +0000
+
+yum (3.2.10-1) unstable; urgency=low
+
+  * New upstream release (Closes: #364105).
+  * Add myself as a co-maintainer.
+  * Fix up yum-updatesd stuff, including adding an init script.
+  * Silence some lintian warnings/errors.
+  * Add dependencies on some additional python modules; python-pyme,
+    python-sqlitecachec, python-sqlite.
+  * Patch yum/misc.py to use the proper module path; pyme.gpgme,
+    rather than just gpgme.
+  * Patch yum/sqlutils.py to use Qmark format rather than sqlite1
+    syntax; the version_info check ends up being incorrect.
+
+ -- Andres Salomon <dilinger@debian.org>  Tue, 05 Feb 2008 18:14:38 +0000
+
+yum (2.4.0-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Update package to the last python policy (Closes: #380993).
+  * Urgency set to medium for RC bug fix.
+  * Bump Standards-Version to 3.7.2.
+  * Fixing bashism in docs/Makefile.
+  * removing debian/*.ex files.
+
+ -- Pierre Habouzit <madcoder@debian.org>  Wed, 30 Aug 2006 13:43:22 +0200
+
+yum (2.4.0-3) unstable; urgency=low
+
+  * Further corrections to the dependancies (Closes: #340914)
+
+ -- Anand Kumria <wildfire@progsoc.org>  Mon, 28 Nov 2005 02:46:37 +1100
+
+yum (2.4.0-2) unstable; urgency=low
+
+  * Add dependancy on python-urlgrabber
+
+ -- Anand Kumria <wildfire@progsoc.org>  Mon, 31 Oct 2005 05:08:38 +1100
+
+yum (2.4.0-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Anand Kumria <wildfire@progsoc.org>  Wed, 26 Oct 2005 03:48:14 +1000
+
--- yum-3.2.21.orig/debian/patches/0002-Make-compatible-with-SQLite.dpatch
+++ yum-3.2.21/debian/patches/0002-Make-compatible-with-SQLite.dpatch
@@ -0,0 +1,35 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 0003-Make-compatible-with-SQLite.dpatch by Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+##
+## DP: Forward-ported old sqlite patch
+
+From e592d93760fb58d574dd717b79dd5deff167c2b9 Mon Sep 17 00:00:00 2001
+From: Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+Date: Tue, 17 Feb 2009 11:09:19 -0600
+Subject: [PATCH] Make compatible with SQLite
+
+---
+ yum/sqlutils.py |    7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/yum/sqlutils.py b/yum/sqlutils.py
+index 58b63ab..0605cf7 100644
+--- a/yum/sqlutils.py
++++ b/yum/sqlutils.py
+@@ -162,10 +162,9 @@ def executeSQLQmark(cursor, query, params=None):
+     
+     return cursor.execute(query, params)
+ 
+-if sqlite.version_info[0] > 1:
+-    executeSQL = executeSQLQmark
+-else:
+-    executeSQL = executeSQLPyFormat
++# debian's pysqlite2 is built against sqlite3
++executeSQL = executeSQLQmark
++
+ 
+ 
+ 
+-- 
+1.5.6.5
+
--- yum-3.2.21.orig/debian/patches/0003-Removed-iniparse-dependency.dpatch
+++ yum-3.2.21/debian/patches/0003-Removed-iniparse-dependency.dpatch
@@ -0,0 +1,53 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 0003-Removed-iniparse-dependency.dpatch by Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+##
+## DP: Replace iniparse by ConfigParser
+
+From 0914c1861726d74ef78b7ebc2f7de923ec93bd88 Mon Sep 17 00:00:00 2001
+From: Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+Date: Sat, 28 Feb 2009 20:14:21 -0600
+Subject: [PATCH] Removed iniparse dependency
+
+---
+ yum/config.py |   11 +++++------
+ 1 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/yum/config.py b/yum/config.py
+index 2219605..6fa1e09 100644
+--- a/yum/config.py
++++ b/yum/config.py
+@@ -25,9 +25,7 @@ import rpm
+ import copy
+ import urlparse
+ from parser import ConfigPreProcessor
+-from iniparse import INIConfig
+-from iniparse.compat import NoSectionError, NoOptionError, ConfigParser
+-from iniparse.compat import ParsingError
++from ConfigParser import ConfigParser,NoSectionError, NoOptionError, ParsingError
+ import rpmUtils.transaction
+ import rpmUtils.arch
+ import Errors
+@@ -861,16 +859,17 @@ def writeRawRepoFile(repo,only=None):
+     @param only: List of attributes to work on (None = All)
+     It work by reading the repo file, changes the values there shall be changed and write it back to disk.
+     """
+-    ini = INIConfig(open(repo.repofile))
++    cp = ConfigParser()
++    cp.read([repo.repofile])
+     # Updated the ConfigParser with the changed values    
+     cfgOptions = repo.cfg.options(repo.id)
+     for name,value in repo.iteritems():
+         option = repo.optionobj(name)
+         if option.default != value or name in cfgOptions :
+             if only == None or name in only:
+-                ini[repo.id][name] = option.tostring(value)
++                cp.set(repo.id,name,option.tostring(value))
+     fp =file(repo.repofile,"w")               
+-    fp.write(str(ini))
++    cp.write(fp)
+     fp.close()
+ 
+ #def main():
+-- 
+1.5.6.5
+
--- yum-3.2.21.orig/debian/patches/00list
+++ yum-3.2.21/debian/patches/00list
@@ -0,0 +1,3 @@
+0001-Patching-the-Makefile-so-it-works-with-bourne-shell.dpatch
+0002-Make-compatible-with-SQLite.dpatch
+0003-Removed-iniparse-dependency.dpatch
--- yum-3.2.21.orig/debian/patches/0001-Patching-the-Makefile-so-it-works-with-bourne-shell.dpatch
+++ yum-3.2.21/debian/patches/0001-Patching-the-Makefile-so-it-works-with-bourne-shell.dpatch
@@ -0,0 +1,31 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 0001-Patching-the-Makefile-so-it-works-with-bourne-shell.dpatch by Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+##
+## DP: Forward-ported old Makefile patch
+
+From 8ffa6a7dc605053db8af74d896ff8762878fa46c Mon Sep 17 00:00:00 2001
+From: Manuel Amador (Rudd-O) <rudd-o@rudd-o.com>
+Date: Tue, 17 Feb 2009 11:08:28 -0600
+Subject: [PATCH] Patching the Makefile so it works with bourne shell
+
+---
+ docs/Makefile |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index 379ba2b..dc31d0e 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -6,7 +6,8 @@ clean:
+ 	rm -fr epydoc
+ 
+ install:
+-	mkdir -p $(DESTDIR)/usr/share/man/man{5,8}
++	mkdir -p $(DESTDIR)/usr/share/man/man5
++	mkdir -p $(DESTDIR)/usr/share/man/man8
+ 	install -m 644 yum.8 $(DESTDIR)/usr/share/man/man8/yum.8
+ 	install -m 644 yum-shell.8 $(DESTDIR)/usr/share/man/man8/yum-shell.8
+ 	install -m 644 yum.conf.5 $(DESTDIR)/usr/share/man/man5/yum.conf.5
+-- 
+1.5.6.5
+