From 782486e8219705249d9096c79638bd85b930522d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:12:32 +0200 Subject: initial librarification push --- debian/control | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6d0f16b70..1bad67e0a 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,6 @@ Architecture: any Pre-Depends: ${shlibs:Depends} Depends: debian-archive-keyring, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) -Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg @@ -27,6 +26,20 @@ Description: Advanced front-end for dpkg APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. +Package: libapt-pkg4.10 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: apt (<< 0.8.15) +Description: Library for apt + This package contains the library used by apt. + +Package: libapt-inst1.2 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: apt-utils (<< 0.8.15) +Description: Install library for apt + This package contains the inst library used by apt. + Package: apt-doc Architecture: all Priority: optional -- cgit v1.2.3 From bd5e34e8cf0673248a3ab386c25b062247f10370 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:59:07 +0200 Subject: remove -l from dh_shlibdeps, that is no longer needed with recent shlibdeps --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1bad67e0a..f4e874201 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev +Depends: libapt-pkg4.10, libapt-inst1.2, ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@ -74,7 +74,6 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: ${libapt-inst:provides} Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. -- cgit v1.2.3 From 08c9b19106097fda61ab2df703c68a65131277a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 18:18:06 +0200 Subject: fix lintian issues --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index f4e874201..9aefcde8d 100644 --- a/debian/control +++ b/debian/control @@ -28,14 +28,14 @@ Description: Advanced front-end for dpkg Package: libapt-pkg4.10 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt (<< 0.8.15) Description: Library for apt This package contains the library used by apt. Package: libapt-inst1.2 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt-utils (<< 0.8.15) Description: Install library for apt This package contains the inst library used by apt. @@ -52,7 +52,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: libapt-pkg4.10, libapt-inst1.2, ${misc:Depends}, zlib1g-dev | zlib-dev +Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for -- cgit v1.2.3 From 2cc4999b21d6a4db4e6e08fd3bb760b6030d38cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 14:48:57 +0200 Subject: generate debiandencies for libapt-pkg-dev automatically via deb-substvars --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9aefcde8d..cf7be1ee5 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev +Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for -- cgit v1.2.3 From 92ea25520e6beed1ed6f74620023f42efd4cdc28 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 15 Jun 2011 17:21:41 +0200 Subject: * debian/control: - fix incorrect Replaces (closes: #630204) for libapt-inst1.2 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index cf7be1ee5..ea7946133 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Description: Library for apt Package: libapt-inst1.2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: apt-utils (<< 0.8.15) +Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) Description: Install library for apt This package contains the inst library used by apt. -- cgit v1.2.3 From a0088ddd5a6924445eb5716c955aa332ab9362a9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jun 2011 21:49:52 +0200 Subject: * debian/control: - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214) --- debian/control | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index ea7946133..82d54d9b1 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,7 @@ Package: libapt-pkg4.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt (<< 0.8.15) +Breaks: apt (<< 0.8.15~exp3) Description: Library for apt This package contains the library used by apt. @@ -37,6 +38,7 @@ Package: libapt-inst1.2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) +Breaks: apt (<< 0.8.15~exp3), apt-utils (<< 0.8.15~exp3) Description: Install library for apt This package contains the inst library used by apt. -- cgit v1.2.3 From d2f828a93c72a3925a70e285ae304f272ff12ce8 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 17 Jun 2011 22:27:53 +0200 Subject: use depends for the ${shlibs:Depends} to make the breaks work --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 82d54d9b1..92ce204ac 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,7 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ Package: apt Architecture: any -Pre-Depends: ${shlibs:Depends} -Depends: debian-archive-keyring, ${misc:Depends}, gnupg +Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg Replaces: manpages-pl (<< 20060617-3~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -- cgit v1.2.3 From 33ee638a051927e4eed0ed7fb5d4837c83fcd104 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 22 Jun 2011 10:54:28 +0200 Subject: * debian/control: - modernize package description (closes: #624618) --- debian/control | 44 ++++++++++++++++++++++++++++++++------------ 1 file changed, 32 insertions(+), 12 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 92ce204ac..b6b8641ec 100644 --- a/debian/control +++ b/debian/control @@ -17,29 +17,48 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg Replaces: manpages-pl (<< 20060617-3~) Conflicts: python-apt (<< 0.7.93.2~) 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. +Description: Debian's advanced package tool + APT provides mechanisms for package management tasks like searching, + querying and managing deb packages from one or more package + repoistories. . - APT features complete installation ordering, multiple source capability - and several other unique features, see the Users Guide in apt-doc. + It supports: + * searching for package information; + * resolving package install requests, finding the appropriate + version in the archives; + * fetching packages along with all their required dependencies; + * authenticating the sources and validating the retrieved data; + * installing and removing packages on a working system. + . + It also provides various terminal-based tools on its own: + * apt-get for managing packages and retrieval of information + * apt-cache for querying available information + * 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 is also highly configurable and can be extended to support + additional protocols. Package: libapt-pkg4.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt (<< 0.8.15) Breaks: apt (<< 0.8.15~exp3) -Description: Library for apt - This package contains the library used by apt. +Description: Package search and manipulation library for apt + This package contains the libapt_pkg library that is used by apt. + I exposes functionality for use by higher-level interfaces like + aptitude, synaptic, python-apt and others. Package: libapt-inst1.2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) Breaks: apt (<< 0.8.15~exp3), apt-utils (<< 0.8.15~exp3) -Description: Install library for apt - This package contains the inst library used by apt. +Description: Deb package format query and manipulation library for apt + This package contains the libapt_inst library used by apt-utils to + query deb packages for information. Its used by apt-ftparchive, + python-apt and others. Package: apt-doc Architecture: all @@ -47,8 +66,9 @@ Priority: optional Depends: ${misc:Depends} Section: doc 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 the + advanced package tool APT. Both a html and a text version are + included. Package: libapt-pkg-dev Architecture: any -- cgit v1.2.3 From b463a73a03a50d886edef176fbdb5827e675d64b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Jun 2011 10:26:46 +0100 Subject: merge updated description from David, many thanks --- debian/control | 83 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 37 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index b6b8641ec..59c92640a 100644 --- a/debian/control +++ b/debian/control @@ -17,48 +17,51 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg Replaces: manpages-pl (<< 20060617-3~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt -Description: Debian's advanced package tool - APT provides mechanisms for package management tasks like searching, - querying and managing deb packages from one or more package - repoistories. +Description: APT's commandline package manager + This package provides commandline tools for searching and + managing as well as querying information about packages + as a low-level access to all features of the libapt-pkg library. . - It supports: - * searching for package information; - * resolving package install requests, finding the appropriate - version in the archives; - * fetching packages along with all their required dependencies; - * authenticating the sources and validating the retrieved data; - * installing and removing packages on a working system. - . - It also provides various terminal-based tools on its own: - * apt-get for managing packages and retrieval of information - * apt-cache for querying available information + 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 is also highly configurable and can be extended to support - additional protocols. Package: libapt-pkg4.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt (<< 0.8.15) Breaks: apt (<< 0.8.15~exp3) -Description: Package search and manipulation library for apt - This package contains the libapt_pkg library that is used by apt. - I exposes functionality for use by higher-level interfaces like - aptitude, synaptic, python-apt and others. +Description: APT's package managment runtime library + This library provides the common functionality for searching and + managing packages as well as information about packages. + 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). Package: libapt-inst1.2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) Breaks: apt (<< 0.8.15~exp3), apt-utils (<< 0.8.15~exp3) -Description: Deb package format query and manipulation library for apt - This package contains the libapt_inst library used by apt-utils to - query deb packages for information. Its used by apt-ftparchive, - python-apt and others. +Description: APT's deb package format runtime library + This library provides methods to query and extract information + from deb packages. This includes the control data and the package + file content. Package: apt-doc Architecture: all @@ -66,9 +69,8 @@ Priority: optional Depends: ${misc:Depends} Section: doc Description: Documentation for APT - This package contains the user guide and offline guide, for the - advanced package tool APT. Both a html and a text version are - included. + This package contains the user guide and offline guide for various + APT tools which are provided in a html and a text-only version. Package: libapt-pkg-dev Architecture: any @@ -96,17 +98,24 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: APT utility programs - This package contains some APT utility programs such as apt-ftparchive, - apt-sortpkgs and apt-extracttemplates. + 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 Package - and other index files. apt-sortpkgs is a Package/Source 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 Depends: ${shlibs:Depends}, ${misc:Depends} Priority: optional -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: https download transport for APT + This package enables the usage of 'deb https://foo distro main' lines + in the /etc/apt/sources.list so that all package managers using the + 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 + with certificates. -- cgit v1.2.3 From b167bd3959c80d8cc9edfaca647949f99ed122a5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Jun 2011 10:31:00 +0100 Subject: debian/control: update breaks for the final upload --- debian/control | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 59c92640a..bd5c110fb 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,10 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode Standards-Version: 3.9.2 -Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen +Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/ @@ -36,7 +39,7 @@ Package: libapt-pkg4.10 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt (<< 0.8.15) -Breaks: apt (<< 0.8.15~exp3) +Breaks: apt (<< 0.8.15) Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -57,7 +60,7 @@ Package: libapt-inst1.2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) -Breaks: apt (<< 0.8.15~exp3), apt-utils (<< 0.8.15~exp3) +Breaks: apt (<< 0.8.15), apt-utils (<< 0.8.15) Description: APT's deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package -- cgit v1.2.3 From e83b74be1cf5b1d6fee826e30daaed9db04f1fd6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jun 2011 13:00:03 +0100 Subject: remove no longer needed replaces for libapt-pkg4.11 and libapt-inst1.3 --- debian/control | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 8d85b48e8..d014dfdab 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,6 @@ Description: APT's commandline package manager Package: libapt-pkg4.11 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: apt (<< 0.8.15) Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -58,7 +57,6 @@ Description: APT's package managment runtime library Package: libapt-inst1.3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: apt-utils (<< 0.8.15), apt (<< 0.8.15) Description: APT's deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package -- cgit v1.2.3