From 9fb668b43be46493044428e3c310d37649b4506f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 29 Nov 2007 10:23:56 +0000 Subject: * Partially revert r50134; there are people who depend on being able to use the "upstream" Makefile on non-Debian systems. Create necessary directories in the Makefile rather than relying on dh_installdirs to do it (LP: #172645). r50279 --- Makefile | 4 +++- debian/changelog | 7 +++++++ debian/debootstrap-udeb.dirs | 2 -- debian/debootstrap.dirs | 2 -- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 debian/debootstrap-udeb.dirs delete mode 100644 debian/debootstrap.dirs diff --git a/Makefile b/Makefile index 4388ffb..622ce33 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,9 @@ clean: DSDIR=$(DESTDIR)/usr/share/debootstrap install: - # Dirs are created by dh_installdirs + mkdir -p $(DSDIR)/scripts + mkdir -p $(DESTDIR)/usr/sbin + install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/ install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/ install -o root -g root -m 0644 functions $(DSDIR)/ diff --git a/debian/changelog b/debian/changelog index 43608fc..74034e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,14 @@ debootstrap (1.0.8) UNRELEASED; urgency=low + [ Frans Pop ] * Change Priority for the udeb to extra in line with overrides file. + [ Colin Watson ] + * Partially revert r50134; there are people who depend on being able to + use the "upstream" Makefile on non-Debian systems. Create necessary + directories in the Makefile rather than relying on dh_installdirs to do + it (LP: #172645). + -- Frans Pop Thu, 15 Nov 2007 10:04:33 +0100 debootstrap (1.0.7) unstable; urgency=low diff --git a/debian/debootstrap-udeb.dirs b/debian/debootstrap-udeb.dirs deleted file mode 100644 index 8884784..0000000 --- a/debian/debootstrap-udeb.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -usr/share/debootstrap/scripts diff --git a/debian/debootstrap.dirs b/debian/debootstrap.dirs deleted file mode 100644 index 8884784..0000000 --- a/debian/debootstrap.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -usr/share/debootstrap/scripts -- cgit v0.12