Merge branch 'master' of http://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 1c83784691ae9b00351afcc805a585d49a1ef911..d373af634d3f128cbe405d4cf7993d531c8b7f7f 100644 (file)
--- 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 fe7132e47570523d23c55f2a89ff3320064c539c..e6b12c9a9c1f7f577c3e8f7a892ef105d30e7ddd 100644 (file)
--- 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 <joerg@debian.org>  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 <weasel@debian.org>  Sun, 21 Feb 2010 17:22:03 +0100
+
 debian.org (31) stable; urgency=low
 
   [ Martin Zobel-Helas ]