From 1dea08eb2e1115b8da14cc3da02d53f8e069ba14 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 May 2013 17:45:17 +0200 Subject: properly handle if-modfied-since with libcurl/https (closes: #705648) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 50b3599fc..4a73239f7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Julian Andres Klode Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, - gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), + gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml -- cgit v1.2.3-70-g09d2 From 1af6a591aeadb837b76d89dace9badf2d4fe5a0d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 14:22:12 +0200 Subject: moved to git, updated gbp.conf to match the bzr version --- debian/changelog | 3 +++ debian/control | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 6ccbd37c4..f6ff44578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ apt (0.9.8.1) UNRELEASED; urgency=low * apt-pkg/indexcopy.cc: - non-inline RunGPGV methods to restore ABI compatibility with previous versions to fix partial upgrades (Closes: #707771) + + [ Michael Vogt ] + * moved to git, updated gbp.conf to match the bzr version -- David Kalnischkies Sat, 11 May 2013 09:53:59 +0200 diff --git a/debian/control b/debian/control index 6507f6d6d..1c32783ab 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml 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: http://git.debian.org/apt/apt.git +Vcs-Browser: http://git.debian.org/apt/apt.git Package: apt Architecture: any -- cgit v1.2.3-70-g09d2 From 572bad27ab2bbd8d643c81049f6596ed2b423166 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 16 May 2013 19:45:25 +0200 Subject: Update Vcs fields Use the canonical URLs. Rename Vcs-Bzr to Vcs-Git and use the more efficient git protocol instead of http. Point Vcs-Browser to the gitweb interface. --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1c32783ab..7730c2491 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, po4a (>= 0.34-2), autotools-dev, autoconf, automake Build-Depends-Indep: doxygen, debiandoc-sgml Build-Conflicts: autoconf2.13, automake1.4 -Vcs-Bzr: http://git.debian.org/apt/apt.git -Vcs-Browser: http://git.debian.org/apt/apt.git +Vcs-Git: git://anonscm.debian.org/apt/apt.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any -- cgit v1.2.3-70-g09d2 From 0571cdfc967d0876dab332aaf04fab21077496e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 18:36:50 +0200 Subject: correct management-typo in description found by lintian --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7730c2491..29d67d765 100644 --- a/debian/control +++ b/debian/control @@ -43,7 +43,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: apt (<< 0.9.4~) Section: libs -Description: package managment runtime library +Description: package management 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. @@ -107,9 +107,9 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xz-utils -Description: package managment related utility programs +Description: package management related utility programs This package contains some less used commandline utilities related - to package managment with APT. + to package management with APT. . * apt-extracttemplates is used by debconf to prompt for configuration questions before installation. -- cgit v1.2.3-70-g09d2 From ee7ddf1294fca70088f8dcc15bf87323870bd417 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 26 Jul 2013 19:13:55 +0200 Subject: implement debian/rules build-{arch,indep} as required by policy 3.9.4 --- debian/control | 2 +- debian/rules | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 29d67d765..ca18ff01f 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: APT Development Team Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~), zlib1g-dev, libbz2-dev, xsltproc, docbook-xsl, docbook-xml, diff --git a/debian/rules b/debian/rules index 05dcf813c..4686f569d 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 -build: build/build-stamp +build-binary: build/build-binary-stamp build-debiandoc: build/build-debiandoc-stamp build-manpages: build/build-manpages-stamp @@ -84,7 +84,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp +build/build-binary-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary # compat symlink for the locale split @@ -120,7 +120,6 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. libapt-pkg-doc: build-debiandoc dh_testdir -p$@ @@ -172,9 +171,8 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. -binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build build-manpages +apt: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -220,7 +218,7 @@ apt: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg-dev: build debian/libapt-pkg-dev.install +libapt-pkg-dev: build-binary debian/libapt-pkg-dev.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -240,7 +238,7 @@ libapt-pkg-dev: build debian/libapt-pkg-dev.install dh_builddeb -p$@ apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates -apt-utils: build build-manpages +apt-utils: build-binary build-manpages dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -269,7 +267,7 @@ apt-utils: build build-manpages dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install +$(LIBAPT_PKG): build-binary debian/$(LIBAPT_PKG).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -288,7 +286,7 @@ $(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install dh_md5sums -p$@ dh_builddeb -p$@ -$(LIBAPT_INST): build debian/$(LIBAPT_INST).install +$(LIBAPT_INST): build-binary debian/$(LIBAPT_INST).install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -307,7 +305,7 @@ $(LIBAPT_INST): build debian/$(LIBAPT_INST).install dh_md5sums -p$@ dh_builddeb -p$@ -apt-transport-https: build libapt-pkg-dev +apt-transport-https: build-binary libapt-pkg-dev dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -333,10 +331,12 @@ apt-transport-https: build libapt-pkg-dev configure: $(MAKE) configure -really-clean: clean - -find . -name Makefile.in -print0 | xargs --null --no-run-if-empty -- rm -f - find -name ChangeLog | xargs rm -f - rm -f l33ch-stamp - +# translate targets to targets required by debian-policy +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https +binary-indep: apt-doc libapt-pkg-doc binary: binary-indep binary-arch +build-arch: build-binary +build-indep: build-manpages build-debiandoc +build: build-indep build-arch + .PHONY: build clean binary-indep binary-arch binary -- cgit v1.2.3-70-g09d2