openkylin
/
aptitude
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
Lu zhiping 2022-07-16 17:55:59 +08:00
parent 156d871ad9
commit f8bd7e1944
6 changed files with 1 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
debian/patches/03_branding vendored
View File

@ -1,80 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_branding.dpatch by <egon@localhost.localdomain>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
--- a/section-descriptions
+++ b/section-descriptions
@@ -22,13 +22,13 @@ Aptitude::Sections
admin "Administrative utilities (install software, manage users, etc)\n Packages in the 'admin' section allow you to perform administrative tasks such as installing software, managing users, configuring and monitoring your system, examining network traffic, and so on.";
alien "Packages converted from foreign formats (rpm, tgz, etc)\n Packages in the 'alien' section were created by the 'alien' program from a non-Debian package format such as RPM";
- base "The Debian base system\n Packages in the 'base' section are part of the initial system installation.";
+ base "The Ubuntu base system\n Packages in the 'base' section are part of the initial system installation.";
cli-mono "Mono and the Common Language Infrastructure\n Packages in the 'cli-mono' section provide open source implementation of Microsoft's .NET development framework based on the ECMA standards for C# and the Common Language Runtime. Unless you are a .NET programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required.";
comm "Programs for faxmodems and other communication devices\n Packages in the 'comm' section are used to control modems and other hardware communications devices. This includes software to control faxmodems (for instance, PPP for dial-up internet connections and programs originally written for that purpose, such as zmodem/kermit), as well as software to control cellular phones, interface with FidoNet, and run a BBS.";
database "Database servers and tools\n Packages in the 'database' section contain database engines such as PostgreSQL and SQLite, database clients, and database management tools.";
debug "Debugging symbols\n Packages in the 'debug' section contain files required for debugging programs. You don't need packages from this section unless you want to debug a particular piece of software.";
devel "Utilities and programs for software development\n Packages in the 'devel' section are used to write new software and work on existing software. Non-programmers who do not compile their own software probably do not need much software from this section.\n .\n It includes compilers, debugging tools, programmer's editors, source processing tools, and other things related to software development.";
- doc "Documentation and specialized programs for viewing documentation\n Packages in the 'doc' section document parts of the Debian system, or are viewers for documentation formats.";
+ doc "Documentation and specialized programs for viewing documentation\n Packages in the 'doc' section document parts of the Ubuntu system, or are viewers for documentation formats.";
editors "Text editors and word processors\n Packages in the 'editors' section allow you to edit plain ASCII text. These are not necessarily word processors, although some word processors may be found in this section.";
education "Software, documentation or data related to educational activities\n Packages in the 'education' section are related to educational activities.";
electronics "Programs for working with circuits and electronics\n Packages in the 'electronics' section include circuit design tools, simulators and assemblers for microcontrollers, and other related software.";
@@ -60,7 +60,7 @@ Aptitude::Sections
net "Programs to connect to and provide various services\n Packages in the 'net' section include clients and servers for many protocols, tools to manipulate and debug low-level network protocols, IM systems, and other network-related software.";
news "Usenet clients and servers\n Packages in the 'news' section are related to the Usenet distributed news system. They include news readers and news servers.";
ocaml "OCaml programming language and libraries\n Packages in the 'ocaml' section provide the OCaml programming language and many third-party libraries for it. Unless you are a OCaml programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required.";
- oldlibs "Obsolete libraries\n Packages in the 'oldlibs' section are obsolete and should not be used by new software. They are provided for compatibility reasons, or because software distributed by Debian still requires them.\n .\n With very few exceptions, you should not need to explicitly install a package from this section; the package system will install them as required to fulfill dependencies.";
+ oldlibs "Obsolete libraries\n Packages in the 'oldlibs' section are obsolete and should not be used by new software. They are provided for compatibility reasons, or because software distributed by Ubuntu still requires them.\n .\n With very few exceptions, you should not need to explicitly install a package from this section; the package system will install them as required to fulfill dependencies.";
otherosfs "Emulators and software to read foreign filesystems\n Packages in the 'otherosfs' section emulate hardware and operating systems and provide tools for transferring data between different operating systems and hardware platforms. (for instance, utilities to read DOS floppies, and utilities to communicate with Palm Pilots)\n .\n It is worth noting that CD burning software is included in THIS section.";
perl "Perl programming language and libraries\n Packages in the 'perl' section provide the Perl programming language and many third-party libraries for it. Unless you are a Perl programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required.";
php "PHP programming language and libraries\n Packages in the 'php' section provide the PHP programming language and many third-party libraries for it. Unless you are a PHP programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required.";
@@ -80,8 +80,9 @@ Aptitude::Sections
xfce "The Xfce Desktop Environment\n Xfce is a collection of software which provides an easy-to-use desktop. Packages in the 'xfce' section are part of the Xfce environment or closely integrated into it.";
zope "Zope/Plone framework\n Packages in the 'zope' section provide application server for building content management systems, intranets, portals, and custom applications. One such a content management system build upon Zope is Plone.";
- main "The main Debian archive\n The Debian distribution consists of packages from the 'main' section. Every package in 'main' is Free Software.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines";
- contrib "Programs which depend on software not in Debian\n Packages in the 'contrib' section are not part of Debian.\n .\n These packages are Free Software, but they depend on software which is not part of Debian. This may be because it is not Free Software, but is packaged in the non-free section of the archive, because Debian cannot distribute it at all, or (in rare cases) because no-one has packaged it yet.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines";
- non-free "Programs which are not free software\n Packages in the 'non-free' section are not part of Debian.\n .\n These packages fail to meet one or more of the requirements of the Debian Free Software Guidelines (see below). You should read the license of programs in this section to be sure that you are allowed to use them in the way you intend.\n .\n For more information about what Debian considers to be Free Software, see http://www.debian.org/social_contract#guidelines";
+ main "Fully supported Free Software.\n .\nUbuntu software in the \"main\" component is fully supported, and is Free Software. Not only is this software freely available, it comes with signficant rights for you to modify it, improve it and share it. Read more about the Ubuntu manifesto and licence policy at http://www.ubuntulinux.org/ubuntu/licensing/";
+ restricted "Binary-only device drivers.\n .\nThe \"restricted\" component of Ubuntu consists of device drivers that are only available in binary form, and cannot be modified. We provide these solely because it is the only way to make the rest of Ubuntu run on certain hardware, we recommend you determine whether or not you need this, and if not, to remove it.";
+ universe "Unsupported Free Software.\n .\nUbuntu software in the \"universe\" component is Free Software, but does not receive the same level of testing and polish that software in the \"main\" component receives. The Ubuntu team does not review this software for security, nor does it provide any assurance of ongoing security updates after release.";
+ multiverse "Unsupported Non-free Software.\n .\nSoftware in the \"multiverse\" component has not been determined to be Free Software, please make certain that you verify your rights to use this software and comply with the licensing terms of the copyright holder. This software receives no support and usually cannot be fixed or updated. Use it at your own risk on your own advice.";
};
};
--- a/src/gtk/previewtab.cc
+++ b/src/gtk/previewtab.cc
@@ -94,7 +94,7 @@ namespace gui
// be in common code.
const char * const PreviewView::Generator::child_names[num_pkg_action_states]=
{
- N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Debian archive."),
+ N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Ubuntu archive."),
N_("Packages being removed because they are no longer used\n These packages are being deleted because they were automatically installed to fulfill dependencies, and the planned action will result in no installed package declaring an 'important' dependency on them.\n"),
N_("Packages being automatically held in their current state\n These packages could be upgraded, but they have been kept in their current state to avoid breaking dependencies."),
N_("Packages being automatically installed to satisfy dependencies\n These packages are being installed because they are required by another package you have chosen for installation."),
--- a/src/pkg_grouppolicy.cc
+++ b/src/pkg_grouppolicy.cc
@@ -459,9 +459,9 @@ public:
const char * const pkg_grouppolicy_status::state_titles[numgroups] =
{
- N_("Security Updates\n Security updates for these packages are available from security.debian.org (or mirrors)."),
+ N_("Security Updates\n Security updates for these packages are available from security.ubuntu.com (or mirrors)."),
N_("Upgradable Packages\n A newer version of these packages is available."),
- N_("New Packages\n These packages have been added to Debian since the last time you cleared the list of \"new\" packages (choose \"Forget new packages\" from the Actions menu to empty this list)."),
+ N_("New Packages\n These packages have been added to Ubuntu since the last time you cleared the list of \"new\" packages (choose \"Forget new packages\" from the Actions menu to empty this list)."),
N_("Installed Packages\n These packages are currently installed on your computer."),
N_("Not Installed Packages\n These packages are not installed on your computer."),
N_("Obsolete and Locally Created Packages\n These packages are currently installed on your computer, but they are not available from any apt source. They may be obsolete and removed from the archive, or you may have built a private version of them yourself."),
@@ -687,7 +687,7 @@ public:
const char * const pkg_grouppolicy_mode::child_names[num_pkg_action_states]=
{
- N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Debian archive."),
+ N_("Packages with unsatisfied dependencies\n The dependency requirements of these packages will be unmet after the install is complete.\n .\n The presence of this tree probably indicates that something is broken, either on your system or in the Ubuntu archive."),
N_("Packages being removed because they are no longer used\n These packages are being deleted because they were automatically installed to fulfill dependencies, and the planned action will result in no installed package declaring an 'important' dependency on them.\n"),
N_("Packages being automatically held in their current state\n These packages could be upgraded, but they have been kept in their current state to avoid breaking dependencies."),
N_("Packages being automatically installed to satisfy dependencies\n These packages are being installed because they are required by another package you have chosen for installation."),

92
debian/patches/04_changelog vendored
View File

@ -1,92 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_changelog.dpatch by <egon@localhost.localdomain>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
Index: aptitude-0.8.12-1ubuntu1/src/apt_options.cc
===================================================================
--- aptitude-0.8.12-1ubuntu1.orig/src/apt_options.cc
+++ aptitude-0.8.12-1ubuntu1/src/apt_options.cc
@@ -302,7 +302,7 @@
"should only need to change this if the changelogs move "
"to a different URL."),
"APT::Changelogs::Server",
- "http://metadata.ftp-master.debian.org/changelogs"),
+ "http://changelogs.ubuntu.com/changelogs"),
option_item(N_("Display a preview of what will be done before doing it"),
N_("If this option is enabled, then when you ask "
"aptitude to perform an install run, it will "
Index: aptitude-0.8.12-1ubuntu1/src/cmdline/cmdline_changelog.cc
===================================================================
--- aptitude-0.8.12-1ubuntu1.orig/src/cmdline/cmdline_changelog.cc
+++ aptitude-0.8.12-1ubuntu1/src/cmdline/cmdline_changelog.cc
@@ -292,7 +292,7 @@
if(access("/usr/bin/sensible-pager", X_OK)!=0)
{
- _error->Warning(_("Can't execute sensible-pager, is this a working Debian system?"));
+ _error->Warning(_("Can't execute sensible-pager, is this a working Ubuntu system?"));
pager=getenv("PAGER");
Index: aptitude-0.8.12-1ubuntu1/src/generic/apt/pkg_changelog.cc
===================================================================
--- aptitude-0.8.12-1ubuntu1.orig/src/generic/apt/pkg_changelog.cc
+++ aptitude-0.8.12-1ubuntu1/src/generic/apt/pkg_changelog.cc
@@ -584,14 +584,14 @@
// WATCH: apt/cmdline/apt-get.cc(DownloadChangelog)
string server = aptcfg->Find("APT::Changelogs::Server",
- "http://metadata.ftp-master.debian.org/changelogs");
- string path = cw::util::ssprintf("%s/%s/%s/%s_%s",
+ "http://changelogs.ubuntu.com/changelogs");
+ string path = cw::util::ssprintf("pool/%s/%s/%s/%s_%s",
realsection.c_str(),
prefix.c_str(),
source_package.c_str(),
source_package.c_str(),
realver.c_str());
- uri = cw::util::ssprintf("%s/%s_changelog",
+ uri = cw::util::ssprintf("%s/%s/changelog",
server.c_str(),
path.c_str());
}
@@ -690,9 +690,7 @@
{
if (!vf.File().end() &&
vf.File().Origin() &&
- (string("Debian") == vf.File().Origin() ||
- string("Debian Ports") == vf.File().Origin() ||
- string("Debian Backports") == vf.File().Origin()))
+ (string("Ubuntu") == vf.File().Origin()))
{
return true;
}
Index: aptitude-0.8.12-1ubuntu1/src/view_changelog.cc
===================================================================
--- aptitude-0.8.12-1ubuntu1.orig/src/view_changelog.cc
+++ aptitude-0.8.12-1ubuntu1/src/view_changelog.cc
@@ -275,7 +275,7 @@
string menulabel =
ssprintf(_("Changelog of %s"), pkgname.c_str());
string tablabel = ssprintf(_("%s changes"), pkgname.c_str());
- string desclabel = _("View the list of changes made to this Debian package.");
+ string desclabel = _("View the list of changes made to this Ubuntu package.");
cw::util::ref_ptr<aptitude::apt::changelog> changelog(aptitude::apt::parse_changelog(filename));
cw::fragment *f = changelog.valid() ? render_changelog(changelog, curverstr) : NULL;
Index: aptitude-0.8.12-1ubuntu1/src/generic/apt/download_queue.cc
===================================================================
--- aptitude-0.8.12-1ubuntu1.orig/src/generic/apt/download_queue.cc
+++ aptitude-0.8.12-1ubuntu1/src/generic/apt/download_queue.cc
@@ -875,7 +875,8 @@
if (req.get_uri().find("/changelogs/") != std::string::npos)
{
- std::string uri_filename = req.get_uri().substr(req.get_uri().find_last_of("/") + 1);
+ auto last_slash = req.get_uri().find_last_of("/");
+ std::string uri_filename = req.get_uri().substr(req.get_uri().find_last_of("/", last_slash - 1) + 1);
std::regex underscore_regex("[^_]+");
auto elem_begin = std::sregex_iterator(uri_filename.begin(), uri_filename.end(), underscore_regex);

17
debian/patches/05_error vendored
View File

@ -1,17 +0,0 @@
Description: Handle _error becoming a smart pointer thingy
This should be fixed nicer in apt, so that we can use _error again somehow, as
_GetErrorObj() is not really part of the API (but the ABI).
Author: Julian Andres Klode <juliank@ubuntu.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/main.cc
+++ b/src/main.cc
@@ -1154,7 +1154,7 @@ int main(int argc, char *argv[])
{
// Connect up the "please consume errors" routine for the
// command-line.
- consume_errors.connect(sigc::mem_fun(_error, (void (GlobalError::*)()) &GlobalError::DumpErrors));
+ consume_errors.connect(sigc::mem_fun(_GetErrorObj(), (void (GlobalError::*)()) &GlobalError::DumpErrors));
if(update_only || install_only || autoclean_only || clean_only)
{

50
debian/patches/06_apt1.9.11 vendored
View File

@ -1,50 +0,0 @@
Description: Adjust for apt 1.9.11
pkgDPkgPM should not be used directly, use _system->CreatePM() instead;
also compare map_pointer in cache against new MapPointer() method instead
of Index().
Author: Julian Andres Klode <juliank@ubuntu.com>
Last-Update: 2020-02-27
--- a/src/generic/apt/apt.cc
+++ b/src/generic/apt/apt.cc
@@ -1724,8 +1724,8 @@ namespace aptitude
return;
}
- pkgDPkgPM pm(*apt_cache_file);
- pm.GetArchives(&fetcher, &l, apt_package_records);
+ std::unique_ptr<pkgPackageManager> pm(_system->CreatePM(*apt_cache_file));
+ pm->GetArchives(&fetcher, &l, apt_package_records);
if (_error->PendingError())
return;
--- a/src/generic/apt/download_install_manager.cc
+++ b/src/generic/apt/download_install_manager.cc
@@ -33,6 +33,7 @@
#include <apt-pkg/error.h>
#include <apt-pkg/install-progress.h>
#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/pkgsystem.h>
#include <sigc++/bind.h>
@@ -44,7 +45,7 @@ using namespace std;
download_install_manager::download_install_manager(bool _download_only,
const run_dpkg_in_terminal_func &_run_dpkg_in_terminal)
- : log(NULL), download_only(_download_only), pm(new pkgDPkgPM(*apt_cache_file)),
+ : log(NULL), download_only(_download_only), pm(_system->CreatePM(*apt_cache_file)),
run_dpkg_in_terminal(_run_dpkg_in_terminal)
{
}
--- a/src/generic/apt/aptitude_resolver.cc
+++ b/src/generic/apt/aptitude_resolver.cc
@@ -1085,7 +1085,7 @@ void aptitude_resolver::add_default_reso
pkgCache::VerIterator instVer(*cache, NULL);
// See if we have a match that's not through a Provides.
- for( ; *curr != NULL && (*curr)->ParentPkg == p.Index(); ++curr)
+ for( ; *curr != NULL && (*curr)->ParentPkg == p.MapPointer(); ++curr)
{
pkgCache::PkgIterator currPkg(*cache, cache->GetCache().PkgP + (*curr)->ParentPkg);
if((*cache)[currPkg].CandidateVer != *curr)

4
debian/patches/series vendored
View File

@ -1,4 +0,0 @@
03_branding
04_changelog
05_error
06_apt1.9.11

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt) 3.0 (native)