0.5.15lorg2-alt43

- use apt-cdrom for general distribution media
- stricted verify-elf removed

apt-0.5.15cnc5-alt-distro.patch

@@ -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::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
 --- 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.15lorg2-apt-cdrom-to-media.patch

@@ -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;
+       }
+    }

apt.conf

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

apt.ru.po

@@ -48,12 +48,12 @@ msgstr " [
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media Change: Please insert the media labeled\n"
 " '%s'\n"
-"in the drive '%s' and press enter\n"
+"and press enter\n"
 msgstr ""
-"óÍÅÎÁ ÄÉÓËÁ: ÷ÓÔÁ×ØÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÄÉÓË Ó ÍÅÔËÏÊ '%s'\n"
+"óÍÅÎÁ ÎÏÓÉÔÅÌÑ: ÷ÓÔÁ×ØÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÎÏÓÉÔÅÌØ Ó ÍÅÔËÏÊ '%s'\n"
-"× ÕÓÔÒÏÊÓÔ×Ï '%s' É ÎÁÖÍÉÔÅ <Enter>.\n"
+"É ÎÁÖÍÉÔÅ <Enter>.\n"
 
 #: cmdline/apt-cache.cc:157 cmdline/apt-shell.cc:3188
 #, c-format
@@ -290,8 +290,8 @@ msgid "Failed to open %s.new"
 msgstr "îÅ ÕÄÁÌÏÓØ ÏÔËÒÙÔØ %s.new"
 
 #: cmdline/apt-cdrom.cc:571 cmdline/apt-cdrom.cc:812
-msgid "Using CD-ROM mount point "
+msgid "Using Media mount point "
-msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ CD-ROM "
+msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ ÎÏÓÉÔÅÌÑ "
 
 #: cmdline/apt-cdrom.cc:579 cmdline/apt-cdrom.cc:834 methods/cdrom.cc:160
 #, c-format
@@ -299,28 +299,28 @@ msgid "Unable to read the cdrom database %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÂÁÚÕ ÄÁÎÎÙÈ ËÏÍÐÁËÔ-ÄÉÓËÏ× × %s."
 
 #: cmdline/apt-cdrom.cc:596
-msgid "Unmounting CD-ROM"
+msgid "Unmounting Media"
-msgstr "òÁÚÍÏÎÔÉÒÕÅÔÓÑ CD-ROM"
+msgstr "òÁÚÍÏÎÔÉÒÕÅÔÓÑ ÎÏÓÉÔÅÌØ"
 
 #: 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 "÷ÓÔÁ×ØÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÄÉÓË × ÐÒÉ×ÏÄ É ÎÁÖÍÉÔÅ <Enter>"
+msgstr "÷ÓÔÁ×ØÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÎÏÓÉÔÅÌØ × ÐÒÉ×ÏÄ É ÎÁÖÍÉÔÅ <Enter>"
 
 #: cmdline/apt-cdrom.cc:601 cmdline/apt-cdrom.cc:813
-msgid "Mounting CD-ROM"
+msgid "Mounting Media"
-msgstr "íÏÎÔÉÒÕÅÔÓÑ CD-ROM"
+msgstr "íÏÎÔÉÒÕÅÔÓÑ ÎÏÓÉÔÅÌØ"
 
 #: cmdline/apt-cdrom.cc:603 cmdline/apt-cdrom.cc:815
-msgid "Failed to mount the cdrom."
+msgid "Failed to mount the Media."
-msgstr "îÅ ÕÄÁÌÏÓØ ÓÍÏÎÔÉÒÏ×ÁÔØ CD-ROM."
+msgstr "îÅ ÕÄÁÌÏÓØ ÓÍÏÎÔÉÒÏ×ÁÔØ ÎÏÓÉÔÅÌØ."
 
 #: cmdline/apt-cdrom.cc:607 cmdline/apt-cdrom.cc:818
 msgid "Identifying.. "
 msgstr "òÁÓÐÏÚÎÁ£ÔÓÑ.. "
 
 #: cmdline/apt-cdrom.cc:627
-msgid "Scanning Disc for index files..  "
+msgid "Scanning Media for index files..  "
-msgstr "äÉÓË ÓËÁÎÉÒÕÅÔÓÑ × ÐÏÉÓËÁÈ ÉÎÄÅËÓÎÙÈ ÆÁÊÌÏ×..  "
+msgstr "îÏÓÉÔÅÌØ ÓËÁÎÉÒÕÅÔÓÑ × ÐÏÉÓËÁÈ ÉÎÄÅËÓÎÙÈ ÆÁÊÌÏ×..  "
 
 #: cmdline/apt-cdrom.cc:644
 msgid "I found (binary):"
