summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2009-01-10 22:13:17 +0100
committerJulien Cristau <jcristau@debian.org>2009-01-10 22:13:17 +0100
commit47e54545ed7fa852b45b2eab9e4bff3c954c0799 (patch)
tree6e727232802e3d94b9259ba4aa7d628617ad18a0
parent54885ff0ad9ba39a5e165dd19858d217826fc88f (diff)
Delete some now unused code from debian/rules.
-rw-r--r--debian/changelog1
-rwxr-xr-xdebian/rules4
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e182e873237..03c2d8b4048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ mesa (7.3~rc1-1) UNRELEASED; urgency=low
* Merge packaging changes from unstable, from 7.0.3-5 to 7.0.3-7.
* Delete unused configs/debian-*, and install-source.sh script. We've
switched to using autoconf, and mesa-swx11-source is gone.
+ * Delete some now unused code from debian/rules.
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Dec 2008 01:38:42 +0200
diff --git a/debian/rules b/debian/rules
index b289a48e7c6..120319e8db4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
DEB_BUILD_DIR ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
@@ -30,9 +29,6 @@ else
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-export DEB_BUILD_ARCH
-export DEB_HOST_ARCH_CPU
-
# choose which configurations to build
include debian/scripts/choose-configs