summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2013-10-21 20:46:42 +0200
committerJulian Andres Klode <jak@debian.org>2013-10-21 20:46:42 +0200
commit736a440e8a1292dff825abd4843ee7a29e7f192a (patch)
tree8df3dcdd95e63eb2b09078b0fac48d36aa5ebb8d
parent247bdb9c62efb2f7d68c71a18e84addda3aec7bc (diff)
downloadpython-apt-736a440e8a1292dff825abd4843ee7a29e7f192a.tar.gz
data/templates/Ubuntu.info.in: Add "Trusty Thar"
A copy from saucy, with name and numbers adjusted
-rw-r--r--data/templates/Ubuntu.info.in119
-rw-r--r--debian/changelog2
2 files changed, 121 insertions, 0 deletions
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 314ba053..a6e94eb0 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -107,6 +107,125 @@ MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
_Description: Unsupported updates
+Suite: trusty
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 14.04 'Trusty Thar'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported free and open-source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained free and open-source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+ParentComponent: universe
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: trusty
+ParentSuite: trusty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 14.04 'Trusty Thar'
+
+Suite: trusty
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*14.04
+MatchURI: cdrom:\[Ubuntu.*14.04
+_Description: Cdrom with Ubuntu 14.04 'Trusty Thar'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: trusty
+Official: false
+RepositoryType: deb
+BaseURI: http://archive.canonical.com
+MatchURI: archive.canonical.com
+_Description: Canonical Partners
+Component: partner
+_CompDescription: Software packaged by Canonical for their partners
+_CompDescriptionLong: This software is not part of Ubuntu.
+
+Suite: trusty
+Official: false
+RepositoryType: deb
+BaseURI: http://extras.ubuntu.com
+MatchURI: extras.ubuntu.com
+_Description: Independent
+Component: main
+_CompDescription: Provided by third-party software developers
+_CompDescriptionLong: Software offered by third party developers.
+
+Suite: trusty-security
+ParentSuite: trusty
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: trusty-security
+ParentSuite: trusty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports|security.ubuntu.com
+_Description: Important security updates
+
+Suite: trusty-updates
+ParentSuite: trusty
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: trusty-updates
+ParentSuite: trusty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: trusty-proposed
+ParentSuite: trusty
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: trusty-proposed
+ParentSuite: trusty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: trusty-backports
+ParentSuite: trusty
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: trusty-backports
+ParentSuite: trusty
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+
Suite: saucy
RepositoryType: deb
BaseURI: http://ports.ubuntu.com/ubuntu-ports/
diff --git a/debian/changelog b/debian/changelog
index 5bbaa6e8..2bf4852d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ python-apt (0.9.0) UNRELEASED; urgency=low
- Update examples to the new API (Closes: #639022)
* tests/old/*.py:
- Update to new API as well
+ * data/templates/Ubuntu.info.in:
+ - Add "Trusty Thar"
[ Jeremy Bicha ]
* data/templates/Ubuntu.info.in: add 'devel' series (Closes: #722961)