merged from debian-sid

2 files changed, 29 insertions, 25 deletions

diff --git a/debian/changelog b/debian/changelog
index bf1b2d962..f9a824163 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-apt (0.8.15~exp4) UNRELEASED; urgency=low
+apt (0.8.15) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
+  * Catalan translation update (Jordi Mallach). Closes: #630657
+
+  [ Michael Vogt ]
   * debian/control:
     - modernize package description (closes: #624618)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Jun 2011 10:52:00 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2011 10:38:02 +0100
 
 apt (0.8.15~exp3) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index bd5c110fb..512a132f6 100644
--- a/debian/control
+++ b/debian/control
@@ -26,14 +26,14 @@ Description: APT's commandline package manager
  as a low-level access to all features of the libapt-pkg library.
  .
  These include:
- * apt-get for retrieval of packages and information about them
-   from authenticated sources and for installation, upgrade and
-   removal of packages together with their dependencies
- * apt-cache for querying available information about installed
-   as well as installable packages
- * apt-cdrom to use removable media as a source for packages
- * apt-config as an interface to the configuration settings
- * apt-key as an interface to manage authentication keys
+  * apt-get for retrieval of packages and information about them
+    from authenticated sources and for installation, upgrade and
+    removal of packages together with their dependencies
+  * apt-cache for querying available information about installed
+    as well as installable packages
+  * apt-cdrom to use removable media as a source for packages
+  * apt-config as an interface to the configuration settings
+  * apt-key as an interface to manage authentication keys
 
 Package: libapt-pkg4.10
 Architecture: any
@@ -46,15 +46,15 @@ Description: APT's package managment runtime library
  Higher-level package managers can depend upon this library.
  .
  This includes:
- * retrieval of information about packages from multiple sources
- * retrieval of packages and all dependent packages
-   needed to satisfy a request either through an internal
-   solver or by interfacing with an external one
- * authenticating the sources and validating the retrieved data
- * installation and removal of packages in the system
- * providing different transports to retrieve data over cdrom, ftp,
-   http, rsh as well as an interface to add more transports like
-   https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
+  * retrieval of information about packages from multiple sources
+  * retrieval of packages and all dependent packages
+    needed to satisfy a request either through an internal
+    solver or by interfacing with an external one
+  * authenticating the sources and validating the retrieved data
+  * installation and removal of packages in the system
+  * providing different transports to retrieve data over cdrom, ftp,
+    http, rsh as well as an interface to add more transports like
+    https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
 
 Package: libapt-inst1.2
 Architecture: any
@@ -104,11 +104,11 @@ Description: APT utility programs
  This package contains some less used commandline utilities related
  to package managment with APT.
  .
- * apt-extracttemplates is used by debconf to prompt for configuration
-   questions before installation.
- * apt-ftparchive is used to create Packages and other index files
-   needed to publish an archive of debian packages
- * apt-sortpkgs is a Packages/Sources file normalizer.
+  * apt-extracttemplates is used by debconf to prompt for configuration
+    questions before installation.
+  * apt-ftparchive is used to create Packages and other index files
+    needed to publish an archive of debian packages
+  * apt-sortpkgs is a Packages/Sources file normalizer.
 
 Package: apt-transport-https
 Architecture: any
@@ -120,5 +120,5 @@ Description: https download transport for APT
  libapt-pkg library can access metadata and packages available in sources
  accessable over https (Hypertext Transfer Protocol Secure).
  .
- This transports supports server as well as client authenification
+ This transport supports server as well as client authenification
  with certificates.