diff options
| author | Colin Watson <cjwatson@debian.org> | 2007-11-29 10:23:56 (GMT) |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2007-11-29 10:23:56 (GMT) |
| commit | 9fb668b43be46493044428e3c310d37649b4506f (patch) | |
| tree | 46cf436232ae2022c159937c72cb9de4609fd16c | |
| parent | fb27c1082474c20a843046b4402d842dc05b96d8 (diff) | |
| download | debootstrap-9fb668b43be46493044428e3c310d37649b4506f.zip debootstrap-9fb668b43be46493044428e3c310d37649b4506f.tar.gz debootstrap-9fb668b43be46493044428e3c310d37649b4506f.tar.bz2 | |
* 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
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/debootstrap-udeb.dirs | 2 | ||||
| -rw-r--r-- | debian/debootstrap.dirs | 2 |
4 files changed, 10 insertions, 5 deletions
@@ -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 <fjp@debian.org> 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 |