darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

0.5.15lorg2-alt43

Browse Source 
- use apt-cdrom for general distribution media
- stricted verify-elf removed
This commit is contained in:
Anton V. Boyarshinov
2014-03-03 13:11:22 +04:00
parent 24134286f1
commit c34d1936c5
5 changed files with 229 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apt-0.5.15cnc5-alt-distro.patch
View File

@ -10,18 +10,6 @@ diff -uprk.orig apt-0.5.15cnc5.orig/apt-pkg/rpm/rpmsystem.cc apt-0.5.15cnc5/apt-
Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom"); Cnf.CndSet("Acquire::CDROM::Mount", "/mnt/cdrom");
Cnf.CndSet("Acquire::CDROM::Copy-All", "true"); Cnf.CndSet("Acquire::CDROM::Copy-All", "true");
diff -uprk.orig apt-0.5.15cnc5.orig/cmdline/apt-cdrom.cc apt-0.5.15cnc5/cmdline/apt-cdrom.cc
--- apt-0.5.15cnc5.orig/cmdline/apt-cdrom.cc 2003-12-23 23:31:19 +0300
+++ apt-0.5.15cnc5/cmdline/apt-cdrom.cc 2004-01-16 15:11:40 +0300
@@ -700,7 +700,7 @@ bool DoAdd(CommandLine &)
Name.empty() == true)
{
// CNC:2003-11-25
- cout << _("Please provide a name for this Disc, such as 'Distribution Disk 1'");
+ cout << _("Please provide a name for this Disc, such as 'ALT Linux Disk 1'");
while (1)
{
Name = PromptLine("");
diff -uprk.orig apt-0.5.15cnc5.orig/methods/ftp.cc apt-0.5.15cnc5/methods/ftp.cc diff -uprk.orig apt-0.5.15cnc5.orig/methods/ftp.cc apt-0.5.15cnc5/methods/ftp.cc
--- apt-0.5.15cnc5.orig/methods/ftp.cc 2003-12-23 23:24:24 +0300 --- apt-0.5.15cnc5.orig/methods/ftp.cc 2003-12-23 23:24:24 +0300
+++ apt-0.5.15cnc5/methods/ftp.cc 2004-01-16 15:11:40 +0300 +++ apt-0.5.15cnc5/methods/ftp.cc 2004-01-16 15:11:40 +0300

177
apt-0.5.15lorg2-apt-cdrom-to-media.patch Normal file
View File

@ -0,0 +1,177 @@
diff --git a/apt/cmdline/apt-cdrom.cc b/apt/cmdline/apt-cdrom.cc
index 0a993ca..1d1f253 100644
--- a/apt/cmdline/apt-cdrom.cc
+++ b/apt/cmdline/apt-cdrom.cc
@@ -568,7 +568,7 @@ bool DoAdd(CommandLine &)
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
- cout << _("Using CD-ROM mount point ") << CDROM << endl;
+ cout << _("Using Media mount point ") << CDROM << endl;
// Read the database
Configuration Database;
@@ -593,14 +593,14 @@ bool DoAdd(CommandLine &)
if (PreFetch == false && _config->FindB("APT::CDROM::NoMount",false) == false)
{
Mounted = true;
- cout << _("Unmounting CD-ROM") << endl;
+ cout << _("Unmounting Media") << endl;
UnmountCdrom(CDROM);
// Mount the new CDROM
- Prompt(_("Please insert a Disc in the drive and press enter"));
- cout << _("Mounting CD-ROM") << endl;
+ Prompt(_("Please insert a Media and press enter"));
+ cout << _("Mounting Media") << endl;
if (MountCdrom(CDROM) == false)
- return _error->Error(_("Failed to mount the cdrom."));
+ return _error->Error(_("Failed to mount the Media."));
}
// Hash the CD to get an ID
@@ -624,7 +624,7 @@ bool DoAdd(CommandLine &)
cout << '[' << ID << ']' << endl;
- cout << _("Scanning Disc for index files.. ") << flush;
+ cout << _("Scanning Media for index files.. ") << flush;
// Get the CD structure
vector<string> List;
vector<string> sList;
@@ -700,7 +700,7 @@ bool DoAdd(CommandLine &)
Name.empty() == true)
{
// CNC:2003-11-25
- cout << _("Please provide a name for this Disc, such as 'Distribution Disk 1'");
+ cout << _("Please provide a name for this Media, such as 'Distribution Disk 1'");
while (1)
{
Name = PromptLine("");
@@ -723,7 +723,7 @@ bool DoAdd(CommandLine &)
*J = '_';
Database.Set("CD::" + ID,Name);
- cout << _("This Disc is called:") << endl << " '" << Name << "'" << endl;
+ cout << _("This Media is called:") << endl << " '" << Name << "'" << endl;
// Copy the package files to the state directory
// CNC:2002-07-11
@@ -756,7 +756,7 @@ bool DoAdd(CommandLine &)
}
// Print the sourcelist entries
- cout << _("Source List entries for this Disc are:") << endl;
+ cout << _("Source List entries for this Media are:") << endl;
for (vector<string>::iterator I = List.begin(); I != List.end(); I++)
{
string::size_type Space = (*I).find(' ');
@@ -789,7 +789,7 @@ bool DoAdd(CommandLine &)
#endif
}
- cout << _("Repeat this process for the rest of the CDs in your set.") << endl;
+ cout << _("Repeat this process for the rest of the Media in your set.") << endl;
// Unmount and finish
// CNC:2002-10-29
@@ -809,8 +809,8 @@ bool DoIdent(CommandLine &)
if (CDROM[0] == '.')
CDROM= SafeGetCWD() + '/' + CDROM;
- cout << _("Using CD-ROM mount point ") << CDROM << endl;
- cout << _("Mounting CD-ROM") << endl;
+ cout << _("Using Media mount point ") << CDROM << endl;
+ cout << _("Mounting Media") << endl;
if (MountCdrom(CDROM) == false)
return _error->Error(_("Failed to mount the cdrom."));
@@ -852,18 +852,18 @@ int ShowHelp()
cout <<
_("Usage: apt-cdrom [options] command\n"
"\n"
- "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
- "CDROM mount point and device information is taken from apt.conf\n"
+ "apt-cdrom is a tool to add Media to APT's source list. The\n"
+ "mount point and device information is taken from apt.conf\n"
"and /etc/fstab.\n"
"\n"
"Commands:\n"
- " add - Add a CDROM\n"
- " ident - Report the identity of a CDROM\n"
+ " add - Add a Media\n"
+ " ident - Report the identity of a Media\n"
"\n"
"Options:\n"
" -h This help text\n"
- " -d CD-ROM mount point\n"
- " -r Rename a recognized CD-ROM\n"
+ " -d Media mount point\n"
+ " -r Rename a recognized Media\n"
" -m No mounting\n"
" -f Fast mode, don't check package files\n"
" -a Thorough scan mode\n"
diff --git a/apt/cmdline/acqprogress.cc b/apt/cmdline/acqprogress.cc
index 5a6198d..9b957d9 100644
--- a/apt/cmdline/acqprogress.cc
+++ b/apt/cmdline/acqprogress.cc
@@ -270,9 +270,9 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
{
if (Quiet <= 0)
cout << '\r' << BlankLine << '\r';
- ioprintf(cout,_("Media Change: Please insert the disc labeled\n"
+ ioprintf(cout,_("Media Change: Please insert the media labeled\n"
" '%s'\n"
- "in the drive '%s' and press enter\n"),
+ "and press enter\n"),
Media.c_str(),Drive.c_str());
char C = 0;
diff --git a/apt/methods/cdrom.cc b/apt/methods/cdrom.cc
index 682f945..b9a068d 100644
--- a/apt/methods/cdrom.cc
+++ b/apt/methods/cdrom.cc
@@ -78,7 +78,7 @@ string CDROMMethod::PreferredURI()
if (FileExists(DFile) == true)
{
if (ReadConfigFile(Database,DFile) == false) {
- _error->Error(_("Unable to read the cdrom database %s"),
+ _error->Error(_("Unable to read the media database %s"),
DFile.c_str());
return "";
}
@@ -190,7 +190,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
if (FileExists(DFile) == true)
{
if (ReadConfigFile(Database,DFile) == false)
- return _error->Error(_("Unable to read the cdrom database %s"),
+ return _error->Error(_("Unable to read the media database %s"),
DFile.c_str());
}
DatabaseLoaded = true;
@@ -199,8 +199,8 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
// All non IMS queries for package files fail.
if (Itm->IndexFile == true || GetID(Get.Host).empty() == true)
{
- Fail(_("Please use apt-cdrom to make this CD recognized by APT."
- " apt-get update cannot be used to add new CDs"));
+ Fail(_("Please use apt-cdrom to make this media recognized by APT."
+ " apt-get update cannot be used to add new Media"));
return true;
}
@@ -240,12 +240,12 @@ bool CDROMMethod::Fetch(FetchItem *Itm)
// I suppose this should prompt somehow?
if (UnmountCdrom(CDROM) == false)
- return _error->Error(_("Unable to unmount the CD-ROM in %s, it may still be in use."),
+ return _error->Error(_("Unable to unmount media in %s, it may still be in use."),
CDROM.c_str());
if (MediaFail(Get.Host,CDROM) == false)
{
CurrentID = "FAIL";
- Fail(_("Wrong CD"),true);
+ Fail(_("Wrong media"),true);
return true;
}
}

2
apt.conf
View File

@ -5,7 +5,7 @@
// See apt-cdrom(8) for details. // See apt-cdrom(8) for details.
Acquire::CDROM::Copy "true"; Acquire::CDROM::Copy "true";
Acquire::CDROM::mount "/media/cdrom"; Acquire::CDROM::mount "/media/ALTLinux";
RPM RPM
{ {

88
apt.ru.po
View File

@ -48,12 +48,12 @@ msgstr " [
#: cmdline/acqprogress.cc:271 #: cmdline/acqprogress.cc:271
#, c-format #, c-format
msgid "" msgid ""
"Media Change: Please insert the disc labeled\n" "Media Change: Please insert the media labeled\n"
" '%s'\n" " '%s'\n"
"in the drive '%s' and press enter\n" "and press enter\n"
msgstr "" msgstr ""
"<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'\n" "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'\n"
"<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <Enter>.\n" "<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <Enter>.\n"
#: cmdline/apt-cache.cc:157 cmdline/apt-shell.cc:3188 #: cmdline/apt-cache.cc:157 cmdline/apt-shell.cc:3188
#, c-format #, c-format
@ -290,8 +290,8 @@ msgid "Failed to open %s.new"
msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s.new" msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s.new"
#: cmdline/apt-cdrom.cc:571 cmdline/apt-cdrom.cc:812 #: cmdline/apt-cdrom.cc:571 cmdline/apt-cdrom.cc:812
msgid "Using CD-ROM mount point " msgid "Using Media mount point "
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM " msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "
#: cmdline/apt-cdrom.cc:579 cmdline/apt-cdrom.cc:834 methods/cdrom.cc:160 #: cmdline/apt-cdrom.cc:579 cmdline/apt-cdrom.cc:834 methods/cdrom.cc:160
#, c-format #, c-format
@ -299,28 +299,28 @@ msgid "Unable to read the cdrom database %s"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> %s." msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> %s."
#: cmdline/apt-cdrom.cc:596 #: cmdline/apt-cdrom.cc:596
msgid "Unmounting CD-ROM" msgid "Unmounting Media"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#: cmdline/apt-cdrom.cc:600 #: cmdline/apt-cdrom.cc:600
msgid "Please insert a Disc in the drive and press enter" msgid "Please insert a Media and press enter"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <Enter>" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <Enter>"
#: cmdline/apt-cdrom.cc:601 cmdline/apt-cdrom.cc:813 #: cmdline/apt-cdrom.cc:601 cmdline/apt-cdrom.cc:813
msgid "Mounting CD-ROM" msgid "Mounting Media"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#: cmdline/apt-cdrom.cc:603 cmdline/apt-cdrom.cc:815 #: cmdline/apt-cdrom.cc:603 cmdline/apt-cdrom.cc:815
msgid "Failed to mount the cdrom." msgid "Failed to mount the Media."
msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM." msgstr "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
#: cmdline/apt-cdrom.cc:607 cmdline/apt-cdrom.cc:818 #: cmdline/apt-cdrom.cc:607 cmdline/apt-cdrom.cc:818
msgid "Identifying.. " msgid "Identifying.. "
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.. " msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.. "
#: cmdline/apt-cdrom.cc:627 #: cmdline/apt-cdrom.cc:627
msgid "Scanning Disc for index files.. " msgid "Scanning Media for index files.. "
msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.. " msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.. "
#: cmdline/apt-cdrom.cc:644 #: cmdline/apt-cdrom.cc:644
msgid "I found (binary):" msgid "I found (binary):"
@ -353,24 +353,24 @@ msgid "Found label '"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> '" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> '"
#: cmdline/apt-cdrom.cc:703 #: cmdline/apt-cdrom.cc:703
msgid "Please provide a name for this Disc, such as 'ALT Linux Disk 1'" msgid "Please provide a name for this Media, such as 'ALT Linux Disk 1'"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, 'ALT Linux Disk 1'" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, 'ALT Linux Disk 1'"
#: cmdline/apt-cdrom.cc:712 #: cmdline/apt-cdrom.cc:712
msgid "That is not a valid name, try again " msgid "That is not a valid name, try again "
msgstr "<22><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> " msgstr "<22><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> "
#: cmdline/apt-cdrom.cc:726 #: cmdline/apt-cdrom.cc:726
msgid "This Disc is called:" msgid "This Media is called:"
msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:" msgstr "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"
#: cmdline/apt-cdrom.cc:759 #: cmdline/apt-cdrom.cc:759
msgid "Source List entries for this Disc are:" msgid "Source List entries for this Media are:"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"
#: cmdline/apt-cdrom.cc:792 #: cmdline/apt-cdrom.cc:792
msgid "Repeat this process for the rest of the CDs in your set." msgid "Repeat this process for the rest of the Media in your set."
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>." msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
#: cmdline/apt-cdrom.cc:837 #: cmdline/apt-cdrom.cc:837
msgid "Stored Label: '" msgid "Stored Label: '"
@ -380,18 +380,18 @@ msgstr "
msgid "" msgid ""
"Usage: apt-cdrom [options] command\n" "Usage: apt-cdrom [options] command\n"
"\n" "\n"
"apt-cdrom is a tool to add CDROM's to APT's source list. The\n" "apt-cdrom is a tool to add Media to APT's source list. The\n"
"CDROM mount point and device information is taken from apt.conf\n" "mount point and device information is taken from apt.conf\n"
"and /etc/fstab.\n" "and /etc/fstab.\n"
"\n" "\n"
"Commands:\n" "Commands:\n"
" add - Add a CDROM\n" " add - Add a Media\n"
" ident - Report the identity of a CDROM\n" " ident - Report the identity of a Media\n"
"\n" "\n"
"Options:\n" "Options:\n"
" -h This help text\n" " -h This help text\n"
" -d CD-ROM mount point\n" " -d mount point\n"
" -r Rename a recognized CD-ROM\n" " -r Rename a recognized Media\n"
" -m No mounting\n" " -m No mounting\n"
" -f Fast mode, don't check package files\n" " -f Fast mode, don't check package files\n"
" -a Thorough scan mode\n" " -a Thorough scan mode\n"
@ -401,19 +401,19 @@ msgid ""
msgstr "" msgstr ""
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: apt-cdrom [<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n" "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: apt-cdrom [<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
"\n" "\n"
"apt-cdrom <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CDROM <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> APT. " "apt-cdrom <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> APT. "
"<22><><EFBFBD><EFBFBD><EFBFBD>\n" "<22><><EFBFBD><EFBFBD><EFBFBD>\n"
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CDROM <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> apt.conf\n" "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> apt.conf\n"
"<22> /etc/fstab.\n" "<22> /etc/fstab.\n"
"\n" "\n"
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n" "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n"
" add - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CDROM\n" " add - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
" ident - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CDROM\n" " ident - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
"\n" "\n"
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n" "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n"
" -h <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n" " -h <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n"
" -d <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM\n" " -d <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
" -r <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM\n" " -r <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
" -m <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n" " -m <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
" -f `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>', <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n" " -f `<60><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>', <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
" -a <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n" " -a <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
@ -2508,20 +2508,20 @@ msgstr "
#: methods/cdrom.cc:169 #: methods/cdrom.cc:169
msgid "" msgid ""
"Please use apt-cdrom to make this CD recognized by APT. apt-get update " "Please use apt-cdrom to make this media recognized by APT. apt-get update "
"cannot be used to add new CDs" "cannot be used to add new media"
msgstr "" msgstr ""
"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> apt-cdrom, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> CD <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> APT. apt-" "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> apt-cdrom, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> APT. apt-"
"get update <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> CD <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" "get update <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#: methods/cdrom.cc:177 methods/cdrom.cc:215 #: methods/cdrom.cc:177 methods/cdrom.cc:215
msgid "Wrong CD" msgid "Wrong media"
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#: methods/cdrom.cc:210 #: methods/cdrom.cc:210
#, c-format #, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgid "Unable to unmount media in %s, it may still be in use."
msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CD-ROM <20> %s, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" msgstr "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> %s, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
#: methods/cdrom.cc:233 methods/file.cc:82 #: methods/cdrom.cc:233 methods/file.cc:82
msgid "File not found" msgid "File not found"

10
apt.spec
View File

@ -1,6 +1,6 @@
Name: apt Name: apt
Version: 0.5.15lorg2 Version: 0.5.15lorg2
Release: alt42 Release: alt43
Summary: Debian's Advanced Packaging Tool with RPM support Summary: Debian's Advanced Packaging Tool with RPM support
Summary(ru_RU.UTF-8): Debian APT - Усовершенствованное средство управления пакетами с поддержкой RPM Summary(ru_RU.UTF-8): Debian APT - Усовершенствованное средство управления пакетами с поддержкой RPM
@ -70,6 +70,7 @@ Patch59: apt-0.5.15lorg2-alt-gcc4.3.patch
Patch60: apt-0.5.15lorg2-alt-apt-shell-list_completion.patch Patch60: apt-0.5.15lorg2-alt-apt-shell-list_completion.patch
Patch61: apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch Patch61: apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch
Patch62: apt-0.5.15lorg2-alt-rpmdbopen.patch Patch62: apt-0.5.15lorg2-alt-rpmdbopen.patch
Patch63: apt-0.5.15lorg2-apt-cdrom-to-media.patch
Patch99: apt-%version-%release.patch Patch99: apt-%version-%release.patch
Patch100: apt-0.5.15lorg2-alt-lfs.patch Patch100: apt-0.5.15lorg2-alt-lfs.patch
@ -276,6 +277,7 @@ This package contains method 'rsync' for APT.
%patch60 -p1 %patch60 -p1
%patch61 -p1 %patch61 -p1
%patch62 -p1 %patch62 -p1
%patch63 -p2
%patch99 -p1 %patch99 -p1
%patch100 -p1 %patch100 -p1
@ -348,8 +350,6 @@ done
unset RPM_PYTHON unset RPM_PYTHON
%set_verify_elf_method strict
%files -f %name.lang %files -f %name.lang
%_bindir/apt-* %_bindir/apt-*
%_libdir/%name %_libdir/%name
@ -386,6 +386,10 @@ unset RPM_PYTHON
# Probably %%doc with README.rsync? # Probably %%doc with README.rsync?
%changelog %changelog
* Fri Feb 28 2014 Anton V. Boyarshinov <boyarsh@altlinux.ru> 0.5.15lorg2-alt43
- use apt-cdrom for general distribution media
- stricted verify-elf removed
* Thu Jan 10 2013 Dmitry V. Levin <ldv@altlinux.org> 0.5.15lorg2-alt42 * Thu Jan 10 2013 Dmitry V. Levin <ldv@altlinux.org> 0.5.15lorg2-alt42
- Fixed and enabled LFS support (closes: #28214). - Fixed and enabled LFS support (closes: #28214).