From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 30 Jul 2011 09:28:02 +0000 (+0200)
Subject: Merge remote branch 'aba/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4860096f712127dc5ce79202d44afe80a9195bc7;hp=5f23fabb1456b8f7cd7d00b347a60420a0a53699;p=dsa-metapackages.git

Merge remote branch 'aba/master'

* aba/master:
  add python3.1 to debian.org-release.debian.org
---

diff --git a/debian/changelog b/debian/changelog
index 41b457c..d05eef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debian.org (44+aba1) unstable; urgency=low
+
+  * add python3.1 for release.debian.org
+
+ -- Andreas Barth <aba@not.so.argh.org>  Sat, 30 Jul 2011 09:22:27 +0000
+
 debian.org (44) unstable; urgency=low
 
   [ Peter Palfrader ]
diff --git a/debian/control b/debian/control
index 4547c2d..1df052f 100644
--- a/debian/control
+++ b/debian/control
@@ -386,7 +386,8 @@ Depends: edos-debcheck,
 	libapt-pkg-dev,
 	dpkg-dev,
 	procmail,
-	rrdtool
+	rrdtool,
+        python3.1
 Description: metapackage for release
  This package depends on everything that is needed for a release.debian.org
  setup.