summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index f330532d8..da6e8ea6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apt (0.5.26) unstable; urgency=low
- French update from Christian Perrier <bubulle@debian.org> (Closes: #248614)
* Update apt-get(8) to reflect the fact that APT::Get::Only-Source will
affect apt-get build-dep as well as apt-get source
+ * Remove aborted remnants of a different method of implementing DEB_BUILD_OPTIONS
+ from debian/rules
--
diff --git a/debian/rules b/debian/rules
index 0ba6efab8..f54334fd9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Made with the aid of dh_make, by Craig Small
# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
# Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.67 2004/05/08 19:57:31 mdz Exp $
+# $Id: rules,v 1.68 2004/05/30 18:21:43 mdz Exp $
# LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
# dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -106,7 +106,7 @@ build/configure-stamp: configure
dh_testdir
-mkdir build
cp COPYING debian/copyright
- cd build && CXXFLAGS="$(confcxxflags)" ../configure $(confflags)
+ cd build && ../configure $(confflags)
touch $@
build/build-stamp: build/configure-stamp