summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-08-10 12:00:42 (GMT)
committerColin Watson <cjwatson@debian.org>2011-08-10 12:00:42 (GMT)
commitd7cccc36a992184ea59690342b767d4633d04d52 (patch)
tree11bb68e6d25c31f21ad6c69046e9fd2abf2836fa
parent5eb2f3dfcf3c3d87fba71800cebffcac9b85ef93 (diff)
downloaddebootstrap-d7cccc36a992184ea59690342b767d4633d04d52.zip
debootstrap-d7cccc36a992184ea59690342b767d4633d04d52.tar.gz
debootstrap-d7cccc36a992184ea59690342b767d4633d04d52.tar.bz2
Don't build devices.tar.gz if building on GNU/kFreeBSD (closes: #637297).
-rw-r--r--Makefile4
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
3 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a389191..6f70f35 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog)
MAKEDEV := /sbin/MAKEDEV
-ifneq ($(shell uname),GNU)
+ifeq ($(shell uname),Linux)
all: devices.tar.gz
else
all:
@@ -25,7 +25,7 @@ install:
chown root:root $(DESTDIR)/usr/sbin/debootstrap
chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
-ifneq ($(shell uname),GNU)
+ifeq ($(shell uname),Linux)
install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
endif
diff --git a/debian/changelog b/debian/changelog
index 38988e7..d48ee53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debootstrap (1.0.35) UNRELEASED; urgency=low
+
+ [ Robert Millan ]
+ * Don't build devices.tar.gz if building on GNU/kFreeBSD (closes:
+ #637297).
+
+ -- Colin Watson <cjwatson@debian.org> Wed, 10 Aug 2011 12:59:44 +0100
+
debootstrap (1.0.34) unstable; urgency=low
* Add more information regarding the version and architecture in case
diff --git a/debian/control b/debian/control
index 0ccbcf4..016773b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: extra
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>
-Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) [!hurd-i386]
+Build-Depends: debhelper (>= 7.0.50), makedev (>= 2.3.1-69) [linux-any]
Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=d-i/debootstrap.git
Vcs-Git: git://git.debian.org/d-i/debootstrap.git