--- synaptic-0.47/common/rcacheactor.cc.reinstall 2003-10-24 13:22:23.000000000 +0300 +++ synaptic-0.47/common/rcacheactor.cc 2004-01-29 23:49:52.000000000 +0200 @@ -23,6 +23,7 @@ //cout << "RCacheActor::notifyCachePostChange()" << endl; vector toKeep; vector toInstall; + vector toReInstall; vector toUpgrade; vector toRemove; vector toDowngrade; @@ -32,13 +33,15 @@ if(_laststate == NULL) return; - if (_lister->getStateChanges(*_laststate, toKeep, toInstall, + if (_lister->getStateChanges(*_laststate, toKeep, toInstall, toReInstall, toUpgrade, toRemove, toDowngrade, exclude, false)) { if (toKeep.empty() == false) run(toKeep, ACTION_KEEP); if (toInstall.empty() == false) run(toInstall, ACTION_INSTALL); + if (toReInstall.empty() == false) + run(toInstall, ACTION_REINSTALL); if (toUpgrade.empty() == false) run(toUpgrade, ACTION_INSTALL); if (toDowngrade.empty() == false) --- synaptic-0.47/common/rcacheactor.h.reinstall 2003-10-24 13:23:32.000000000 +0300 +++ synaptic-0.47/common/rcacheactor.h 2004-01-29 23:49:52.000000000 +0200 @@ -35,6 +35,7 @@ enum Action { ACTION_KEEP, ACTION_INSTALL, + ACTION_REINSTALL, ACTION_REMOVE }; --- synaptic-0.47/common/rpackage.cc.reinstall 2003-11-27 13:29:29.000000000 +0200 +++ synaptic-0.47/common/rpackage.cc 2004-01-30 00:33:34.000000000 +0200 @@ -388,6 +388,11 @@ { pkgDepCache::StateCache &state = (*_depcache)[*_package]; + if ((state.iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall) { + //cout << "reinstalled state " << name() << endl; + return MReInstall; + } + if (state.NewInstall()) return MInstall; @@ -834,6 +839,14 @@ _lister->notifyChange(this); } +void RPackage::setReInstall(bool flag) +{ + _depcache->SetReInstall(*_package, flag); + _config->Set("APT::Get::ReInstall", flag); + + if (_notify) + _lister->notifyChange(this); +} void RPackage::setInstall() { --- synaptic-0.47/common/rpackage.h.reinstall 2003-10-24 13:23:30.000000000 +0300 +++ synaptic-0.47/common/rpackage.h 2004-01-30 00:09:05.000000000 +0200 @@ -94,6 +94,7 @@ enum MarkedStatus { MKeep, MInstall, + MReInstall, MUpgrade, MDowngrade, MRemove, @@ -199,6 +200,7 @@ // change status void setKeep(); void setInstall(); + void setReInstall(bool flag); void setRemove(bool purge = false); //XXX: purge for debian void setNotify(bool flag=true); --- synaptic-0.47/common/rpackagelister.cc.reinstall 2003-12-01 07:52:11.000000000 +0200 +++ synaptic-0.47/common/rpackagelister.cc 2004-01-30 00:02:40.000000000 +0200 @@ -1043,8 +1043,8 @@ } void RPackageLister::getStats(int &installed, int &broken, - int &toinstall, int &toremove, - double &sizeChange) + int &toinstall, int &toreinstall, + int &toremove, double &sizeChange) { pkgDepCache *deps = _cache->deps(); @@ -1068,7 +1068,8 @@ void RPackageLister::getSummary(int &held, int &kept, int &essential, - int &toInstall, int &toUpgrade, int &toRemove, + int &toInstall, int &toReInstall, + int &toUpgrade, int &toRemove, int &toDowngrade, double &sizeChange) { pkgDepCache *deps = _cache->deps(); @@ -1078,6 +1079,7 @@ kept = deps->KeepCount(); essential = 0; toInstall = 0; + toReInstall = 0; toUpgrade = 0; toDowngrade = 0; toRemove = 0; @@ -1091,6 +1093,9 @@ case RPackage::MInstall: toInstall++; break; + case RPackage::MReInstall: + toReInstall++; + break; case RPackage::MUpgrade: toUpgrade++; break; @@ -1199,6 +1204,7 @@ bool RPackageLister::getStateChanges(RPackageLister::pkgState &state, vector &toKeep, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade, @@ -1227,6 +1233,9 @@ } else if (PkgState.NewInstall()) { toInstall.push_back(RPkg); changed = true; + } else if (PkgState.Install()) { + toReInstall.push_back(RPkg); + changed = true; } else if (PkgState.Delete()) { toRemove.push_back(RPkg); changed = true; @@ -1245,6 +1254,8 @@ sort(toKeep.begin(), toKeep.end(), bla()); if (toInstall.empty() == false) sort(toInstall.begin(), toInstall.end(), bla()); + if (toReInstall.empty() == false) + sort(toReInstall.begin(), toReInstall.end(), bla()); if (toUpgrade.empty() == false) sort(toUpgrade.begin(), toUpgrade.end(), bla()); if (toRemove.empty() == false) @@ -1282,10 +1293,14 @@ case RPackage::MDowngrade: deps->MarkInstall(*(pkg->package()), true); break; - case RPackage::MRemove: deps->MarkDelete(*(pkg->package()), false); break; + case RPackage::MReInstall: + cout << "restore state / reinstall " << pkg->name() << endl; + deps->MarkInstall(*(pkg->package()), true); + deps->SetReInstall(*(pkg->package()), false); + break; case RPackage::MHeld: case RPackage::MKeep: @@ -1305,6 +1320,7 @@ bool RPackageLister::getStateChanges(RPackageLister::pkgState &state, vector &toKeep, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade, @@ -1323,6 +1339,11 @@ changed = true; break; + case RPackage::MReInstall: + toReInstall.push_back(_packages[i]); + changed = true; + break; + case RPackage::MUpgrade: toUpgrade.push_back(_packages[i]); changed = true; @@ -1358,6 +1379,8 @@ sort(toKeep.begin(), toKeep.end(), bla()); if (toInstall.empty() == false) sort(toInstall.begin(), toInstall.end(), bla()); + if (toReInstall.empty() == false) + sort(toReInstall.begin(), toReInstall.end(), bla()); if (toUpgrade.empty() == false) sort(toUpgrade.begin(), toUpgrade.end(), bla()); if (toRemove.empty() == false) @@ -1375,6 +1398,7 @@ vector &kept, vector &essential, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade, @@ -1395,6 +1419,9 @@ case RPackage::MInstall: toInstall.push_back(pkg); break; + case RPackage::MReInstall: + toReInstall.push_back(pkg); + break; case RPackage::MUpgrade: toUpgrade.push_back(pkg); break; @@ -1420,6 +1447,7 @@ sort(kept.begin(), kept.end(), bla()); sort(toInstall.begin(), toInstall.end(), bla()); + sort(toReInstall.begin(), toReInstall.end(), bla()); sort(toUpgrade.begin(), toUpgrade.end(), bla()); sort(essential.begin(), essential.end(), bla()); sort(toRemove.begin(), toRemove.end(), bla()); @@ -1713,6 +1741,7 @@ RPackage::PackageStatus status = _packages[i]->getStatus(); switch (mstatus) { case RPackage::MInstall: + case RPackage::MReInstall: case RPackage::MUpgrade: out << _packages[i]->name() << " \t install" << endl; // marked state has priority so we skip the rest --- synaptic-0.47/common/rpackagelister.h.reinstall 2003-10-24 13:21:55.000000000 +0300 +++ synaptic-0.47/common/rpackagelister.h 2004-01-29 23:49:52.000000000 +0200 @@ -234,11 +234,12 @@ RPackage *getElement(pkgCache::PkgIterator &pkg); RPackage *getElement(string Name); - void getStats(int &installed, int &broken, int &toinstall, int &toremove, - double &sizeChange); + void getStats(int &installed, int &broken, int &toinstall, + int &toreinstall, int &toremove, double &sizeChange); void getSummary(int &held, int &kept, int &essential, - int &toInstall, int &toUpgrade, int &toRemove, + int &toInstall, int &toReInstall, + int &toUpgrade, int &toRemove, int &toDowngrade, double &sizeChange); @@ -246,6 +247,7 @@ vector &kept, vector &essential, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade, @@ -262,6 +264,7 @@ bool getStateChanges(pkgState &state, vector &kept, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade, --- synaptic-0.47/gtk/rgchangeswindow.cc.reinstall 2003-11-29 15:27:28.000000000 +0200 +++ synaptic-0.47/gtk/rgchangeswindow.cc 2004-01-29 23:49:52.000000000 +0200 @@ -89,6 +89,7 @@ bool RGChangesWindow::showAndConfirm(RPackageLister *lister, vector &kept, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade) @@ -154,6 +155,20 @@ } } + if(toReInstall.size() > 0) { + gtk_tree_store_append (_treeStore, &iter, NULL); + gtk_tree_store_set (_treeStore, &iter, + PKG_COLUMN, _("To be re-installed"), -1); + for (vector::const_iterator p = toReInstall.begin(); + p != toReInstall.end(); + p++) + { + gtk_tree_store_append (_treeStore, &iter_child, &iter); + gtk_tree_store_set(_treeStore, &iter_child, + PKG_COLUMN,(*p)->name(), -1); + } + } + if(kept.size() > 0) { gtk_tree_store_append (_treeStore, &iter, NULL); gtk_tree_store_set (_treeStore, &iter, --- synaptic-0.47/gtk/rgchangeswindow.h.reinstall 2003-11-29 15:24:48.000000000 +0200 +++ synaptic-0.47/gtk/rgchangeswindow.h 2004-01-29 23:49:52.000000000 +0200 @@ -50,6 +50,7 @@ bool showAndConfirm(RPackageLister *lister, vector &kept, vector &toInstall, + vector &toReInstall, vector &toUpgrade, vector &toRemove, vector &toDowngrade); --- synaptic-0.47/gtk/rgmainwindow.cc.reinstall 2003-11-29 15:25:34.000000000 +0200 +++ synaptic-0.47/gtk/rgmainwindow.cc 2004-01-30 00:32:36.000000000 +0200 @@ -73,6 +73,7 @@ #include "downgradeM.xpm" #include "heldM.xpm" #include "installM.xpm" +//#include "reinstallM.xpm" #include "removeM.xpm" #include "upgradeM.xpm" #include "newM.xpm" @@ -1024,6 +1025,7 @@ { if(pkg==NULL) { gtk_widget_set_sensitive(_installM, FALSE); + gtk_widget_set_sensitive(_reinstallM, FALSE); gtk_widget_set_sensitive(_pkgupgradeM, FALSE); gtk_widget_set_sensitive(_removeM, FALSE); gtk_widget_set_sensitive(_remove_w_depsM, FALSE); @@ -1042,6 +1044,7 @@ gtk_widget_set_sensitive(_actionB[1], FALSE); gtk_widget_set_sensitive(_actionB[2], TRUE); gtk_widget_set_sensitive(_installM, FALSE); + gtk_widget_set_sensitive(_reinstallM, TRUE); gtk_widget_set_sensitive(_pkgupgradeM, FALSE); gtk_widget_set_sensitive(_removeM, TRUE); gtk_widget_set_sensitive(_remove_w_depsM, TRUE); @@ -1055,6 +1058,7 @@ gtk_widget_set_sensitive(_actionB[1], TRUE); gtk_widget_set_sensitive(_actionB[2], TRUE); gtk_widget_set_sensitive(_installM, FALSE); + gtk_widget_set_sensitive(_reinstallM, TRUE); gtk_widget_set_sensitive(_pkgupgradeM, TRUE); gtk_widget_set_sensitive(_removeM, TRUE); gtk_widget_set_sensitive(_purgeM, TRUE); @@ -1068,6 +1072,7 @@ gtk_widget_set_sensitive(_actionB[1], FALSE); gtk_widget_set_sensitive(_actionB[2], TRUE); gtk_widget_set_sensitive(_installM, FALSE); + gtk_widget_set_sensitive(_reinstallM, FALSE); gtk_widget_set_sensitive(_pkgupgradeM, FALSE); gtk_widget_set_sensitive(_removeM, TRUE); gtk_widget_set_sensitive(_purgeM, TRUE); @@ -1081,6 +1086,7 @@ gtk_widget_set_sensitive(_actionB[1], TRUE); gtk_widget_set_sensitive(_actionB[2], FALSE); gtk_widget_set_sensitive(_installM, TRUE); + gtk_widget_set_sensitive(_reinstallM, FALSE); gtk_widget_set_sensitive(_pkgupgradeM, FALSE); gtk_widget_set_sensitive(_removeM, FALSE); gtk_widget_set_sensitive(_purgeM, FALSE); @@ -1115,6 +1121,11 @@ _currentB = _actionB[1]; break; + case RPackage::MReInstall: + setLabel(_gladeXML,"label_state", _("Package will be re-installed.")); + _currentB = _actionB[1]; + break; + case RPackage::MUpgrade: _currentB = _actionB[1]; setLabel(_gladeXML,"label_state", _("Package will be upgraded.")); @@ -1144,6 +1155,7 @@ setLabel(_gladeXML,"label_state", _("Package is pinned.")); gtk_widget_set_sensitive(_actionB[2], FALSE); gtk_widget_set_sensitive(_installM, FALSE); + gtk_widget_set_sensitive(_reinstallM, FALSE); gtk_widget_set_sensitive(_pkgupgradeM, FALSE); gtk_widget_set_sensitive(_removeM, FALSE); gtk_widget_set_sensitive(_purgeM, FALSE); @@ -1743,6 +1755,10 @@ me->clickedRecInstall(me->_win, GINT_TO_POINTER(InstallSuggested)); } break; + case PKG_REINSTALL: // reinstall + instPkgs.push_back(pkg); + me->pkgInstallHelper(pkg, false, true); + break; case PKG_DELETE: // delete me->pkgRemoveHelper(pkg); break; @@ -1770,19 +1786,20 @@ vector toKeep; vector toInstall; + vector toReInstall; vector toUpgrade; vector toDowngrade; vector toRemove; // ask if the user really want this changes bool changed=true; - if (ask && me->_lister->getStateChanges(state, toKeep, toInstall, + if (ask && me->_lister->getStateChanges(state, toKeep, toInstall, toReInstall, toUpgrade, toRemove, toDowngrade, exclude)) { RGChangesWindow *chng; // show a summary of what's gonna happen chng = new RGChangesWindow(me); - if (!chng->showAndConfirm(me->_lister, toKeep, toInstall, + if (!chng->showAndConfirm(me->_lister, toKeep, toInstall, toReInstall, toUpgrade, toRemove, toDowngrade)) { // canceled operation me->_lister->restoreState(state); @@ -1850,6 +1867,9 @@ gtk_get_color_from_string(_config->Find("Synaptic::MInstallColor", "#ccffcc").c_str(), &StatusColors[(int)RPackage::MInstall]); + gtk_get_color_from_string(_config->Find("Synaptic::MReInstallColor", + "#ccffcc").c_str(), + &StatusColors[(int)RPackage::MReInstall]); gtk_get_color_from_string(_config->Find("Synaptic::MUpgradeColor", "#ffff00").c_str(), &StatusColors[(int)RPackage::MUpgrade]); @@ -1901,6 +1921,9 @@ StatusPixbuf[(int)RPackage::MInstall] = gdk_pixbuf_new_from_xpm_data(installM_xpm); + //StatusPixbuf[(int)RPackage::MReInstall] = + // gdk_pixbuf_new_from_xpm_data(reinstallM_xpm); + StatusPixbuf[(int)RPackage::MUpgrade] = gdk_pixbuf_new_from_xpm_data(upgradeM_xpm); @@ -2675,6 +2698,8 @@ assert(_keepM); _installM = glade_xml_get_widget(_gladeXML,"menu_install"); assert(_installM); + _reinstallM = glade_xml_get_widget(_gladeXML,"menu_reinstall"); + assert(_reinstallM); _pkgupgradeM = glade_xml_get_widget(_gladeXML,"menu_upgrade"); assert(_upgradeM); _removeM = glade_xml_get_widget(_gladeXML,"menu_remove"); @@ -2752,6 +2777,13 @@ assert(widget); g_object_set_data(G_OBJECT(widget), "me", this); + widget = glade_xml_get_widget(_gladeXML, "menu_reinstall"); + assert(widget); + g_object_set_data(G_OBJECT(widget), "me", this); + glade_xml_signal_connect_data(_gladeXML, + "on_menu_action_reinstall", + G_CALLBACK(menuActionClicked), + GINT_TO_POINTER(PKG_REINSTALL)); _actionB[2] = glade_xml_get_widget(_gladeXML, "radiobutton_delete"); assert(widget); @@ -3168,6 +3200,14 @@ (GCallback) menuActionClicked, (void*)PKG_INSTALL); gtk_menu_shell_append(GTK_MENU_SHELL(_popupMenu), menuitem); + menuitem = gtk_image_menu_item_new_with_label(_("Reinstall Current Version")); + img = gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem),img); + g_object_set_data(G_OBJECT(menuitem),"me",this); + g_signal_connect(menuitem, "activate", + (GCallback) menuActionClicked, (void*)PKG_REINSTALL); + gtk_menu_shell_append(GTK_MENU_SHELL(_popupMenu), menuitem); + menuitem = gtk_menu_item_new_with_label(_("Upgrade")); g_object_set_data(G_OBJECT(menuitem),"me",this); g_signal_connect(menuitem, "activate", @@ -3403,12 +3443,16 @@ me->setInterfaceLocked(FALSE); } -void RGMainWindow::pkgInstallHelper(RPackage *pkg, bool fixBroken) +void RGMainWindow::pkgInstallHelper(RPackage *pkg, bool fixBroken, + bool reInstall) { //cout << "pkgInstallHelper()/start" << endl; // do the work if(pkg->availableVersion() != NULL) pkg->setInstall(); + if (reInstall == true) { + pkg->setReInstall(true); + } // check whether something broke if (fixBroken && !_lister->check()) { @@ -3419,6 +3463,7 @@ //cout << "pkgInstallHelper()/end" << endl; } + void RGMainWindow::pkgRemoveHelper(RPackage *pkg, bool purge, bool withDeps) { if (pkg->isImportant()) { @@ -3441,6 +3486,7 @@ void RGMainWindow::pkgKeepHelper(RPackage *pkg) { pkg->setKeep(); + pkg->setReInstall(false); } @@ -3556,6 +3602,7 @@ me->doPkgAction(me, PKG_KEEP); } } + // end double-click gtk_tree_view_set_cursor(GTK_TREE_VIEW(me->_treeView), path, NULL, false); @@ -3569,10 +3616,10 @@ { int listed, installed, broken; - int toinstall, toremove; + int toinstall, toreinstall, toremove; double size; - _lister->getStats(installed, broken, toinstall, toremove, size); + _lister->getStats(installed, broken, toinstall, toreinstall, toremove, size); if (text) { gtk_label_set_text(GTK_LABEL(_statusL), text); @@ -3719,9 +3766,9 @@ // see if we have broken packages (might be better in some // RGMainWindow::preGuiStart funktion) - int installed, broken, toinstall, toremove; + int installed, broken, toinstall, toreinstall, toremove; double sizeChange; - _lister->getStats(installed, broken, toinstall, toremove,sizeChange); + _lister->getStats(installed, broken, toinstall, toreinstall, toremove,sizeChange); if(broken > 0) { gchar *msg; if(broken == 1) --- synaptic-0.47/gtk/rgmainwindow.h.reinstall 2003-11-29 15:27:38.000000000 +0200 +++ synaptic-0.47/gtk/rgmainwindow.h 2004-01-29 23:50:10.000000000 +0200 @@ -67,7 +67,8 @@ PKG_INSTALL, PKG_DELETE, PKG_PURGE, - PKG_DELETE_WITH_DEPS + PKG_DELETE_WITH_DEPS, + PKG_REINSTALL } RGPkgAction; @@ -111,7 +112,7 @@ GtkWidget *_currentB; // ptr to one of below GtkWidget *_actionB[3]; // keep, install, delete // menu items - GtkWidget *_keepM, *_installM, *_pkgupgradeM, *_removeM; + GtkWidget *_keepM, *_installM, *_reinstallM, *_pkgupgradeM, *_removeM; GtkWidget *_remove_w_depsM, *_purgeM; // popup-menu @@ -322,7 +323,8 @@ // this does the actual pkgAction work (install, remove, upgrade) static void doPkgAction(RGMainWindow *me, RGPkgAction action); - void pkgInstallHelper(RPackage *pkg, bool fixBroken=true); + void pkgInstallHelper(RPackage *pkg, bool fixBroken=true, + bool reInstall=false); void pkgRemoveHelper(RPackage *pkg, bool purge=false, bool withDeps=false); void pkgKeepHelper(RPackage *pkg); --- synaptic-0.47/gtk/rgsummarywindow.cc.reinstall 2003-11-29 15:24:16.000000000 +0200 +++ synaptic-0.47/gtk/rgsummarywindow.cc 2004-01-29 23:49:52.000000000 +0200 @@ -66,13 +66,14 @@ vector kept; vector essential; vector toInstall; + vector toReInstall; vector toUpgrade; vector toRemove; vector toDowngrade; double sizeChange; - lister->getDetailedSummary(held, kept, essential, toInstall, toUpgrade, - toRemove, toDowngrade, sizeChange); + lister->getDetailedSummary(held, kept, essential, toInstall, toReInstall, + toUpgrade, toRemove, toDowngrade, sizeChange); if(essential.size() > 0) { /* (Essentail) removed */ @@ -147,6 +148,19 @@ } } + if(toReInstall.size() > 0) { + gtk_tree_store_append (me->_treeStore, &iter, NULL); + gtk_tree_store_set (me->_treeStore, &iter, + PKG_COLUMN, _("To be re-installed"),-1); + for (vector::const_iterator p = toReInstall.begin(); + p != toReInstall.end(); + p++) + { + gtk_tree_store_append (me->_treeStore, &iter_child, &iter); + gtk_tree_store_set(me->_treeStore, &iter_child, + PKG_COLUMN,(*p)->name(), -1); + } + } if(kept.size() > 0) { gtk_tree_store_append (me->_treeStore, &iter, NULL); gtk_tree_store_set (me->_treeStore, &iter, @@ -190,6 +204,7 @@ vector kept; vector essential; vector toInstall; + vector toReInstall; vector toUpgrade; vector toRemove; vector toDowngrade; @@ -199,6 +214,7 @@ kept, essential, toInstall, + toReInstall, toUpgrade, toRemove, toDowngrade, @@ -239,6 +255,12 @@ g_free(str); } + for (vector::const_iterator p = toReInstall.begin(); + p != toReInstall.end(); p++) { + str = g_strdup_printf(_("%s (version %s) will be re-installed\n"),(*p)->name(), (*p)->installedVersion()); + text += str; + g_free(str); + } gtk_label_set_markup(GTK_LABEL(info), text.c_str()); me->_summaryL = info; @@ -301,7 +323,7 @@ gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)clickedCancel, this); - int toInstall, toRemove, toUpgrade, toDowngrade; + int toInstall, toReInstall, toRemove, toUpgrade, toDowngrade; int held, kept, essential; double sizeChange, dlSize; int dlCount; @@ -309,7 +331,7 @@ GString *msg_space = g_string_new(""); lister->getSummary(held, kept, essential, - toInstall, toUpgrade, toRemove, toDowngrade, + toInstall, toReInstall, toUpgrade, toRemove, toDowngrade, sizeChange); lister->getDownloadSummary(dlCount, dlSize); @@ -330,6 +352,12 @@ else g_string_append_printf(msg, _("%d new packages will be installed\n"), toInstall); + if (toReInstall) + if(toReInstall == 1) + g_string_append_printf(msg,_("1 package will be re-installed\n")); + else + g_string_append_printf(msg, _("%d packages will be re-installed\n"), toReInstall); + if (toUpgrade) if(toUpgrade == 1) g_string_append_printf(msg,_("1 package will be upgraded\n")); --- synaptic-0.47/gtk/window_main_hpaned.glade.reinstall 2003-11-29 15:28:06.000000000 +0200 +++ synaptic-0.47/gtk/window_main_hpaned.glade 2004-01-29 23:49:52.000000000 +0200 @@ -361,6 +361,15 @@ + + + True + R_einstall + True + + + + True --- synaptic-0.47/gtk/window_main_vpaned.glade.reinstall 2003-11-29 15:25:13.000000000 +0200 +++ synaptic-0.47/gtk/window_main_vpaned.glade 2004-01-29 23:49:52.000000000 +0200 @@ -362,6 +362,15 @@ + + True + R_einstall + True + + + + + True _Upgrade