[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-757-g6cc004e

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 0efcd2439ca3e6bc7ff1e55ffe2a0bd7d102e020
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Jun 18 16:35:05 2012 +0200

    run wrap-and-sort -a -s
    
    to make debian/control better readable
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/control b/debian/control
index 58cc3ae..230186e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,17 @@
 Source: piuparts
 Maintainer: piuparts developers team <piuparts-devel at lists.alioth.debian.org>
-Uploaders: Holger Levsen <holger at debian.org>
+Uploaders:
+ Holger Levsen <holger at debian.org>
 Section: devel
 Priority: extra
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>=7), python (>=2.6.6-3~)
-Build-Depends-Indep: asciidoc, xmlto, git
+Build-Depends:
+ debhelper (>=7),
+ python (>=2.6.6-3~)
+Build-Depends-Indep:
+ asciidoc,
+ git,
+ xmlto
 Homepage: http://piuparts.debian.org
 Vcs-Git: git://anonscm.debian.org/piuparts/piuparts.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git
@@ -13,10 +19,16 @@ X-Python-Version: >= 2.6
 
 Package: piuparts
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
-    debootstrap, lsof, lsb-release,
-    python-debian, python-apt
-Suggests: schroot
+Depends:
+ debootstrap,
+ lsb-release,
+ lsof,
+ python-apt,
+ python-debian,
+ ${misc:Depends},
+ ${python:Depends}
+Suggests:
+ schroot
 Description: .deb package installation, upgrading, and removal testing tool
  piuparts tests that .deb packages (as used by Debian) handle
  installation, upgrading, and removal correctly. It does this by
@@ -30,14 +42,22 @@ Description: .deb package installation, upgrading, and removal testing tool
 
 Package: piuparts-master
 Architecture: all
-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)
+Depends:
+ adduser,
+ apache2,
+ openssh-server,
+ piuparts (>= 0.45),
+ piuparts-common,
+ python-debianbts,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends:
+ ghostscript,
+ python-rpy
+Breaks:
+ piuparts (<= 0.44)
+Replaces:
+ piuparts (<= 0.44)
 Description: piuparts master components
  piuparts is meant as a quality assurance tool for people who create .deb
  packages to test them before they upload them to the Debian package archive.
@@ -50,11 +70,16 @@ Description: piuparts master components
 
 Package: piuparts-slave
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends},
-    screen,
-    openssh-client, adduser,
-    piuparts-common, piuparts (>= 0.45)
-Suggests: schroot
+Depends:
+ adduser,
+ openssh-client,
+ piuparts (>= 0.45),
+ piuparts-common,
+ screen,
+ ${misc:Depends},
+ ${python:Depends}
+Suggests:
+ schroot
 Description: piuparts slave components
  piuparts is meant as a quality assurance tool for people who create .deb
  packages to test them before they upload them to the Debian package archive.
@@ -66,11 +91,13 @@ Description: piuparts slave components
 
 Package: piuparts-common
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-apt
+Depends:
+ python-apt,
+ ${misc:Depends},
+ ${python:Depends}
 Description: common piuparts components
  piupartslib, common library used by piuparts-master, -reports, -analyze and
  -slave.
  .
  See http://piuparts.debian.org or the piuparts package to learn more about
  piuparts.
-
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
index 23741c1..2b393d2 100644
--- a/debian/piuparts-master.install
+++ b/debian/piuparts-master.install
@@ -1,9 +1,9 @@
-etc/piuparts*
+etc/apache2/conf.d/piuparts.apache
 etc/cron.d/piuparts-master
+etc/piuparts*
+etc/sudoers.d/piuparts
 usr/share/piuparts/htdocs/*
 usr/share/piuparts/master/*
 usr/share/piuparts/piuparts-analyze
 usr/share/piuparts/piuparts-master
 usr/share/piuparts/piuparts-report
-etc/sudoers.d/piuparts
-etc/apache2/conf.d/piuparts.apache
diff --git a/debian/piuparts-slave.install b/debian/piuparts-slave.install
index 485cd35..b4a0b81 100644
--- a/debian/piuparts-slave.install
+++ b/debian/piuparts-slave.install
@@ -1,3 +1,3 @@
+etc/cron.d/piuparts-slave
 usr/share/piuparts/piuparts-slave
 usr/share/piuparts/slave/*
-etc/cron.d/piuparts-slave
diff --git a/debian/piuparts.install b/debian/piuparts.install
index f73505c..e7b56e1 100644
--- a/debian/piuparts.install
+++ b/debian/piuparts.install
@@ -1,2 +1 @@
 /usr/sbin/piuparts
-

-- 
piuparts git repository