summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-01-13 17:22:27 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-01-13 17:22:27 +0100
commit38d602dc83006c51dfe4ed594d691ea9b0679498 (patch)
treeb7aedfba82c44cad6c3012f879b5d6d7e8ad1425 /data
parent12cf58d12b969010f3d98b2974d72bbb950b775f (diff)
parent614897f798d9f16591fbd29ebe2a6c5674102d2d (diff)
downloadpython-apt-38d602dc83006c51dfe4ed594d691ea9b0679498.tar.gz
* apt/*.py:
- Almost complete cleanup of the code - Remove inconsistent use of tabs and spaces (Closes: #505443) - Improved documentation * apt/debfile.py: - Drop get*() methods, as they are deprecated and were never in a stable release - Make DscSrcPackage working * apt/gtk/widgets.py: - Fix the code and document the signals * Introduce new documentation build with Sphinx - Contains style Guide (Closes: #481562) - debian/rules: Build the documentation here - setup.py: Remove pydoc building and add new docs. - debian/examples: Include examples from documentation - debian/python-apt.docs: + Change html/ to build/doc/html. + Add build/doc/text for the text-only documentation * setup.py: - Only create build/data when building, not all the time - Remove build/mo and build/data on clean -a * debian/control: - Remove the Conflicts on python2.3-apt, python2.4-apt, as they are only needed for oldstable (sarge) - Build-Depend on python-sphinx (>= 0.5) * aptsources/distinfo.py: - Allow @ in mirror urls (Closes: #478171) (LP: #223097) * Merge Ben Finney's whitespace changes (Closes: #481563) * Merge Ben Finney's do not use has_key() (Closes: #481878) * Do not use deprecated form of raise statement (Closes: #494259) * Add support for PkgRecords.SHA256Hash (Closes: #456113)
Diffstat (limited to 'data')
-rw-r--r--data/templates/Debian.info.in2
-rw-r--r--data/templates/Ubuntu.info.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in
index dd040c20..5f4486d5 100644
--- a/data/templates/Debian.info.in
+++ b/data/templates/Debian.info.in
@@ -30,7 +30,7 @@ RepositoryType: deb
BaseURI: http://http.us.debian.org/debian/
MatchURI: ftp[0-9]*\.[a-z]\.debian\.org
MirrorsFile: /usr/share/python-apt/templates/Debian.mirrors
-_Description: Debian 4.0 'Etch'
+_Description: Debian 4.0 'Etch'
Component: main
_CompDescription: Officially supported
Component: contrib
diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 67180bcb..0adb8e67 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -354,7 +354,7 @@ _CompDescription: Community-maintained (universe)
_CompDescriptionLong: Community-maintained Open Source software
Component: restricted
_CompDescription: Non-free drivers
-_CompDescriptionLong: Proprietary drivers for devices
+_CompDescriptionLong: Proprietary drivers for devices
Component: multiverse
_CompDescription: Restricted software (Multiverse)
_CompDescriptionLong: Software restricted by copyright or legal issues