* Merged from the mvo branch

[apt.git] / debian / control

diff --git a/debian/control b/debian/control
index f747210d1914319012418771c650201376934efb..9d15d21332d1b6433167b08ea4b2382a15a2f5c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,24 @@
 Source: apt
 Section: admin
 Priority: important
 Source: apt
 Section: admin
 Priority: important

-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>

 Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
 Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,

- Luca Bruno <lethalman88@gmail.com>, Eugene V. Lyubimkin <jackyf.devel@gmail.com>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto
-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
+ Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, intltool
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu

 
 Package: apt
 Architecture: any
 
 Package: apt
 Architecture: any

-Depends: ${shlibs:Depends}, debian-archive-keyring
+Depends: ${shlibs:Depends}

 Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}

-Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
-Section: admin
-Description: advanced front-end for dpkg
+Recommends: ubuntu-keyring
+Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
+Description: Advanced front-end for dpkg

  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a 
  simpler, safer way to install and upgrade packages.
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a 
  simpler, safer way to install and upgrade packages.


@@ -30,7 +31,7 @@ Architecture: all
 Priority: optional
 Replaces: apt (<< 0.5.4.9)
 Section: doc
 Priority: optional
 Replaces: apt (<< 0.5.4.9)
 Section: doc

-Description: documentation for APT
+Description: Documentation for APT

  This package contains the user guide and offline guide, for APT, an
  Advanced Package Tool.
 
  This package contains the user guide and offline guide, for APT, an
  Advanced Package Tool.
 


@@ -39,7 +40,7 @@ Architecture: any
 Priority: optional
 Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}
 Section: libdevel
 Priority: optional
 Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}
 Section: libdevel

-Description: development files for APT's libapt-pkg and libapt-inst
+Description: Development files for APT's libapt-pkg and libapt-inst

  This package contains the header files and libraries for
  developing with APT's libapt-pkg Debian package manipulation
  library and the libapt-inst deb/tar/ar library.
  This package contains the header files and libraries for
  developing with APT's libapt-pkg Debian package manipulation
  library and the libapt-inst deb/tar/ar library.


@@ -48,17 +49,15 @@ Package: libapt-pkg-doc
 Architecture: all
 Priority: optional
 Section: doc
 Architecture: all
 Priority: optional
 Section: doc

-Description: documentation for APT development
+Description: Documentation for APT development

  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
 
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}
  This package contains documentation for development of the APT
  Debian package manipulation program and its libraries.
 
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}

-Priority: important

 Provides: ${libapt-inst:provides}
 Replaces: apt (<< 0.5.9)
 Provides: ${libapt-inst:provides}
 Replaces: apt (<< 0.5.9)

-Section: admin

 Description: APT utility programs
  This package contains some APT utility programs such as apt-ftparchive,
  apt-sortpkgs and apt-extracttemplates.
 Description: APT utility programs
  This package contains some APT utility programs such as apt-ftparchive,
  apt-sortpkgs and apt-extracttemplates.


@@ -71,7 +70,6 @@ Package: apt-transport-https
 Architecture: any
 Depends: ${shlibs:Depends}
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}
 Priority: optional

-Section: admin

 Description: APT https transport
  This package contains a APT https transport. It makes it possible to
  use 'deb https://foo distro main' lines in the sources.list.
 Description: APT https transport
  This package contains a APT https transport. It makes it possible to
  use 'deb https://foo distro main' lines in the sources.list.