@@ -353,24 +353,24 @@ msgid "Found label '"
 msgstr "îÁÊÄÅÎÁ ÍÅÔËÁ '"
 
 #: 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 "ðÏÖÁÌÕÊÓÔÁ, ÚÁÄÁÊÔÅ ÉÍÑ ÄÌÑ ÜÔÏÇÏ ÄÉÓËÁ, ÎÁÐÒÉÍÅÒ, 'ALT Linux Disk 1'"
+msgstr "ðÏÖÁÌÕÊÓÔÁ, ÚÁÄÁÊÔÅ ÉÍÑ ÄÌÑ ÜÔÏÇÏ ÎÏÓÉÔÅÌÑ, ÎÁÐÒÉÍÅÒ, 'ALT Linux Disk 1'"
 
 #: cmdline/apt-cdrom.cc:712
 msgid "That is not a valid name, try again "
 msgstr "üÔÏ ÉÍÑ ÏÛÉÂÏÞÎÏ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á "
 
 #: cmdline/apt-cdrom.cc:726
-msgid "This Disc is called:"
+msgid "This Media is called:"
-msgstr "üÔÏÔ ÄÉÓË ÎÁÚ×ÁÎ:"
+msgstr "üÔÏÔ ÎÏÓÉÔÅÌØ ÎÁÚ×ÁÎ:"
 
 #: cmdline/apt-cdrom.cc:759
-msgid "Source List entries for this Disc are:"
+msgid "Source List entries for this Media are:"
-msgstr "óÐÉÓÏË ÉÓÈÏÄÎÙÈ ÐÁËÅÔÏ× ÄÌÑ ÜÔÏÇÏ ÄÉÓËÁ:"
+msgstr "óÐÉÓÏË ÉÓÈÏÄÎÙÈ ÐÁËÅÔÏ× ÄÌÑ ÜÔÏÇÏ ÎÏÓÉÔÅÌÑ:"
 
 #: 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 "ðÏ×ÔÏÒÉÔÅ ÜÔÕ ÐÒÏÃÅÄÕÒÕ ÄÌÑ ÏÓÔÁ×ÛÉÈÓÑ ÄÉÓËÏ× ÉÚ ÷ÁÛÅÇÏ ÎÁÂÏÒÁ."
+msgstr "ðÏ×ÔÏÒÉÔÅ ÜÔÕ ÐÒÏÃÅÄÕÒÕ ÄÌÑ ÏÓÔÁ×ÛÉÈÓÑ ÎÏÓÉÔÅÌÅÊ ÉÚ ÷ÁÛÅÇÏ ÎÁÂÏÒÁ."
 
 #: cmdline/apt-cdrom.cc:837
 msgid "Stored Label: '"
@@ -380,18 +380,18 @@ msgstr "
 msgid ""
 "Usage: apt-cdrom [options] command\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"
 "\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"
 "Options:\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"
 "  -f   Fast mode, don't check package files\n"
 "  -a   Thorough scan mode\n"
@@ -401,19 +401,19 @@ msgid ""
 msgstr ""
 "éÓÐÏÌØÚÏ×ÁÎÉÅ: apt-cdrom [ÐÁÒÁÍÅÔÒÙ] ËÏÍÁÎÄÁ\n"
 "\n"
-"apt-cdrom ÜÔÏ ÕÔÉÌÉÔÁ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ CDROM ÄÉÓËÏ× × ÓÐÉÓÏË ÉÓÔÏÞÎÉËÏ× APT. "
+"apt-cdrom ÜÔÏ ÕÔÉÌÉÔÁ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÎÏÓÉÔÅÌÅÊ × ÓÐÉÓÏË ÉÓÔÏÞÎÉËÏ× APT. "
 "ôÏÞËÁ\n"
-"ÍÏÎÔÉÒÏ×ÁÎÉÑ CDROM É ÉÎÆÏÒÍÁÃÉÑ Ï ÕÓÔÒÏÊÓÔ×Å ÉÚ×ÌÅËÁÀÔÓÑ ÉÚ apt.conf\n"
+"ÍÏÎÔÉÒÏ×ÁÎÉÑ É ÉÎÆÏÒÍÁÃÉÑ Ï ÕÓÔÒÏÊÓÔ×Å ÉÚ×ÌÅËÁÀÔÓÑ ÉÚ apt.conf\n"
 "É /etc/fstab.\n"
 "\n"
 "ëÏÍÁÎÄÙ:\n"
