From 339690e4250de4d3eb8e98a91223420c01a5af96 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 Aug 2005 15:52:18 +0000 Subject: * merged with matts tree Patches applied: * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * apt@packages.debian.org/apt--main--0--patch-98 Install only one keyring on each branch (Closes: #316119) * apt@packages.debian.org/apt--main--0--patch-99 Finalize 0.6.39 * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9dd271619..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: optional +Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Section: admin -- cgit v1.2.3-70-g09d2 From 31efb9e8e894932ce88218c9aebfd4048d81658c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 1 Aug 2005 16:06:04 +0000 Subject: * build debian and ubuntu package from the same source --- debian/control | 2 +- debian/rules | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6d9418a46..9a58f9ef4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) +Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12), lsb-release, dpatch Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt diff --git a/debian/rules b/debian/rules index b3f72bb7f..0787c0c8b 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,9 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +# apt can be build from the same source on debian and ubuntu +DIST = $(shell lsb_release -i -s) + # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) @@ -111,7 +114,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp +build/build-stamp: build/configure-stamp patch # Add here commands to compile the package. $(MAKE) binary touch $@ @@ -121,7 +124,7 @@ build/build-doc-stamp: build/configure-stamp $(MAKE) doc touch $@ -clean: +clean: unpatch dh_testdir # dh_testroot -$(MAKE) clean @@ -331,6 +334,17 @@ cvs-mkul: -mkdir -p ../upload-$(APT_DEBVER) cp `find debian/cvs-build -maxdepth 1 -type f` ../upload-$(APT_DEBVER) +patch: patch-stamp +patch-stamp: + cp debian/patches/00list.$(DIST) debian/patches/00list + dpatch apply-all + touch patch-stamp + +unpatch: + cp debian/patches/00list.$(DIST) debian/patches/00list + dpatch deapply-all + rm -rf patch-stamp debian/patched + arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) -- cgit v1.2.3-70-g09d2 From dc2cd7d5c4889a6cc09b5a5a9eb35c74f86c2712 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2005 22:38:27 +0000 Subject: * removed the lsb_release build patch (nobody except me seems to like it) --- debian/control | 2 +- debian/patches/00list.Debian | 0 debian/patches/00list.Ubuntu | 1 - debian/patches/01_ubuntu_archive_key.dpatch | 40 ----------------------------- debian/rules | 18 ++----------- 5 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 debian/patches/00list.Debian delete mode 100644 debian/patches/00list.Ubuntu delete mode 100755 debian/patches/01_ubuntu_archive_key.dpatch (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9a58f9ef4..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12), lsb-release, dpatch +Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt diff --git a/debian/patches/00list.Debian b/debian/patches/00list.Debian deleted file mode 100644 index e69de29bb..000000000 diff --git a/debian/patches/00list.Ubuntu b/debian/patches/00list.Ubuntu deleted file mode 100644 index 472282c73..000000000 --- a/debian/patches/00list.Ubuntu +++ /dev/null @@ -1 +0,0 @@ -01_ubuntu_archive_key diff --git a/debian/patches/01_ubuntu_archive_key.dpatch b/debian/patches/01_ubuntu_archive_key.dpatch deleted file mode 100755 index 4eb5bbccd..000000000 --- a/debian/patches/01_ubuntu_archive_key.dpatch +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ubuntu_archive_key.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: use the ubuntu archive key (instead of the debian one) - -@DPATCH@ -diff -urNad --exclude=CVS --exclude=.svn ./cmdline/apt-key /tmp/dpep-work.o4yrSO/apt--mvo/cmdline/apt-key ---- ./cmdline/apt-key 2005-06-26 22:41:36.000000000 +0200 -+++ /tmp/dpep-work.o4yrSO/apt--mvo/cmdline/apt-key 2005-08-01 17:59:56.000000000 +0200 -@@ -9,14 +9,14 @@ - GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg" - - --ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg --REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg -+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg -+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg - - - update() { - if [ ! -f $ARCHIVE_KEYRING ]; then - echo >&2 "ERROR: Can't find the archive-keyring" -- echo >&2 "Is the debian-keyring package installed?" -+ echo >&2 "Is the ubuntu-keyring package installed?" - exit 1 - fi - -diff -urNad --exclude=CVS --exclude=.svn ./debian/apt.postinst /tmp/dpep-work.o4yrSO/apt--mvo/debian/apt.postinst ---- ./debian/apt.postinst 2005-06-26 22:41:36.000000000 +0200 -+++ /tmp/dpep-work.o4yrSO/apt--mvo/debian/apt.postinst 2005-08-01 18:00:23.000000000 +0200 -@@ -17,7 +17,7 @@ - configure) - - if ! test -f /etc/apt/trusted.gpg; then -- cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg -+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg - fi - - ;; diff --git a/debian/rules b/debian/rules index 0787c0c8b..b3f72bb7f 100755 --- a/debian/rules +++ b/debian/rules @@ -17,9 +17,6 @@ export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -# apt can be build from the same source on debian and ubuntu -DIST = $(shell lsb_release -i -s) - # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) @@ -114,7 +111,7 @@ build/configure-stamp: configure cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags) touch $@ -build/build-stamp: build/configure-stamp patch +build/build-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary touch $@ @@ -124,7 +121,7 @@ build/build-doc-stamp: build/configure-stamp $(MAKE) doc touch $@ -clean: unpatch +clean: dh_testdir # dh_testroot -$(MAKE) clean @@ -334,17 +331,6 @@ cvs-mkul: -mkdir -p ../upload-$(APT_DEBVER) cp `find debian/cvs-build -maxdepth 1 -type f` ../upload-$(APT_DEBVER) -patch: patch-stamp -patch-stamp: - cp debian/patches/00list.$(DIST) debian/patches/00list - dpatch apply-all - touch patch-stamp - -unpatch: - cp debian/patches/00list.$(DIST) debian/patches/00list - dpatch deapply-all - rm -rf patch-stamp debian/patched - arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) -- cgit v1.2.3-70-g09d2 From 468155b77499bf1ecbfe29a318768d07a7a33919 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 19 Oct 2005 19:50:11 +0000 Subject: * seting section to "admin" to match override file --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6d9418a46..4aa7b5aa2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ 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, gnupg -Section: base +Section: admin 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 -- cgit v1.2.3-70-g09d2