diff options
| -rw-r--r-- | data/templates/Ubuntu.info.in | 52 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 30 insertions, 26 deletions
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in index 9e62c0fa..3a9562f4 100644 --- a/data/templates/Ubuntu.info.in +++ b/data/templates/Ubuntu.info.in @@ -13,10 +13,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 12.04 'Precise Pangolin' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -131,10 +131,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 11.10 'Oneiric Ocelot' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -250,10 +250,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 11.04 'Natty Narwhal' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -368,10 +368,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.10 'Maverick Meerkat' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -451,10 +451,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 10.04 'Lucid Lynx' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -514,10 +514,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.10 'Karmic Koala' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -577,10 +577,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 9.04 'Jaunty Jackalope' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -639,10 +639,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.10 'Intrepid Ibex' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -703,10 +703,10 @@ MirrorsFile-i386: Ubuntu.mirrors _Description: Ubuntu 8.04 'Hardy Heron' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -768,10 +768,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.10 'Gutsy Gibbon' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -832,10 +832,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 7.04 'Feisty Fawn' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -893,10 +893,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.10 'Edgy Eft' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices @@ -954,10 +954,10 @@ MirrorsFile: Ubuntu.mirrors _Description: Ubuntu 6.06 LTS 'Dapper Drake' Component: main _CompDescription: Officially supported -_CompDescriptionLong: Canonical-supported Open Source software +_CompDescriptionLong: Canonical-supported free and open-source software Component: universe _CompDescription: Community-maintained (universe) -_CompDescriptionLong: Community-maintained Open Source software +_CompDescriptionLong: Community-maintained free and open-source software Component: restricted _CompDescription: Non-free drivers _CompDescriptionLong: Proprietary drivers for devices diff --git a/debian/changelog b/debian/changelog index 6e750980..7150adf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,10 @@ python-apt (0.8.2) UNRELEASED; urgency=low to get output from require_changes and missing_deps (closes: #624379) + [ Nikola Pavlović ] + * fixed a typo, changed "Open Source software" to + "free and open-source software" (LP: #500940) + -- Michael Vogt <mvo@debian.org> Wed, 19 Oct 2011 18:03:42 +0200 python-apt (0.8.1) unstable; urgency=low |