[Pkg-jed-commit] r419 - www

[Jörg Sommer]

Author: jo-guest
Date: 2006-09-11 20:52:14 +0000 (Mon, 11 Sep 2006)
New Revision: 419

Modified:
   www/DJG-Guidelines.txt
   www/Makefile
Log:
?\226?\128?\162 DJG-Guidelines.txt
  ?\194?\183 According the decision in [1] changed the guidelines to only allow the [XY]
    form of changelog entries.

  ?\194?\183 Removed the advice to set the ?\226?\128?\152Local Variables?\226?\128?\153 at the end of the
    changelog file.

?\226?\128?\162 Makefile
  ?\194?\183 Moved the @ sign to the USER variable. This eases the usage with a proper
    ssh config, where you don't need to supply the user name.

  ?\194?\183 Simplified the install process. tar works good with stdin/stdout,
    compression can be done by ssh and the correct access rights and group for
    files can be achieved with the tar option --mode and sg.


Modified: www/DJG-Guidelines.txt
===================================================================
--- www/DJG-Guidelines.txt	2006-09-11 12:44:11 UTC (rev 418)
+++ www/DJG-Guidelines.txt	2006-09-11 20:52:14 UTC (rev 419)
@@ -33,42 +33,18 @@
 
     jed-cool (1.2.3-4) unstable; urgency=low
 
-      +++ Changes by Joe Developer:
-
-      * Rebuilt with cool stuff
-
-      +++ Changes by Sam Debianer:
-
-      * Cool tweaks
-
-      -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Sat, 19 Mar 2005 09:29:18 +0100
-
-If the changes are many and done incremental by more than one person, it
-is preferable to have them ordered by topic instead of contributor. The
-contributor's initials can be added in brackets. The end user will probabely
-be more interested in knowing what is new and less in who did the change. ::
-
-    jed-cool (1.2.3-4) unstable; urgency=low
-
       * Rebuilt with cool stuff [JD]
 
       * New user interface [SD, JD, SU]
 
       -- Debian JED Group <pkg-jed-devel at lists.alioth.debian.org>  Sat, 19 Mar 2005 09:29:18 +0100
 
+Where JD, SD and SU are the first letters of the developers who made any
+contribution.
+
 The Debian policy requires the trailer line to contain the real name and email
 of the person doing the upload.
 
-At the end of debian/changelog put the following lines::
-
-    Local Variables:
-    debian-changelog-full-name: "Debian JED Group"
-    debian-changelog-mailing-address: "pkg-jed-devel at lists.alioth.debian.org"
-    End:
-
-This is a great help when using (X)Emacs with the debian-changelog-mode and
-hitting [(control) c] [(control) c].
-
 When buiding the package, you must use the -e option of dpkg-buildpackage
 of debuild with your e-mail address as argument.  This is important because
 the Debian Policy requires that the Changed-By field of the .changes file

Modified: www/Makefile
===================================================================
--- www/Makefile	2006-09-11 12:44:11 UTC (rev 418)
+++ www/Makefile	2006-09-11 20:52:14 UTC (rev 419)
@@ -6,42 +6,25 @@
 # Written by Rafael Laboissiere <rafael at debian.org>
 # $Id$
 
-USER = $(shell whoami)
+USER = $(shell whoami)@
 GROUP = pkg-jed
 HOST = alioth.debian.org
 DIR = /org/alioth.debian.org/chroot/home/groups/pkg-jed/htdocs/
 INSTALLFILES = index.html DJG-Guidelines.txt DJG-Guidelines.html \
 	earth.png djg.css guidelines.css Makefile
-TARBALL = tmp.tgz
 
-install: svn-ci $(TARBALL)
-	@echo -n "Uploading tarball to web site... "
-	@scp -q $(TARBALL) $(USER)@$(HOST):$(DIR)
-	@echo done
+install: $(INSTALLFILES)
+	svn ci
+	svn up
 	@echo -n "Installing remote tarball... "
-	@ssh $(USER)@$(HOST) 'cd $(DIR); tar xfz $(TARBALL)'
+	tar c --mode 664 $(INSTALLFILES) | \
+	  ssh $(HOST) 'cd $(DIR); sg $(GROUP) -c "tar x"'
 	@echo done
-	@echo -n "Setting group access of www files... "
-	@ssh $(USER)@$(HOST) \
-		'cd $(DIR); for i in `tar tfz $(TARBALL)`; do chgrp $(GROUP) $$i; chmod g=u $$i; done'
-	@echo done
-	@echo -n "Removing remote tarball... "
-	@ssh $(USER)@$(HOST) rm -f $(DIR)$(TARBALL)
-	@echo done
 
-$(TARBALL): $(INSTALLFILES)
-	@echo -n "Making tarball... "
-	@tar cfz $(TARBALL) $(INSTALLFILES)
-	@echo done
-
 %.html: %.txt
 	rest2html --no-toc-backlinks --stylesheet=guidelines.css $< $@
 
-svn-ci:
-	svn ci
-	svn up
-
 clean:
-	rm -f DJG-Guidelines.html $(TARBALL)
+	rm -f DJG-Guidelines.html
 
-.PHONY: install svn-ci clean
+.PHONY: install clean