From: Michael Vogt Date: Mon, 28 Nov 2011 11:29:44 +0000 (+0100) Subject: merged from debian-experimental2 X-Git-Tag: 0.9.13.exp1ubuntu1~116 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/384a3a5c5a233e28923d642baf92d15071705635?ds=inline;hp=-c merged from debian-experimental2 --- 384a3a5c5a233e28923d642baf92d15071705635 diff --combined debian/control index 28d9dd839,03d74c51f..d7e295243 --- a/debian/control +++ b/debian/control @@@ -1,8 -1,7 +1,8 @@@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode @@@ -10,15 -9,14 +10,15 @@@ Standards-Version: 3.9. Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.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 + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, + gcc-4.6 (>= 4.6.0-6ubuntu2) 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/ +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu +Vcs-Browser: http://code.launchpad.net/apt/ubuntu Package: apt Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg +Depends: ubuntu-keyring, ${shlibs:Depends}, ${misc:Depends}, 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 @@@ -37,20 -35,11 +37,11 @@@ Description: APT's commandline package * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys - Package: libapt-common - Architecture: all - Multi-Arch: foreign - Depends: ${misc:Depends} - Breaks: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) - Replaces: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) - Description: Common files for APT libraries - This package includes translation files common to APT library packages. - Package: libapt-pkg4.12 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} - Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common + Depends: ${shlibs:Depends}, ${misc:Depends} Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@@ -71,7 -60,7 +62,7 @@@ Package: libapt-inst1. Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} - Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common + Depends: ${shlibs:Depends}, ${misc:Depends} 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 diff --combined debian/rules index ce9c7e6cc,4ef5bb47a..234114d5d --- a/debian/rules +++ b/debian/rules @@@ -3,9 -3,6 +3,9 @@@ # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. # Some lines taken from debmake, by Christoph Lameter. +# build in verbose mode by default to make it easy to diangose issues +export NOISY=1 + export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@@ -128,25 -125,8 +128,8 @@@ clean debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ - binary-indep: libapt-common apt-doc libapt-pkg-doc + binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. - libapt-common: build - dh_testdir -p$@ - dh_testroot -p$@ - dh_prep -p$@ - dh_installdirs -p$@ - - dh_install -p$@ --sourcedir=$(BLD) - dh_installdocs -p$@ - dh_installchangelogs -p$@ - dh_strip -p$@ - dh_compress -p$@ - dh_fixperms -p$@ - dh_installdeb -p$@ - dh_gencontrol -p$@ - dh_md5sums -p$@ - dh_builddeb -p$@ - libapt-pkg-doc: build-doc dh_testdir -p$@ dh_testroot -p$@ @@@ -208,8 -188,6 +191,8 @@@ apt: build build-do # apt install # cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove + cp debian/apt.conf.changelog debian/$@/etc/apt/apt.conf.d/20changelog + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ # make rosetta happy and remove pot files in po/ (but leave stuff # in po/domains/* untouched) and cp *.po into each domain dir