[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.51-51-g1c35bbd

[Andreas Beckmann]

The following commit has been merged in the bikeshed branch:
commit 1c35bbdb795673fddf98dddef1e078eb72785c31
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon May 27 12:57:51 2013 +0200

    changelog, TODO, and whitespace cleanup
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/README_pejacevic.txt b/README_pejacevic.txt
index 39b6568..8f43daa 100644
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -104,7 +104,7 @@ Any other webserver will do but apache is used on pejacevic (and maintained by D
 	UseCanonicalName Off
 	ServerSignature On
 	<IfModule mod_userdir.c>
-        	UserDir disabled
+		UserDir disabled
 	</IfModule>
 </VirtualHost>
 # vim:set syn=apache:
diff --git a/TODO b/TODO
index c485f9c..a458f51 100644
--- a/TODO
+++ b/TODO
@@ -9,7 +9,7 @@ for 0.5x:
 
 - make piuparts-master + piuparts-slave packages work with documented steps:
   - do not enable sudoers.d/piuparts-slave in p-s.deb, neither the cronjobs.
-    - this is manual work one has done once after installation. we should 
+    - this is manual work one has done once after installation. we should
       whats needs to be done how.
   - the shipped crontabs are not suitable from cron.d/ due to missing user
     column -> provide instructions how to install them as piuparts(s|m) user
@@ -22,6 +22,7 @@ for 0.5x:
     - maybe do this manually again as well?
 
 - in maintainer view: sort buggy states up again
+  - sort packages on maintainer pages alphabetically (states first though)
 
 - more stats and graphs:
   - packages processed per day (in total and per slave)
@@ -42,7 +43,7 @@ for 0.5x:
 
 - notes from pejacevic setup:
   - the need for the symlink from /srv/piuparts.debian.org/etc/piuparts to
-    /etc/piuparts is awkward when everything else is in 
+    /etc/piuparts is awkward when everything else is in
     /srv/piuparts.debian.org
   - use mirror via nfs (faster)
 
@@ -127,7 +128,6 @@ for 0.7x and later:
     now (piuparts-analyze.py is an existing "fragment".)
   - RSS feeds of logs
   - do more fancy R graphs, eg. also per state
-  - sort packages on maintainer pages alphabetically (states first though)
   - link (and target) to piuparts.d.o configuration is static to pejacevic. should
     refer to the actual hosts configuration if running somewhere else
 
diff --git a/debian/changelog b/debian/changelog
index 235672b..cba98af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ piuparts (0.52) UNRELEASED; urgency=low
 
   [ Andreas Beckmann ]
   * piuparts.py:
-    - Really disable PDiffs. (Closes: #708241)
+    - Really disable PDiffs.  (Closes: #708241)
   * piuparts.conf:
   * distros.conf:
   * piupartslib/conf.py:
@@ -16,7 +16,8 @@ piuparts (0.52) UNRELEASED; urgency=low
   * piuparts-analyze.py:
     - Consider archived bugs, too.  (Closes: #669966)
   * piuparts-report.py:
-    - Switch from python-rpy to python-rpy2. Use a noninteractive grDevice.
+    - Switch from python-rpy to python-rpy2.  (Closes: #705975)
+    - rpy2: Use a noninteractive grDevice.
   * Makefile:
     - Switch default target from 'install' to 'build'.
   * scripts-no-usr-share-doc/post_setup_disable_usr_share_doc: New custom
@@ -24,7 +25,7 @@ piuparts (0.52) UNRELEASED; urgency=low
     This should catch maintainer scripts relying on /usr/share/doc content.
   * New bug template: postinst_uses_usr_share_doc.
   * piuparts-master.deb:
-    - Switch Depends: python-rpy to Depends: python-rpy2. (Closes: #705975)
+    - Switch Depends: python-rpy to Depends: python-rpy2.
 
   [ Holger Levsen ]
   * piuparts.py:
@@ -33,7 +34,7 @@ piuparts (0.52) UNRELEASED; urgency=low
     - Workaround #709372 and ignore broken symlinks found by adequate.
     - Do not print a "Guessed: debian" line on every run. It's the default
       anyway. (Closes: #703058)
-  * piuparts-report: 
+  * piuparts-report:
     - Add templates for known_problems/inadequate_issue and inadequate_error.
     - Add link to the piuparts source at the top of the navigation menu on the
       left.
@@ -112,7 +113,7 @@ piuparts (0.51) unstable; urgency=low
   * piuparts-slave.deb:
     - Restrict the ssh key added to master's authorized_keys to only run
       piuparts-master.
-  * slave_run: Support starting multiple concurrent slaves. (Closes: #678725)
+  * slave_run: Support starting multiple concurrent slaves.  (Closes: #678725)
   * Update and add new exceptions for buggy packages.
   * scripts-wheezy/post_setup_wheezy-fake-essential: New custom script to
     suppress some purge failures in wheezy.
@@ -317,7 +318,7 @@ piuparts (0.49) unstable; urgency=low
     - Add --testdebs-repo=<sources.list line> option. Provide the package(s)
       to be tested (and additional dependencies that are not yet in the
       archive) in a repository to enable dependency resolution with apt-get.
-      Use for complex install and upgrade scenarios.
+      Use for complex install and upgrade scenarios.  (Closes: #676694)
     - Add --distupgrade-to-testdebs option. During distupgrade tests override
       packages from the target distro with the packages from the testdebs
       repository. This allows doing distupgrade tests before uploading.

-- 
piuparts git repository