Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: aptitude

aptitude (0.8.3-1ubuntu5) bionic; urgency=medium * No-change rebuild for boost soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 26 Oct 2017 17:09:01 +0000 aptitude (0.8.3-1ubuntu4) zesty; urgency=medium * No-change rebuild for libxapian30 -- Iain Lane <iain@orangesquash.org.uk> Wed, 02 Nov 2016 11:48:55 +0000 aptitude (0.8.3-1ubuntu3) zesty; urgency=high * No change rebuild against boost1.62. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 01 Nov 2016 16:08:26 +0000 aptitude (0.8.3-1ubuntu2) zesty; urgency=medium * Update d/patches/04_changelog with patches from PÁLFALVI Tamás to restore aptitude changelog functionality. (LP: #1583226) -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 27 Oct 2016 12:24:27 +1300 aptitude (0.8.3-1ubuntu1) yakkety; urgency=medium * Merge with Debian; remaining changes: - Drop aptitude-doc to Suggests. - 03_branding: Ubuntu branding. - 04_changelog: Take changelogs from changelogs.ubuntu.com. - 14_html2text_preferred: Switch back to html2text in favor of elinks, since html2text is in main and elinks isn't. Convert all files to utf-8 encoding as it is better then ascii for iso-8859-1 (English docs). - Try forcing -O2 build, to resolve FTBFS on ppc64el. -- Matthias Klose <doko@ubuntu.com> Tue, 06 Sep 2016 14:46:35 +0200

Modifications :
  1. Download patch doc/html-to-text

    --- 0.8.3-1/doc/html-to-text 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/doc/html-to-text 2017-10-31 15:57:21.000000000 +0000 @@ -8,4 +8,10 @@ in="$1" encoding=$2 -exec elinks -dump -dump-charset $encoding -no-references -no-numbering "$in" +#exec elinks -dump -dump-charset $encoding -no-references -no-numbering "$in" +DIR=$(dirname $0) +exec html2text -width 80 -utf8 -nobs -rcfile "$DIR/aptitude-txt.style" "$1" + +# html2text has -ascii and -utf8 encodings only +# aptitude documentation is in iso-8859-1 (en) and utf-8 (rest of languages) +# so we can assume utf-8 for all of them
  2. Download patch src/view_changelog.cc

    --- 0.8.3-1/src/view_changelog.cc 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/src/view_changelog.cc 2017-10-31 15:57:21.000000000 +0000 @@ -275,7 +275,7 @@ static void do_view_changelog(const stri 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;
  3. Download patch src/cmdline/cmdline_changelog.cc

    --- 0.8.3-1/src/cmdline/cmdline_changelog.cc 2016-08-06 17:57:03.000000000 +0000 +++ 0.8.3-1ubuntu5/src/cmdline/cmdline_changelog.cc 2017-10-31 15:57:21.000000000 +0000 @@ -292,7 +292,7 @@ void do_cmdline_changelog(const vector<s 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");
  4. Download patch debian/rules

    --- 0.8.3-1/debian/rules 2016-08-07 10:53:12.000000000 +0000 +++ 0.8.3-1ubuntu5/debian/rules 2016-09-06 12:45:46.000000000 +0000 @@ -20,6 +20,9 @@ ifneq (,$(findstring noopt,$(DEB_BUILD_O endif DEB_CXXFLAGS_MAINT_APPEND += -std=c++14 + +DEB_CXXFLAGS_MAINT_APPEND += -O2 + export DEB_CXXFLAGS_MAINT_APPEND BUILDDIR=build-arch
  5. Download patch .pc/04_changelog/src/view_changelog.cc
  6. Download patch debian/patches/14_html2text_preferred

    --- 0.8.3-1/debian/patches/14_html2text_preferred 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.3-1ubuntu5/debian/patches/14_html2text_preferred 2016-09-06 12:45:46.000000000 +0000 @@ -0,0 +1,91 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 14_html2text_preferred.dpatch by Steve Langasek <steve.langasek@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Switch back to using html2text, not elinks, which is not in main in +## DP: Ubuntu + +@DPATCH@ +--- + doc/aptitude-txt.style | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ + doc/html-to-text | 8 +++++- + 2 files changed, 68 insertions(+), 1 deletion(-) + +--- /dev/null ++++ b/doc/aptitude-txt.style +@@ -0,0 +1,61 @@ ++ ++/* these are the defaults uses in '-style pretty' mode */ ++ ++A.attributes.internal_link = NONE ++A.attributes.external_link = NONE ++ ++OL.TYPE = 1 ++OL.vspace.before = 1 ++OL.vspace.after = 1 ++OL.indents = 5 ++UL.vspace.before = 1 ++UL.vspace.after = 1 ++UL.indents = 2 ++DL.vspace.before = 1 ++DL.vspace.after = 1 ++DT.vspace.before = 1 ++DIR.vspace.before = 1 ++DIR.indents = 2 ++MENU.vspace.before = 1 ++MENU.vspace.after = 1 ++DT.indent = 2 ++DD.indent = 6 ++I.attributes = UNDERLINE ++HR.marker = - ++H1.prefix = ++H2.prefix = ++H3.prefix = ++H4.prefix = ++H5.prefix = ++H6.prefix = ++H1.suffix = ++H2.suffix = ++H3.suffix = ++H4.suffix = ++H5.suffix = ++H6.suffix = ++H1.vspace.before = 2 ++H2.vspace.before = 1 ++H3.vspace.before = 1 ++H4.vspace.before = 1 ++H5.vspace.before = 1 ++H6.vspace.before = 1 ++H1.vspace.after = 1 ++H2.vspace.after = 1 ++H3.vspace.after = 1 ++H4.vspace.after = 1 ++H5.vspace.after = 1 ++H6.vspace.after = 1 ++TABLE.vspace.before = 1 ++TABLE.vspace.after = 1 ++CODE.vspace.before = 0 ++CODE.vspace.after = 0 ++BLOCKQUOTE.vspace.before = 1 ++BLOCKQUOTE.vspace.after = 1 ++/*PRE.vspace.before = 1 ++PRE.vspace.after = 1*/ ++PRE.indent.left = 0 ++P.vspace.after = 1 ++IMG.replace.noalt = [IMAGE] ++IMG.alt.prefix = \ ++IMG.alt.suffix = \ +--- a/doc/html-to-text ++++ b/doc/html-to-text +@@ -8,4 +8,10 @@ + in="$1" + encoding=$2 + +-exec elinks -dump -dump-charset $encoding -no-references -no-numbering "$in" ++#exec elinks -dump -dump-charset $encoding -no-references -no-numbering "$in" ++DIR=$(dirname $0) ++exec html2text -width 80 -utf8 -nobs -rcfile "$DIR/aptitude-txt.style" "$1" ++ ++# html2text has -ascii and -utf8 encodings only ++# aptitude documentation is in iso-8859-1 (en) and utf-8 (rest of languages) ++# so we can assume utf-8 for all of them
  7. Download patch debian/control

    --- 0.8.3-1/debian/control 2016-08-07 10:53:12.000000000 +0000 +++ 0.8.3-1ubuntu5/debian/control 2016-09-06 12:45:46.000000000 +0000 @@ -1,7 +1,8 @@ Source: aptitude Section: admin Priority: important -Maintainer: Aptitude Development Team <aptitude-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Aptitude Development Team <aptitude-devel@lists.alioth.debian.org> Uploaders: Manuel A. Fernandez Montecelo <mafm@debian.org>, Axel Beckert <abe@debian.org> Build-Depends: automake, @@ -9,7 +10,7 @@ Build-Depends: automake, docbook-xml, docbook-xsl, dpkg-dev (>= 1.16.1), - elinks, + html2text, gettext, google-mock, libapt-pkg-dev (>= 1.1),
  8. Download patch .pc/03_branding/src/pkg_grouppolicy.cc
  9. Download patch .pc/03_branding/section-descriptions

    --- 0.8.3-1/.pc/03_branding/section-descriptions 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.3-1ubuntu5/.pc/03_branding/section-descriptions 2016-05-05 22:15:45.000000000 +0000 @@ -0,0 +1,85 @@ +// -*-c++-*- +// +// This file defines the names of sections known by aptitude. You can +// add new sections by adding new entries to the "Top-Sections" list +// and the "Descriptions" tree, and you can cause a translation of +// this file to be selected by providing a translation for +// "aptitude-section-names" in the .po for your language. +// +// Due to bug #260446, double-quotes (") cannot be backslash-escaped. +// For this reason, aptitude treats adjacent pairs of apostrophese('') +// as double-quotes: that is, the string "''" in a section description +// will be rendered as one double quote. No other characters are +// affected by this behavior. + +Aptitude::Sections +{ + Top-Sections { "main"; "contrib"; "non-free"; "non-US"; } + Descriptions { + Unknown "Packages with no declared section\n No section is given for these packages. Perhaps there is an error in the Packages file?"; + Virtual "Virtual packages\n These packages do not exist; they are names other packages use to require or provide some functionality."; + Tasks "Packages which set up your computer to perform a particular task\n Packages in the 'Tasks' section contain no files; they merely depend upon other packages. These packages provide an easy way to select a predefined set of packages for a specialized task."; + + 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."; + 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."; + 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."; + embedded "Programs for embedded systems\n Packages in the 'embedded' section are meant to run on embedded devices. Embedded devices are specialized hardware devices with much less power than a typical desktop system: for instance, a PDA, a cell phone, or a Tivo."; + fonts "Fonts and font utilities\n Packages in the 'fonts' section contain fonts in various formats as well as tools to manage them."; + games "Games, toys, and fun programs\n Packages in the 'games' section are meant primarily for entertainment."; + gnome "The GNOME Desktop Environment\n GNOME is a collection of software which provides an easy-to-use desktop. Packages in the 'gnome' section are part of the GNOME environment or closely integrated into it."; + gnu-r "The GNU R statistical computation and graphics system\n GNU R is a free software environment for statistical computing and graphics. Packages in the 'gnu-r' section contain the GNU R system and many third-party libraries for it."; + gnustep "The GNUstep Environment\n GNUstep is a cross-platform, object-oriented framework for desktop application development. Packages in the 'gnustep' section are part of the GNUstep framework or closely integrated into it."; + graphics "Utilities to create, view, and edit graphics files\n Packages in the 'graphics' section include viewers for image files, image processing and manipulation software, software to interact with graphics hardware (such as video cards, scanners, and digital cameras), and programming tools for handling graphics."; + hamradio "Software for ham radio operators\n Packages in the 'hamradio' section are meant primarily for ham radio operators."; + haskell "Haskell programming language and libraries\n Packages in the 'haskell' section provide the Haskell programming language and many third-party libraries for it. Unless you are a Haskell programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + httpd "Webservers and their modules\n Packages in the 'httpd' section contain Web servers suitable for environments from embedded systems to the largest servers on the Internet."; + interpreters "Interpreters for interpreted languages\n Packages in the 'interpreters' section include interpreters for languages like Lua, Pike, Smalltalk and Tcl, and libraries for these same languages. Some interpreted languages with many libraries like Perl, Python and Ruby have their own sections."; + introspection "Introspection support for programming languages\n Packages in the 'introspection' section provide support for introspection (initially for GObject). Introspection means the capability of some programming languages to allow to examine the type and property information of an object at runtime."; + java "Java programming language and libraries\n Packages in the 'java' section provide the Java programming language and many third-party libraries for it. Unless you are a Java programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + kde "The KDE Desktop Environment\n KDE is a collection of software which provides an easy-to-use desktop. Packages in the 'kde' section are part of the KDE environment or closely integrated into it."; + kernel "Kernel and kernel modules\n Packages in the 'kernel' section provide the core of the operating system. They include the operating system kernel itself, along with extension modules providing features such as support for unusual hardware and support for running virtual machines."; + libdevel "Development files for libraries\n Packages in the 'libdevel' section contain files required for building programs that use libraries in the 'libs' section. You don't need packages from this section unless you want to compile software yourself."; + libs "Collections of software routines\n Packages in the 'libs' section provide necessary functionality for other software on the computer. 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."; + lisp "Lisp programming language and libraries\n Packages in the 'lisp' section provide the Lisp programming language and many third-party libraries for it. Unless you are a Lisp programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + localization "Language packs\n Packages in the 'localization' section contain translations of the included software to different languages.\n.\n Please note that many programs contain translations directly within their package, so if you do not see the appropriate localization package here, there is still a chance the software will be translated to your language anyway."; + mail "Programs to write, send, and route email messages\n Packages in the 'mail' section include mail readers, mail transport daemons, mailing list software, and spam filters, as well as various other software related to electronic mail."; + math "Numeric analysis and other mathematics-related software\n Packages in the 'math' section include calculators, languages for mathematical computation (similar to Mathematica), symbolic algebra packages, and programs to visualize mathematical objects."; + metapackages "Packages which solely depend on other packages\n Packages in the 'metapackages' only depend on other packages, and the section was created in order to help packaging tools to handle them appropriately."; + misc "Miscellaneous software\n Packages in the 'misc' section have too unusual a function to be classified."; + 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."; + 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."; + python "Python programming language and libraries\n Packages in the 'python' section provide the Python programming language and many third-party libraries for it. Unless you are a Python programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + ruby "Ruby programming language and libraries\n Packages in the 'ruby' section provide the Ruby programming language and many third-party libraries for it. Unless you are a Ruby programmer, you don't need to install packages from this section explicitly; the package system will install them if they are required."; + science "Software for scientific work\n Packages in the 'science' section include tools for astronomy, biology, and chemistry, as well as other science-related software."; + shells "Command shells and alternative console environments\n Packages in the 'shells' section include programs providing a command-line interface."; + sound "Utilities to play and record sound\n Packages in the 'sound' section include sound players, recorders, and encoders for many formats, mixers and volume controls, MIDI sequencers and programs to generate musical notation, drivers for sound hardware, and sound processing software."; + tex "The TeX typesetting system\n Packages in the 'tex' section are related to TeX, a system for producing high-quality typeset output. They include TeX itself, TeX packages, editors designed for TeX, utilities to convert TeX and TeX output files to various formats, TeX fonts, and other software related to TeX."; + text "Text processing utilities\n Packages in the 'text' section include text filters and processors, spelling checkers, dictionary programs, utilities to convert between character encodings and text file formats (eg, Unix and DOS), text formatters and pretty-printers, and other software which operates on plain text."; + utils "Various system utilities\n Packages in the 'utils' section are utilities whose purpose is too unique to be classified."; + vcs "Version control systems\n Packages in the 'vcs' section contain software that is used for managing changes to documents, programs, and other computer files, providing a convenient way to retrieve old versions or to track different lines of development."; + video "Utilities to record, view, edit, and stream video files\n Packages in the 'video' section include software to watch video files, DVDs, and TV and video processing and manipulaton software. Using these tools it is possible to build a complete video authoring studio or home multimedia center."; + web "Web browsers, servers, proxies, and other tools\n Packages in the 'web' section include Web browsers, Web servers and proxies, software to write CGI scripts or Web-based programs, pre-written Web-based programs, and other software related to the World Wide Web."; + x11 "The X window system and related software\n Packages in the 'x11' section include the core packages for the X window system, window managers, utility programs for X, and miscellaneous programs with an X GUI which were placed here because they didn't fit anywhere else."; + 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"; + non-US "Programs stored outside the US due to export controls\n Packages in 'non-US' likely contain cryptography; a few implement patented algorithms. Because of this, they cannot be exported from the United States, and hence are stored on a server in the ''free world''.\n .\n Note: the Debian Project is currently merging cryptographic software into the US-based archives after consulting with legal experts about recent changes in export policies. Most packages which were formerly found in this section, therefore, are now in 'main'."; + }; +};
  10. Download patch .pc/applied-patches

    --- 0.8.3-1/.pc/applied-patches 2017-10-31 15:57:20.319689884 +0000 +++ 0.8.3-1ubuntu5/.pc/applied-patches 2017-10-31 15:57:21.215714777 +0000 @@ -0,0 +1,3 @@ +03_branding +04_changelog +14_html2text_preferred
  11. Download patch .pc/03_branding/src/gtk/previewtab.cc
  12. Download patch .pc/04_changelog/src/generic/apt/download_queue.cc
  13. Download patch src/apt_options.cc

    --- 0.8.3-1/src/apt_options.cc 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/src/apt_options.cc 2017-10-31 15:57:21.000000000 +0000 @@ -302,7 +302,7 @@ option_item misc_options[]={ "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 "
  14. Download patch .pc/14_html2text_preferred/doc/html-to-text

    --- 0.8.3-1/.pc/14_html2text_preferred/doc/html-to-text 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.3-1ubuntu5/.pc/14_html2text_preferred/doc/html-to-text 2016-05-05 22:15:45.000000000 +0000 @@ -0,0 +1,11 @@ +#!/bin/bash +# +# Usage: html-to-text input encoding +# +# This is just a layer of indirection so the html-to-text utility can +# be changed in a central location. + +in="$1" +encoding=$2 + +exec elinks -dump -dump-charset $encoding -no-references -no-numbering "$in"
  15. Download patch .pc/04_changelog/src/apt_options.cc
  16. Download patch .pc/04_changelog/src/generic/apt/pkg_changelog.cc
  17. Download patch debian/patches/03_branding

    --- 0.8.3-1/debian/patches/03_branding 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.3-1ubuntu5/debian/patches/03_branding 2016-09-06 12:45:46.000000000 +0000 @@ -0,0 +1,88 @@ +#! /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. + +Index: b/section-descriptions +=================================================================== +--- 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."; +@@ -58,7 +58,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."; +@@ -77,9 +77,10 @@ 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"; +- non-US "Programs stored outside the US due to export controls\n Packages in 'non-US' likely contain cryptography; a few implement patented algorithms. Because of this, they cannot be exported from the United States, and hence are stored on a server in the ''free world''.\n .\n Note: the Debian Project is currently merging cryptographic software into the US-based archives after consulting with legal experts about recent changes in export policies. Most packages which were formerly found in this section, therefore, are now in 'main'."; ++ ++ 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."; + }; + }; +Index: b/src/gtk/previewtab.cc +=================================================================== +--- 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."), +Index: b/src/pkg_grouppolicy.cc +=================================================================== +--- a/src/pkg_grouppolicy.cc ++++ b/src/pkg_grouppolicy.cc +@@ -436,9 +436,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."), +@@ -664,7 +664,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."),
  18. Download patch debian/patches/series

    --- 0.8.3-1/debian/patches/series 2016-08-07 10:53:12.000000000 +0000 +++ 0.8.3-1ubuntu5/debian/patches/series 2016-10-26 23:23:59.000000000 +0000 @@ -0,0 +1,3 @@ +03_branding +04_changelog +14_html2text_preferred
  19. Download patch src/pkg_grouppolicy.cc

    --- 0.8.3-1/src/pkg_grouppolicy.cc 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/src/pkg_grouppolicy.cc 2017-10-31 15:57:21.000000000 +0000 @@ -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."),
  20. Download patch src/gtk/previewtab.cc

    --- 0.8.3-1/src/gtk/previewtab.cc 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/src/gtk/previewtab.cc 2017-10-31 15:57:21.000000000 +0000 @@ -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."),
  21. Download patch src/generic/apt/download_queue.cc

    --- 0.8.3-1/src/generic/apt/download_queue.cc 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/src/generic/apt/download_queue.cc 2017-10-31 15:57:21.000000000 +0000 @@ -870,7 +870,8 @@ namespace aptitude 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);
  22. Download patch src/generic/apt/pkg_changelog.cc

    --- 0.8.3-1/src/generic/apt/pkg_changelog.cc 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/src/generic/apt/pkg_changelog.cc 2017-10-31 15:57:21.000000000 +0000 @@ -580,14 +580,14 @@ namespace aptitude // 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()); } @@ -686,8 +686,7 @@ bool check_valid_origin(const pkgCache:: { if (!vf.File().end() && vf.File().Origin() && - (string("Debian") == vf.File().Origin() || - string("Debian Backports") == vf.File().Origin())) + (string("Ubuntu") == vf.File().Origin())) { return true; }
  23. Download patch section-descriptions

    --- 0.8.3-1/section-descriptions 2016-05-05 22:15:45.000000000 +0000 +++ 0.8.3-1ubuntu5/section-descriptions 2017-10-31 15:57:21.000000000 +0000 @@ -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."; @@ -58,7 +58,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."; @@ -77,9 +77,10 @@ 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"; - non-US "Programs stored outside the US due to export controls\n Packages in 'non-US' likely contain cryptography; a few implement patented algorithms. Because of this, they cannot be exported from the United States, and hence are stored on a server in the ''free world''.\n .\n Note: the Debian Project is currently merging cryptographic software into the US-based archives after consulting with legal experts about recent changes in export policies. Most packages which were formerly found in this section, therefore, are now in 'main'."; + + 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."; }; };
  24. Download patch .pc/04_changelog/src/cmdline/cmdline_changelog.cc
  25. Download patch doc/aptitude-txt.style

    --- 0.8.3-1/doc/aptitude-txt.style 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.3-1ubuntu5/doc/aptitude-txt.style 2017-10-31 15:57:21.000000000 +0000 @@ -0,0 +1,61 @@ + +/* these are the defaults uses in '-style pretty' mode */ + +A.attributes.internal_link = NONE +A.attributes.external_link = NONE + +OL.TYPE = 1 +OL.vspace.before = 1 +OL.vspace.after = 1 +OL.indents = 5 +UL.vspace.before = 1 +UL.vspace.after = 1 +UL.indents = 2 +DL.vspace.before = 1 +DL.vspace.after = 1 +DT.vspace.before = 1 +DIR.vspace.before = 1 +DIR.indents = 2 +MENU.vspace.before = 1 +MENU.vspace.after = 1 +DT.indent = 2 +DD.indent = 6 +I.attributes = UNDERLINE +HR.marker = - +H1.prefix = +H2.prefix = +H3.prefix = +H4.prefix = +H5.prefix = +H6.prefix = +H1.suffix = +H2.suffix = +H3.suffix = +H4.suffix = +H5.suffix = +H6.suffix = +H1.vspace.before = 2 +H2.vspace.before = 1 +H3.vspace.before = 1 +H4.vspace.before = 1 +H5.vspace.before = 1 +H6.vspace.before = 1 +H1.vspace.after = 1 +H2.vspace.after = 1 +H3.vspace.after = 1 +H4.vspace.after = 1 +H5.vspace.after = 1 +H6.vspace.after = 1 +TABLE.vspace.before = 1 +TABLE.vspace.after = 1 +CODE.vspace.before = 0 +CODE.vspace.after = 0 +BLOCKQUOTE.vspace.before = 1 +BLOCKQUOTE.vspace.after = 1 +/*PRE.vspace.before = 1 +PRE.vspace.after = 1*/ +PRE.indent.left = 0 +P.vspace.after = 1 +IMG.replace.noalt = [IMAGE] +IMG.alt.prefix = \ +IMG.alt.suffix = \
  26. Download patch debian/patches/04_changelog

    --- 0.8.3-1/debian/patches/04_changelog 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.3-1ubuntu5/debian/patches/04_changelog 2016-10-26 23:24:18.000000000 +0000 @@ -0,0 +1,81 @@ +#! /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. + +--- a/src/apt_options.cc ++++ b/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 " +--- a/src/cmdline/cmdline_changelog.cc ++++ b/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"); + +--- a/src/generic/apt/pkg_changelog.cc ++++ b/src/generic/apt/pkg_changelog.cc +@@ -580,14 +580,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()); + } +@@ -686,8 +686,7 @@ + { + if (!vf.File().end() && + vf.File().Origin() && +- (string("Debian") == vf.File().Origin() || +- string("Debian Backports") == vf.File().Origin())) ++ (string("Ubuntu") == vf.File().Origin())) + { + return true; + } +--- a/src/view_changelog.cc ++++ b/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; +--- a/src/generic/apt/download_queue.cc ++++ b/src/generic/apt/download_queue.cc +@@ -870,7 +870,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);

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: zsh

zsh (5.2-5ubuntu1) yakkety; urgency=medium * Merge with Debian; remaining changes: -- Matthias Klose <doko@ubuntu.com> Tue, 23 Aug 2016 12:35:26 +0200

Modifications :
  1. Download patch .pc/cross-compile.diff/aczsh.m4
  2. Download patch debian/rules

    --- 5.2-5/debian/rules 2016-05-06 17:40:32.000000000 +0000 +++ 5.2-5ubuntu1/debian/rules 2016-08-23 10:35:26.000000000 +0000 @@ -6,6 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/architecture.mk H_LDFLAGS = $(LDFLAGS) VENDOR=$(shell dpkg-vendor --query vendor | env LC_ALL=C tr A-Z a-z | env LC_ALL=C tr -d -c '[:alnum:]') @@ -68,12 +69,13 @@ build-static: configure-static-stamp build-debug: DEB_BUILD_OPTIONS+=debug build-debug: build -configure: +configure-common-stamp: touch stamp-h.in dh_autotools-dev_updateconfig dh_autoreconf + touch $@ -configure-stamp: configure +configure-stamp: configure-common-stamp dh_testdir chmod 755 configure mkdir -p obj/testhome @@ -81,7 +83,7 @@ configure-stamp: configure sed -e 's/#define VENDOR "pc"/#define VENDOR "$(VENDOR)"/' -i obj/config.h touch $@ -configure-static-stamp: configure +configure-static-stamp: configure-common-stamp dh_testdir mkdir -p obj-static/testhome dh_auto_configure -B obj-static -- $(CONFIGFLAGS) $(STATICFLAGS) @@ -121,6 +123,7 @@ binary-indep: build-indep binary-arch-dy rm -r debian/zsh-common/usr/local # move this to a non-root section; also drop it for cross-compiles +ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) awk '/^#define FPATH_DIR/ { head=$$3; gsub(/"/,"",head); }; \ /^#define FPATH_SUBDIRS/ { $$1=""; $$2=""; gsub(/[" ]/,""); tail=$$0; } \ END { printf "%s/%s\n", head, tail; };' \ @@ -131,6 +134,7 @@ binary-indep: build-indep binary-arch-dy zcompile -U -M $$i.zwc $$i/*~*.zwc(^/); \ chmod 644 $$i.zwc; \ done' +endif # Docs: Info + HTML cd obj && $(MAKE) install.info DESTDIR=$(CURDIR)/debian/zsh-doc
  3. Download patch debian/control

    --- 5.2-5/debian/control 2016-05-07 13:30:51.000000000 +0000 +++ 5.2-5ubuntu1/debian/control 2016-08-23 10:35:26.000000000 +0000 @@ -11,6 +11,7 @@ Build-Depends: autotools-dev, groff, groff-base, libcap-dev [linux-any], + libelf-dev, libncursesw5-dev, libpcre3-dev, texinfo (>= 5~), @@ -18,7 +19,8 @@ Build-Depends: autotools-dev, texlive-latex-base, texlive-latex-recommended, yodl (>= 3.08.01) | yodl (<< 3.08.00) -Maintainer: Debian Zsh Maintainers <pkg-zsh-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Zsh Maintainers <pkg-zsh-devel@lists.alioth.debian.org> Uploaders: Michael Prokop <mika@debian.org>, Axel Beckert <abe@debian.org>, Frank Terbeck <ft@bewatermyfriend.org>,
  4. Download patch .pc/applied-patches

    --- 5.2-5/.pc/applied-patches 2016-08-23 14:06:57.093850364 +0000 +++ 5.2-5ubuntu1/.pc/applied-patches 2016-08-23 14:06:57.589863861 +0000 @@ -1,3 +1,4 @@ further-mitigate-test-suite-hangs.patch update-apt-completion-808317.patch fix-aptitude-completion-for-0.7.5-807906.patch +cross-compile.diff
  5. Download patch debian/clean

    --- 5.2-5/debian/clean 2016-01-24 16:19:30.000000000 +0000 +++ 5.2-5ubuntu1/debian/clean 2016-08-23 10:35:26.000000000 +0000 @@ -2,16 +2,17 @@ config.cache config.status config.status.lineno configure -Doc/help.txt -Doc/help/* -Doc/zsh.idx -Doc/Zsh/manmodmenu.yo -Doc/Zsh/modlist.yo -Doc/Zsh/modmenu.yo -Doc/version.yo -Doc/zsh*.1 -Doc/zsh.texi -META-FAQ +#Doc/help.txt +#Doc/help/* +./Doc/zsh.idx +#Doc/Zsh/manmodmenu.yo +#Doc/Zsh/modlist.yo +#Doc/Zsh/modmenu.yo +#Doc/version.yo +#Doc/zsh*.1 +#Doc/zsh.texi +#META-FAQ build-arch build-indep stamp-h.in +config.h.in
  6. Download patch debian/patches/cross-compile.diff

    --- 5.2-5/debian/patches/cross-compile.diff 1970-01-01 00:00:00.000000000 +0000 +++ 5.2-5ubuntu1/debian/patches/cross-compile.diff 2016-08-23 10:35:26.000000000 +0000 @@ -0,0 +1,64 @@ +Description: Adjust cross-compile fallback values to yes. +Origin: commit, revision id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt +Author: Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com> +Last-Update: 2012-12-20 +X-Bzr-Revision-Id: dmitrijs.ledkovs@canonical.com-20121220153357-amh2d7kzw5d314mt + +=== modified file 'aczsh.m4' +--- old/aczsh.m4 2009-09-08 17:04:03 +0000 ++++ new/aczsh.m4 2012-12-20 15:33:57 +0000 +@@ -171,7 +171,7 @@ + } + ], [zsh_cv_shared_$1=yes], + [zsh_cv_shared_$1=no], +-[zsh_cv_shared_$1=no] ++[zsh_cv_shared_$1=yes] + ) + else + zsh_cv_shared_$1=no +@@ -242,7 +242,7 @@ + } + ], [zsh_cv_sys_dynamic_clash_ok=yes], + [zsh_cv_sys_dynamic_clash_ok=no], +-[zsh_cv_sys_dynamic_clash_ok=no] ++[zsh_cv_sys_dynamic_clash_ok=yes] + ) + else + zsh_cv_sys_dynamic_clash_ok=no +@@ -315,7 +315,7 @@ + } + ], [zsh_cv_sys_dynamic_rtld_global=yes], + [zsh_cv_sys_dynamic_rtld_global=no], +-[zsh_cv_sys_dynamic_rtld_global=no] ++[zsh_cv_sys_dynamic_rtld_global=yes] + ) + else + zsh_cv_sys_dynamic_rtld_global=no +@@ -384,7 +384,7 @@ + int fred () { return 42; } + ], [zsh_cv_sys_dynamic_execsyms=yes], + [zsh_cv_sys_dynamic_execsyms=no], +-[zsh_cv_sys_dynamic_execsyms=no] ++[zsh_cv_sys_dynamic_execsyms=yes] + ) + LDFLAGS=$save_ldflags + else +@@ -457,7 +457,7 @@ + int fred () { return 42; } + ], [zsh_cv_sys_dynamic_strip_exe=yes], + [zsh_cv_sys_dynamic_strip_exe=no], +-[zsh_cv_sys_dynamic_strip_exe=no] ++[zsh_cv_sys_dynamic_strip_exe=yes] + ) + LDFLAGS=$save_ldflags + else +@@ -522,7 +522,7 @@ + } + ], [zsh_cv_sys_dynamic_strip_lib=yes], + [zsh_cv_sys_dynamic_strip_lib=no], +-[zsh_cv_sys_dynamic_strip_lib=no] ++[zsh_cv_sys_dynamic_strip_lib=yes] + ) + else + zsh_cv_sys_dynamic_strip_lib=no +
  7. Download patch aczsh.m4

    --- 5.2-5/aczsh.m4 2015-12-02 18:55:11.000000000 +0000 +++ 5.2-5ubuntu1/aczsh.m4 2016-08-23 14:06:57.000000000 +0000 @@ -171,7 +171,7 @@ main() } ], [zsh_cv_shared_$1=yes], [zsh_cv_shared_$1=no], -[zsh_cv_shared_$1=no] +[zsh_cv_shared_$1=yes] ) else zsh_cv_shared_$1=no @@ -242,7 +242,7 @@ main() } ], [zsh_cv_sys_dynamic_clash_ok=yes], [zsh_cv_sys_dynamic_clash_ok=no], -[zsh_cv_sys_dynamic_clash_ok=no] +[zsh_cv_sys_dynamic_clash_ok=yes] ) else zsh_cv_sys_dynamic_clash_ok=no @@ -315,7 +315,7 @@ main() } ], [zsh_cv_sys_dynamic_rtld_global=yes], [zsh_cv_sys_dynamic_rtld_global=no], -[zsh_cv_sys_dynamic_rtld_global=no] +[zsh_cv_sys_dynamic_rtld_global=yes] ) else zsh_cv_sys_dynamic_rtld_global=no @@ -384,7 +384,7 @@ main() int fred () { return 42; } ], [zsh_cv_sys_dynamic_execsyms=yes], [zsh_cv_sys_dynamic_execsyms=no], -[zsh_cv_sys_dynamic_execsyms=no] +[zsh_cv_sys_dynamic_execsyms=yes] ) LDFLAGS=$save_ldflags else @@ -457,7 +457,7 @@ main() int fred () { return 42; } ], [zsh_cv_sys_dynamic_strip_exe=yes], [zsh_cv_sys_dynamic_strip_exe=no], -[zsh_cv_sys_dynamic_strip_exe=no] +[zsh_cv_sys_dynamic_strip_exe=yes] ) LDFLAGS=$save_ldflags else @@ -522,7 +522,7 @@ main() } ], [zsh_cv_sys_dynamic_strip_lib=yes], [zsh_cv_sys_dynamic_strip_lib=no], -[zsh_cv_sys_dynamic_strip_lib=no] +[zsh_cv_sys_dynamic_strip_lib=yes] ) else zsh_cv_sys_dynamic_strip_lib=no
  8. Download patch debian/patches/series

    --- 5.2-5/debian/patches/series 2016-05-06 19:24:10.000000000 +0000 +++ 5.2-5ubuntu1/debian/patches/series 2016-08-23 10:35:26.000000000 +0000 @@ -1,3 +1,4 @@ further-mitigate-test-suite-hangs.patch update-apt-completion-808317.patch fix-aptitude-completion-for-0.7.5-807906.patch +cross-compile.diff
  9. Download patch debian/source/options

    --- 5.2-5/debian/source/options 2016-01-24 16:19:30.000000000 +0000 +++ 5.2-5ubuntu1/debian/source/options 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -extend-diff-ignore='^(Util/difflog\.pl|configure|config\.h\.in|stamp-h\.in|config\.log|Doc/(version.yo|zsh.*\.1|zsh.texi|Zsh/(man)?mod(list|menu)\.yo)|META-FAQ)$'
  10. Download patch debian/zshrc

    --- 5.2-5/debian/zshrc 2016-05-06 17:40:32.000000000 +0000 +++ 5.2-5ubuntu1/debian/zshrc 2016-08-23 10:35:26.000000000 +0000 @@ -102,3 +102,11 @@ zstyle ':completion:*:sudo:*' command-pa (( ${+aliases[run-help]} )) && unalias run-help autoload -Uz run-help + +# If you don't want compinit called here, place the line +# skip_global_compinit=1 +# in your $ZDOTDIR/.zshenv or $ZDOTDIR/.zprofile +if [[ -z "$skip_global_compinit" ]]; then + autoload -U compinit + compinit +fi
  1. aptitude
  2. zsh