From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 30 Apr 2014 10:38:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'holger/master'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2abf893fb1e71d50a7b77609d29ddaa13e319170;hp=b445fededbbc2893d6bbd2df749ded19d1ca9e66;p=dsa-metapackages.git

Merge remote-tracking branch 'holger/master'

* holger/master:
  Add python-distro-info for piuparts*.debian.org
---

diff --git a/debian/changelog b/debian/changelog
index a8a22e3..c6a07ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 debian.org (55) UNRELEASED; urgency=low
 
+  [ Peter Palfrader ]
   * 
 
+  [ Holger Levsen ]
+  * piuparts*.debian.org:
+    + python-distro-info
+
  -- Peter Palfrader <weasel@debian.org>  Mon, 31 Mar 2014 10:38:15 +0200
 
 debian.org (54) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 3a77907..8835271 100644
--- a/debian/control
+++ b/debian/control
@@ -826,6 +826,7 @@ Depends: debhelper,
 	tango-icon-theme,
 	screen,
 	python-apt,
+	python-distro-info,
 	xz-utils,
 	python-yaml,
 	devscripts, libsoap-lite-perl
@@ -846,6 +847,7 @@ Depends: debhelper,
 	screen,
 	python-debian,
 	python-apt,
+	python-distro-info,
 	adequate
 Description: metapackage for piuparts-slave.debian.org
  This package depends on all the packages that are needed for the