[pessulus] [misc] Update HACKING, MAINTAINERS, README

[Vincent Untz <vuntz src gnome org>]

commit 65cc8e33a3261b19d14fc3635f0961a6f5845c84
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Sep 8 19:24:21 2010 +0200

    [misc] Update HACKING, MAINTAINERS, README
    
    Nothing new, but make sure this is up-to-date.
    
    Also tweak a bit autogen.sh and Makefile.am to make them look similar in
    all my modules.

 HACKING     |   37 +++++++++++++++++++++++--------------
 MAINTAINERS |    7 +++++--
 Makefile.am |    3 ---
 README      |   31 ++++++++++++++++++++-----------
 autogen.sh  |    5 ++---
 5 files changed, 50 insertions(+), 33 deletions(-)
---
diff --git a/HACKING b/HACKING
index 548f75e..f5ce758 100644
--- a/HACKING
+++ b/HACKING
@@ -1,22 +1,31 @@
 Hacking on pessulus
 ===================
 
-	* Please send patches to desktop-devel-list gnome org or to
-	  the people listed in the MAINTAINERS file. Your patch should
-	  be in unified diff form. (The -u option to GNU diff.) See also:
+ + The development occurs in git:
 
-	  	http://live.gnome.org/GnomeLove/SubmittingPatches
+     http://git.gnome.org/browse/pessulus
 
-	* Please try and send a patch against a recent version of this
-	  package. Patches against CVS HEAD are most preferable. For
-	  information on how to access GNOME CVS please read:
+   For information on how to access GNOME git please read:
 
-		http://developer.gnome.org/tools/cvs.html
+     http://live.gnome.org/Git
 
-	* Don't commit any but the most trivial patches without approval.
+ + Please send patches as bug reports in GNOME Bugzilla:
 
-	* Exceptions to this are:
-		+ Translators may commit basic i18n related patches to
-		  the build setup.
-		+ Build sheriff are welcome - in accordance with the
-		  relevant build sheriff constraints. 
+     https://bugzilla.gnome.org/ (product pessulus)
+
+   Your patch should be in unified diff form (the -u option to GNU
+   diff). See also:
+
+     http://live.gnome.org/GnomeLove/SubmittingPatches
+
+ + Please try and send a patch against a recent version of this package.
+   Patches against git master are most preferable.
+
+ + Don't commit any but the most trivial patches without approval.
+
+ + Exceptions to this are:
+
+   - Translators may commit basic i18n related patches to the build
+     setup.
+   - Build sheriff are welcome - in accordance with the relevant build
+     sheriff constraints.
diff --git a/MAINTAINERS b/MAINTAINERS
index d419498..80d6f4e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,7 +1,10 @@
+Currently active maintainers
+----------------------------
+
 Vincent Untz
-Email: vuntz gnome org
+E-mail: vuntz gnome org
 Userid: vuntz
 
 Rob Bradford
-Email: rob robster org uk
+E-mail: rob robster org uk
 Userid: rbradford
diff --git a/Makefile.am b/Makefile.am
index 9330071..4f20628 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,9 +19,6 @@ EXTRA_DIST =			\
 CLEANFILES =		\
 	pessulus
 
-DISTCLEANFILES =		\
-	$(NULL)
-
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
diff --git a/README b/README
index 2e2e475..8feb04f 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-pessulus 2.30.2
-===============
+pessulus
+========
 
 pessulus is a lockdown editor for GNOME, written in python.
 
@@ -10,25 +10,34 @@ Use of pessulus can be useful on computers that are open to use by
 everyone, e.g. in an internet cafe.
 
 You may download updates to the package from:
-   http://ftp.gnome.org/pub/GNOME/sources/pessulus/
+
+   http://download.gnome.org/sources/pessulus/
+
+To discuss pessulus, you may use the desktop-devel-list mailing list:
+
+  http://mail.gnome.org/mailman/listinfo/desktop-devel-list
+
 
 Installation
 ============
 
 See the file 'INSTALL'. If you are not using a released version of
-pessulus (for example, if you checked out the code from CVS), you
-first need to run './autogen.sh'.
+pessulus (for example, if you checked out the code from git), you first
+need to run './autogen.sh'.
+
 
 How to report bugs
 ==================
 
 Bugs should be reported to the GNOME bug tracking system:
-   http://bugzilla.gnome.org/ (product pessulus)
+
+   https://bugzilla.gnome.org/ (product pessulus)
+
 You will need to create an account for yourself.
 
-Please read the following page on how to prepare a useful
-bug report
-   http://bugzilla.gnome.org/bug-HOWTO.html
+Please read the following page on how to prepare a useful bug report:
+
+   https://bugzilla.gnome.org/page.cgi?id=bug-writing.html
 
-Please read the HACKING file for information on where to
-send changes or bugfixes for this package.
+Please read the HACKING file for information on where to send changes or
+bugfixes for this package.
diff --git a/autogen.sh b/autogen.sh
index f341af8..7544d11 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,9 +6,10 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="pessulus"
 REQUIRED_AUTOMAKE_VERSION=1.9
+REQUIRED_M4MACROS=
 
 (test -f $srcdir/configure.ac \
-  && test -d $srcdir/Pessulus) || {
+  && test -f $srcdir/$PKG_NAME.doap) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
@@ -19,6 +20,4 @@ which gnome-autogen.sh || {
     exit 1
 }
 
-test -d $srcdir/m4 || mkdir $srcdir/m4
-
 . gnome-autogen.sh