* removed the lsb_release build patch (nobody except me seems to like it)

diff --git a/debian/control b/debian/control
index 9a58f9ef4beba3c5908c0bc8cf296a63e35669f9..6d9418a46b541d2b46c6f42478557037f3d467a3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 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 (file)
index e69de29..0000000

diff --git a/debian/patches/00list.Ubuntu b/debian/patches/00list.Ubuntu
deleted file mode 100644 (file)
index 472282c..0000000
--- 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 (executable)
index 4eb5bbc..0000000
--- 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  <egon@localhost.localdomain>
-##
-## 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 0787c0c8b8a515645c38b4f3d90492dc57fd9db3..b3f72bb7f52dd5a4d228daccba7025fbe0c8fec4 100755 (executable)
--- 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)