diff options
| -rw-r--r-- | data/templates/Debian.info.in | 25 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | po/python-apt.pot | 29 |
3 files changed, 44 insertions, 12 deletions
diff --git a/data/templates/Debian.info.in b/data/templates/Debian.info.in index b9f70940..21b07608 100644 --- a/data/templates/Debian.info.in +++ b/data/templates/Debian.info.in @@ -1,5 +1,30 @@ _ChangelogURI: http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog +Suite: wheezy +RepositoryType: deb +BaseURI: http://http.us.debian.org/debian/ +MatchURI: ftp[0-9]*\.([a-z]*\.){0,1}debian\.org +MirrorsFile: Debian.mirrors +_Description: Debian 7.0 'Wheezy' +Component: main +_CompDescription: Officially supported +Component: contrib +_CompDescription: DFSG-compatible Software with Non-Free Dependencies +Component: non-free +_CompDescription: Non-DFSG-compatible Software + +Suite: wheezy-proposed-updates +RepositoryType: deb +ParentSuite: wheezy +_Description: Proposed updates + +Suite: wheezy/updates +RepositoryType: deb +BaseURI: http://security.debian.org/ +MatchURI: security\.debian\.org +ParentSuite: wheezy +_Description: Security updates + Suite: squeeze RepositoryType: deb BaseURI: http://http.us.debian.org/debian/ diff --git a/debian/changelog b/debian/changelog index 92507eed..2ee2a17b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ python-apt (0.8.6) UNRELEASED; urgency=low - exec apt-key, otherwise we ignore the return value * debian/control: - Build-depend on fakeroot, needed for the apt.auth tests + * data/templates/Debian.info.in: + - Add wheezy -- Michael Vogt <mvo@debian.org> Mon, 25 Jun 2012 13:41:02 +0200 diff --git a/po/python-apt.pot b/po/python-apt.pot index d6ac301e..940cd13a 100644 --- a/po/python-apt.pot +++ b/po/python-apt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-12 10:44+0200\n" +"POT-Creation-Date: 2012-06-25 14:31+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -284,7 +284,7 @@ msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:149 +#: ../data/templates/Ubuntu.info.in:1203 ../data/templates/Debian.info.in:174 msgid "Officially supported" msgstr "" @@ -356,56 +356,61 @@ msgstr "" #. Description #: ../data/templates/Debian.info.in:8 -msgid "Debian 6.0 'Squeeze' " +msgid "Debian 7.0 'Wheezy' " msgstr "" #. Description #: ../data/templates/Debian.info.in:33 -msgid "Debian 5.0 'Lenny' " +msgid "Debian 6.0 'Squeeze' " msgstr "" #. Description #: ../data/templates/Debian.info.in:58 -msgid "Debian 4.0 'Etch'" +msgid "Debian 5.0 'Lenny' " msgstr "" #. Description #: ../data/templates/Debian.info.in:83 +msgid "Debian 4.0 'Etch'" +msgstr "" + +#. Description +#: ../data/templates/Debian.info.in:108 msgid "Debian 3.1 'Sarge'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:94 +#: ../data/templates/Debian.info.in:119 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:101 +#: ../data/templates/Debian.info.in:126 msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:108 +#: ../data/templates/Debian.info.in:133 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:121 +#: ../data/templates/Debian.info.in:146 msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:147 +#: ../data/templates/Debian.info.in:172 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:151 +#: ../data/templates/Debian.info.in:176 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:153 +#: ../data/templates/Debian.info.in:178 msgid "Non-DFSG-compatible Software" msgstr "" |