* merge from Ubuntu:

  - data/templates/Ubuntu.info.in: add "Saucy Salamander" to
  - debian/control: add "Multi-Arch: allowed"

3 files changed, 127 insertions, 9 deletions

diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 567456b3..9de9d75f 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -1,5 +1,124 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: saucy
+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 13.10 'Saucy Salamander'
+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: saucy
+ParentSuite: saucy
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Ubuntu 13.10 'Saucy Salamander'
+
+Suite: saucy
+RepositoryType: deb
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*13.10
+MatchURI: cdrom:\[Ubuntu.*13.10
+_Description: Cdrom with Ubuntu 13.10 'Saucy Salamander'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: saucy
+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: saucy
+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: saucy-security
+ParentSuite: saucy
+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: saucy-security
+ParentSuite: saucy
+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: saucy-updates
+ParentSuite: saucy
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: saucy-updates
+ParentSuite: saucy
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Recommended updates
+
+Suite: saucy-proposed
+ParentSuite: saucy
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: saucy-proposed
+ParentSuite: saucy
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Pre-released updates
+
+Suite: saucy-backports
+ParentSuite: saucy
+RepositoryType: deb
+_Description: Unsupported updates
+
+Suite: saucy-backports
+ParentSuite: saucy
+RepositoryType: deb-src
+BaseURI: http://archive.ubuntu.com/ubuntu/
+MatchURI: archive.ubuntu.com/ubuntu|ports.ubuntu.com/ubuntu-ports
+_Description: Unsupported updates
+
+
 Suite: raring
 RepositoryType: deb
 BaseURI: http://ports.ubuntu.com/ubuntu-ports/
diff --git a/debian/changelog b/debian/changelog
index eb4a1b36..d1cc10ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 python-apt (0.8.9.2) UNRELEASED; urgency=low
 
-  * some fixes from a coverity scan run
+  * some fixes from the "coverity" scan
+  * merge from Ubuntu:
+    - data/templates/Ubuntu.info.in: add "Saucy Salamander" to 
+    - debian/control: add "Multi-Arch: allowed"
 
  -- Michael Vogt <mvo@debian.org>  Mon, 05 Aug 2013 22:55:02 +0200
 
@@ -91,14 +94,6 @@ python-apt (0.8.9~exp1) experimental; urgency=low
   
  -- Michael Vogt <mvo@debian.org>  Wed, 13 Mar 2013 18:36:37 +0100
 
-python-apt (0.8.8.3) UNRELEASED; urgency=low
-
-  * aptsources/distro.py:
-    - include the missing ID in the NoDistroTemplateException() error,
-      thanks to Brian Murray
-
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Apr 2013 18:37:24 +0200
-
 python-apt (0.8.8.2) unstable; urgency=low
 
   [ David Prévot ]
diff --git a/debian/control b/debian/control
index 945d49d5..ea80e940 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ XS-Testsuite: autopkgtest
 
 Package: python-apt
 Architecture: any
+Multi-Arch: allowed
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
 Recommends: lsb-release, iso-codes, xz-utils
 Breaks: packagekit-backend-apt (<= 0.4.8-0ubuntu4),
@@ -88,6 +89,7 @@ Description: Python interface to libapt-pkg (API documentation)
 Package: python-apt-dbg
 Priority: extra
 Architecture: any
+Multi-Arch: allowed
 Section: debug
 Depends: python-dbg, python-apt (= ${binary:Version}), ${shlibs:Depends},
          ${misc:Depends}
@@ -130,6 +132,7 @@ Description: Python interface to libapt-pkg (locales)
 Package: python3-apt
 Priority: optional
 Architecture: any
+Multi-Arch: allowed
 Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-apt-common
 Recommends: lsb-release, iso-codes
 Provides: ${python3:Provides}
@@ -152,6 +155,7 @@ Description: Python 3 interface to libapt-pkg
 Package: python3-apt-dbg
 Priority: extra
 Architecture: any
+Multi-Arch: allowed
 Section: debug
 Breaks: python-apt (<< 0.7.98+nmu1)
 Replaces: python-apt (<< 0.7.98+nmu1)