-"   add - äÏÂÁ×ÉÔØ CDROM\n"
+"   add - äÏÂÁ×ÉÔØ ÎÏÓÉÔÅÌØ\n"
-"   ident - ÷Ù×ÅÓÔÉ ÉÄÅÎÔÉÆÉËÁÃÉÏÎÎÕÀ ÚÁÐÉÓØ CDROM\n"
+"   ident - ÷Ù×ÅÓÔÉ ÉÄÅÎÔÉÆÉËÁÃÉÏÎÎÕÀ ÚÁÐÉÓØ ÎÏÓÉÔÅÌÑ\n"
 "\n"
 "ðÁÒÁÍÅÔÒÙ:\n"
 "  -h   ëÒÁÔËÁÑ ÓÐÒÁ×ËÁ \n"
-"  -d   ôÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ CD-ROM\n"
+"  -d   ôÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ\n"
-"  -r   ðÅÒÅÉÍÅÎÏ×ÁÔØ ÕÖÅ ÒÁÓÐÏÚÎÁÎÎÙÊ CD-ROM\n"
+"  -r   ðÅÒÅÉÍÅÎÏ×ÁÔØ ÕÖÅ ÒÁÓÐÏÚÎÁÎÎÙÊ ÎÏÓÉÔÅÌØ\n"
 "  -m   îÅ ÍÏÎÔÉÒÏ×ÁÔØ ÄÉÓË\n"
 "  -f   `âÙÓÔÒÙÊ ÒÅÖÉÍ', ÎÅ ÐÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÐÁËÅÔÏ×\n"
 "  -a   ôÝÁÔÅÌØÎÙÊ ÒÅÖÉÍ ÓËÁÎÉÒÏ×ÁÎÉÑ\n"
@@ -2508,20 +2508,20 @@ msgstr "
 
 #: methods/cdrom.cc:169
 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 ""
-"ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ apt-cdrom, ÞÔÏÂÙ ÓÄÅÌÁÔØ ÜÔÏÔ CD ÄÏÓÔÕÐÎÙÍ APT. apt-"
+"ðÏÖÁÌÕÊÓÔÁ, ÉÓÐÏÌØÚÕÊÔÅ apt-cdrom, ÞÔÏÂÙ ÓÄÅÌÁÔØ ÜÔÏÔ ÎÏÓÉÔÅÌØ ÄÏÓÔÕÐÎÙÍ APT. apt-"
-"get update ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÎÏ×ÙÈ CD ÄÉÓËÏ×"
+"get update ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÄÌÑ ÄÏÂÁ×ÌÅÎÉÑ ÎÏ×ÙÈ ÎÏÓÉÔÅÌÅÊ"
 
 #: methods/cdrom.cc:177 methods/cdrom.cc:215
-msgid "Wrong CD"
+msgid "Wrong media"
-msgstr "îÅÐÒÁ×ÉÌØÎÙÊ CD"
+msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÎÏÓÉÔÅÌØ"
 
 #: methods/cdrom.cc:210
 #, 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 "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ CD-ROM × %s, ÎÁ×ÅÒÎÏÅ ÏÎ ×ÓÅ ÅÝÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÒÁÚÍÏÎÔÉÒÏ×ÁÔØ ÎÏÓÉÔÅÌØ × %s, ÎÁ×ÅÒÎÏÅ ÏÎ ×ÓÅ ÅÝÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
 #: methods/cdrom.cc:233 methods/file.cc:82
 msgid "File not found"

apt.spec

@@ -1,6 +1,6 @@
 Name: apt
 Version: 0.5.15lorg2
-Release: alt42
+Release: alt43
 
 Summary: Debian's Advanced Packaging Tool with RPM support
 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
 Patch61: apt-0.5.15lorg2-alt-apt-shell-quit_by_eof.patch
 Patch62: apt-0.5.15lorg2-alt-rpmdbopen.patch
+Patch63: apt-0.5.15lorg2-apt-cdrom-to-media.patch
 
 Patch99: apt-%version-%release.patch
 Patch100: apt-0.5.15lorg2-alt-lfs.patch
@@ -276,6 +277,7 @@ This package contains method 'rsync' for APT.
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p2
 %patch99 -p1
 %patch100 -p1
 
@@ -348,8 +350,6 @@ done
 
 unset RPM_PYTHON
 
-%set_verify_elf_method strict
-
 %files -f %name.lang
 %_bindir/apt-*
 %_libdir/%name
@@ -386,6 +386,10 @@ unset RPM_PYTHON
 # Probably %%doc with README.rsync?
 
 %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
 - Fixed and enabled LFS support (closes: #28214).