[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.44-755-ga3ab31d

[Holger Levsen]

The following commit has been merged in the piatti branch:
commit e45c3cfc22d5a60ddc35b10f2c7260f30f8e05f5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jun 18 10:37:02 2012 +0000

    cleanup dependencies

diff --git a/debian/changelog b/debian/changelog
index 60d2e97..7c6750d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ piuparts (0.45) UNRELEASED; urgency=low
   * Merge piatti.git into piuparts.git, so that piatti.git has become obsolete
     now. Update documentation accordingly.
   * Further split packaging into piuparts-master, piuparts-slave and 
-    piuparts-common binary packages. (Closes: #585861)
+    piuparts-common binary packages (Closes: #585861) and cleanup
+    dependencies.
   * Update piuparts.NEWS about master+slave packages.
 
   [ David Steele ]
diff --git a/debian/control b/debian/control
index 864dc99..669710a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,9 @@ X-Python-Version: >= 2.6
 
 Package: piuparts
 Architecture: all
-Depends: ${python:Depends}, debootstrap, lsof, lsb-release,
-    python-debian, ${misc:Depends}, python-debianbts, python-apt
+Depends: ${python:Depends}, ${misc:Depends},
+    debootstrap, lsof, lsb-release,
+    python-debian, python-apt
 Suggests: schroot
 Description: .deb package installation, upgrading, and removal testing tool
  piuparts tests that .deb packages (as used by Debian) handle
@@ -29,7 +30,11 @@ Description: .deb package installation, upgrading, and removal testing tool
 
 Package: piuparts-master
 Architecture: all
-Depends: ${python:Depends}, piuparts (>= 0.45), apache2, ${misc:Depends}, openssh-server, screen, adduser, piuparts-common
+Depends: ${python:Depends}, ${misc:Depends},
+    python-debianbts,
+    apache2,
+    openssh-server, adduser,
+    piuparts-common, piuparts (>= 0.45)
 Recommends: python-rpy, ghostscript
 Breaks: piuparts (<= 0.44)
 Replaces: piuparts (<= 0.44)
@@ -42,7 +47,10 @@ Description: piuparts master components
 
 Package: piuparts-slave
 Architecture: all
-Depends: ${python:Depends}, piuparts (>= 0.45), ${misc:Depends}, openssh-client, screen, adduser, piuparts-common
+Depends: ${python:Depends}, ${misc:Depends},
+    screen,
+    openssh-client, adduser,
+    piuparts-common, piuparts (>= 0.45)
 Suggests: schroot
 Description: piuparts slave components
  A master/slave piuparts server, along the lines of

-- 
piuparts git repository