[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-729-gae7cc89

Sun Jun 17 22:17:57 UTC 2012

The following commit has been merged in the develop branch:
commit ae7cc89c223a565cc33f9a535c4154b7410ac23a
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jun 17 22:17:40 2012 +0000

    Further split packaging into piuparts-master, piuparts-slave and  piuparts-common binary packages. (Closes: #585861)

diff --git a/Makefile b/Makefile
index 9989a0f..cfeaf92 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ mandir = $(sharedir)/man
 man1dir = $(mandir)/man1
 libdir = $(prefix)/lib
 docdir = $(prefix)/share/doc/piuparts/
-svrdocdir = $(prefix)/share/doc/piuparts-server
+svrdocdir = $(prefix)/share/doc/piuparts-master
 site26 = $(libdir)/python2.6/dist-packages
 site27 = $(libdir)/python2.7/dist-packages
 etcdir = $(prefix)/etc
@@ -41,7 +41,7 @@ install-conf:
 	install -m 0644 conf/piuparts.conf.sample $(etcdir)/piuparts/piuparts.conf
 
 	install -d $(etcdir)/cron.d
-	install -m 0644 home/piupartsm/crontab $(etcdir)/cron.d/piuparts-server
+	install -m 0644 home/piupartsm/crontab $(etcdir)/cron.d/piuparts-master
 	install -m 0644 home/piupartss/crontab $(etcdir)/cron.d/piuparts-slave
 
 	install -d $(etcdir)/piuparts/known_problems
diff --git a/TODO b/TODO
index b6fe085..764c692 100644
--- a/TODO
+++ b/TODO
@@ -15,12 +15,14 @@ for 0.45:
 - do not upload with sunny.png weather-severe-alert.png included. Replace them
   with links and add depends to tango-icon-theme. Update copyright.
 
-- create piuparts-master and piuparts-slave packages.
-  Maybe this is for 0.46 and 0.45 just has a piuparts-server package. We will
-  see...
-
 - doc_root needs to be set in piuparts.conf_piatti and _goldwasser.
 
+- document new packages... descriptions in debian/control should also be improved.
+
+- conf/piuparts.sudoers needs to be split as well...
+
+- NEWS should mention new master+slave packages.
+
 
 for 0.46:
 
diff --git a/debian/changelog b/debian/changelog
index 233f8a3..dc51429 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ piuparts (0.45) UNRELEASED; urgency=low
   [ Holger Levsen ]
   * 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)
 
   [ David Steele ]
   * Remove debian/postinst as it was only dealing with lenny time area
diff --git a/debian/control b/debian/control
index 83b36bc..197492b 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: piuparts
 Architecture: all
 Depends: apt, ${python:Depends}, debootstrap, lsof, lsb-release,
     python-debian, ${misc:Depends}, python-debianbts, python-apt
-Suggests: python-rpy, ghostscript, schroot
+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
@@ -27,13 +27,33 @@ Description: .deb package installation, upgrading, and removal testing tool
  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.
 
-Package: piuparts-server
+Package: piuparts-master
 Architecture: all
-Depends: apt, ${python:Depends}, piuparts (>= 0.45), apache2, ${misc:Depends}, openssh-client, screen, adduser
+Depends: apt, ${python:Depends}, piuparts (>= 0.45), apache2, ${misc:Depends}, openssh-server, screen, adduser, piuparts-common
+Recommends: python-rpy, ghostscript
 Breaks: piuparts (<= 0.44)
 Replaces: piuparts (<= 0.44)
-Description: piuparts master and slave server components
+Description: piuparts master components
  A master/slave piuparts server, along the lines of
  http://piuparts.debian.org/.
+ .
+ This package installs the piuparts-master, which needs one or more slave to
+ operate.
 
+Package: piuparts-slave
+Architecture: all
+Depends: apt, ${python:Depends}, piuparts (>= 0.45), ${misc:Depends}, openssh-client, screen, adduser, piuparts-common
+Suggests: schroot
+Description: piuparts slave components
+ A master/slave piuparts server, along the lines of
+ http://piuparts.debian.org/.
+ .
+ This package installs the piuparts-slave.
+
+Package: piuparts-common
+Architecture: all
+Depends: apt, ${python:Depends}, ${misc:Depends}
+Description: common piuparts components
+ piupartslib, common library used by piuparts-master, piuparts-reports and
+ piuparts-slave.
 
diff --git a/debian/piuparts-common.install b/debian/piuparts-common.install
new file mode 100644
index 0000000..f1d0181
--- /dev/null
+++ b/debian/piuparts-common.install
@@ -0,0 +1 @@
+usr/lib/*
diff --git a/debian/piuparts-server.pyinstall b/debian/piuparts-common.pyinstall
similarity index 100%
rename from debian/piuparts-server.pyinstall
rename to debian/piuparts-common.pyinstall
diff --git a/debian/piuparts-server.dirs b/debian/piuparts-master.dirs
similarity index 100%
copy from debian/piuparts-server.dirs
copy to debian/piuparts-master.dirs
diff --git a/debian/piuparts-master.docs b/debian/piuparts-master.docs
new file mode 100644
index 0000000..3869fd5
--- /dev/null
+++ b/debian/piuparts-master.docs
@@ -0,0 +1,2 @@
+README_server.txt
+README_piatti.txt
diff --git a/debian/piuparts-master.install b/debian/piuparts-master.install
new file mode 100644
index 0000000..23741c1
--- /dev/null
+++ b/debian/piuparts-master.install
@@ -0,0 +1,9 @@
+etc/piuparts*
+etc/cron.d/piuparts-master
+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-server.postinst b/debian/piuparts-master.postinst
similarity index 100%
rename from debian/piuparts-server.postinst
rename to debian/piuparts-master.postinst
diff --git a/debian/piuparts-server.postrm b/debian/piuparts-master.postrm
old mode 100644
new mode 100755
similarity index 100%
rename from debian/piuparts-server.postrm
rename to debian/piuparts-master.postrm
diff --git a/debian/piuparts-server.docs b/debian/piuparts-server.docs
deleted file mode 100644
index 2e7bfdc..0000000
--- a/debian/piuparts-server.docs
+++ /dev/null
@@ -1 +0,0 @@
-README_server.txt
diff --git a/debian/piuparts-server.install b/debian/piuparts-server.install
deleted file mode 100644
index e0bc5e9..0000000
--- a/debian/piuparts-server.install
+++ /dev/null
@@ -1,6 +0,0 @@
-etc/piuparts*
-etc/cron.d/piuparts-server
-etc/cron.d/piuparts-slave
-usr/share/piuparts/*
-etc/sudoers.d/piuparts
-etc/apache2/conf.d/piuparts.apache
diff --git a/debian/piuparts-server.dirs b/debian/piuparts-slave.dirs
similarity index 100%
rename from debian/piuparts-server.dirs
rename to debian/piuparts-slave.dirs
diff --git a/debian/piuparts-slave.install b/debian/piuparts-slave.install
new file mode 100644
index 0000000..485cd35
--- /dev/null
+++ b/debian/piuparts-slave.install
@@ -0,0 +1,3 @@
+usr/share/piuparts/piuparts-slave
+usr/share/piuparts/slave/*
+etc/cron.d/piuparts-slave
diff --git a/debian/piuparts-server.links b/debian/piuparts-slave.links
similarity index 100%
rename from debian/piuparts-server.links
rename to debian/piuparts-slave.links
diff --git a/debian/NEWS b/debian/piuparts.NEWS
similarity index 100%
rename from debian/NEWS
rename to debian/piuparts.NEWS
diff --git a/debian/piuparts.docs b/debian/piuparts.docs
index 3ecc4a4..2bf155e 100644
--- a/debian/piuparts.docs
+++ b/debian/piuparts.docs
@@ -1,3 +1,4 @@
 README.txt
 README.html
 piuparts.1.html
+docbook-xsl.css

-- 
piuparts git repository

