[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.45-15-g662c274

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit e58008dc2c48508b325fbecac767987cf39185f7
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 23 10:14:42 2012 +0200

    Makefile: update for new locations
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index 3ff522b..e13508a 100644
--- a/Makefile
+++ b/Makefile
@@ -55,9 +55,6 @@ install-conf:
 	install -d $(etcdir)/apache2/conf.d
 	install -m 0644 conf/piuparts.apache $(etcdir)/apache2/conf.d
 
-	install -d $(etcdir)/piuparts/scripts
-	install org/piuparts.debian.org/etc/scripts/* $(etcdir)/piuparts/scripts
-
 install-conf-4-running-from-git:
 	install -d $(DESTDIR)$(etcdir)/piuparts
 	install -m 0644 home/piupartsm/crontab $(DESTDIR)$(etcdir)/piuparts/crontab-master
@@ -65,7 +62,6 @@ install-conf-4-running-from-git:
 	install -m 0644 home/piupartsm/.forward $(DESTDIR)$(etcdir)/piuparts/forward-master
 	install -m 0644 home/piupartss/.forward $(DESTDIR)$(etcdir)/piuparts/forward-slave
 	install -m 0644 org/piuparts.debian.org/etc/piuparts.conf.* $(DESTDIR)$(etcdir)/piuparts/
-	cp -a org/piuparts.debian.org/etc/scripts* $(etcdir)/piuparts
 
 build:
 	for file in piuparts piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
@@ -97,23 +93,20 @@ install:
 	cp -r home/piupartss/bin/* $(sharedir)/piuparts/slave
 
 	install -d $(DESTDIR)$(htdocsdir)
-	for file in org/piuparts.debian.org/htdocs/* ; do\
-            if [ -f $$file ] ; then \
-                install -m 0644 $$file $(DESTDIR)$(htdocsdir) ;\
-            fi \
-        done
+	install -m 0644 htdocs/*.* $(DESTDIR)$(htdocsdir)/
 
 	install -d $(DESTDIR)$(htdocsdir)/images
-	install -m 0644 org/piuparts.debian.org/htdocs/images/* $(DESTDIR)$(htdocsdir)/images/
+	install -m 0644 htdocs/images/*.* $(DESTDIR)$(htdocsdir)/images/
 	ln -sf /usr/share/icons/Tango/24x24/status/sunny.png $(DESTDIR)$(htdocsdir)/images/sunny.png
 	ln -sf /usr/share/icons/Tango/24x24/status/weather-severe-alert.png $(DESTDIR)$(htdocsdir)/images/weather-severe-alert.png
 
 	install -d $(DESTDIR)$(htdocsdir)/templates/mail
-	for file in org/piuparts.debian.org/htdocs/templates/mail/* ; do\
-		if [ -f $$file ] ; then \
-			install -m 0644 $$file $(DESTDIR)$(htdocsdir)/templates/mail ;\
-		fi \
-	done
+	install -m 0644 bug-templates/*.mail $(DESTDIR)$(htdocsdir)/templates/mail/
+
+	install -d $(DESTDIR)$(etcdir)/piuparts
+	for d in $$(ls custom-scripts) ; do \
+		install -d $(DESTDIR)$(etcdir)/piuparts/$$d ; \
+		install -m 0755 custom-scripts/$$d/* $(DESTDIR)$(etcdir)/piuparts/$$d/ ; done
 
 
 check:
diff --git a/TODO b/TODO
index 7853693..85c1bd4 100644
--- a/TODO
+++ b/TODO
@@ -17,10 +17,10 @@ for 0.46:
   break the slave: send -> master: reject infinite loop
 
 - sanitize directory structure:
-  org/piuparts.debian.org/etc/scripts* ==> custom-scripts/
-  org/piuparts.debian.org/htdocs/templates/mail/* ==> bug-templates/
-  org/piuparts.debian.org/htdocs/* ==> htdocs/
   org/piuparts.debian.org/etc/piuparts.conf.* ==> ???
+  home/*/crontab ==> ???
+  home/*/.forward ==> ???
+  home/*/bin ==> ???
 
 - make piuparts-master + piuparts-slave packages work out-of-the-box
 
@@ -57,6 +57,7 @@ for 0.46:
 
 - more stats and graphs:
   - packages processed per day (in total and per slave)
+    * master writes submissions.txt per section since 0.45
   - # of open bugs with tag piuparts
   - generate http://piuparts.debian.org/stable/states.png + testing.png
     from existing data
diff --git a/debian/changelog b/debian/changelog
index e8b1f25..1fd802e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ piuparts (0.46) UNRELEASED; urgency=low
   * piuparts-slave.py:
   * piuparts-report.py:
   * Simplify running piuparts from GIT.
+  * Reorganize layout in the GIT repository to reduce path nesting and length.
+  * Makefile:
+    - Separate build and install targets.
+    - Adjust for new layout, cleanup, simplify.
 
  -- Holger Levsen <holger at debian.org>  Thu, 21 Jun 2012 22:25:57 +0200
 
diff --git a/debian/piuparts.install b/debian/piuparts.install
index e3b4645..d6be383 100644
--- a/debian/piuparts.install
+++ b/debian/piuparts.install
@@ -1,3 +1,2 @@
 /usr/sbin/piuparts
-/etc/piuparts/scripts/
-org/piuparts.debian.org/etc/scripts-*	etc/piuparts/
+/etc/piuparts/scripts*

-- 
piuparts git repository