From: Peter Palfrader Date: Sun, 28 Feb 2010 16:22:16 +0000 (+0100) Subject: Merge branch 'master' of http://kosh.ganneff.de/~joerg/debian.org X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=427c0aa36c6849fa5a83658b65c6a9c727a27da9;hp=5759f409a5de57b913bceaa7cb8bc9591b466b89;p=dsa-metapackages.git Merge branch 'master' of kosh.ganneff.de/~joerg/debian.org * 'master' of http://kosh.ganneff.de/~joerg/debian.org: Add a changelog entry python instead of python2.4. editor extensions are unwanted mc is already in -recommends No more gpgv Fixup apt-utils depends Add a first version for an ftpmaster.d.o metapackage Update the planet.debian.org metapackage Conflicts: debian/changelog --- diff --git a/Makefile b/Makefile index 1c83784..d373af6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ build: install: + install -d -m 755 $(DESTDIR)/usr/bin install -d -m 755 $(DESTDIR)/usr/sbin install -m755 upgrade-porter-chroots $(DESTDIR)/usr/sbin install -m755 apache2-vhost-update $(DESTDIR)/usr/sbin diff --git a/debian/changelog b/debian/changelog index fe7132e..e6b12c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -debian.org (32) stable; urgency=low +debian.org (XX) XXable; urgency=low [ Joerg Jaspert] * Update the planet.debian.org metapackage, adding timeout, @@ -7,6 +7,12 @@ debian.org (32) stable; urgency=low -- Joerg Jaspert Sat, 27 Feb 2010 11:54:20 +0100 +debian.org (32) stable; urgency=low + + * Fix install target of Makefile to deal with usr/bin. + + -- Peter Palfrader Sun, 21 Feb 2010 17:22:03 +0100 + debian.org (31) stable; urgency=low [ Martin Zobel-Helas ]