[Bug-vc-dwim] ready to release vc-dwim-1.2?

[Jim Meyering]

Hi Ralf,

Do you (or anyone else) have anything you'd like to
change before I make a 1.2 release?

Jim

FYI, I've just pushed the following minor changes:

>From a850e3e660b20182d055979f68a00fcf6f92f43a Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 1 Sep 2009 09:25:42 +0200
Subject: [PATCH 1/5] build: update gnulib submodule to latest

---
 gnulib |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gnulib b/gnulib
index 12f78b4..a96bd79 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 12f78b4faa14cd2da952f865979843dee79fcf93
+Subproject commit a96bd790af86ef28fbd95f619e390713587e2d8d
--
1.6.4.2.384.g5fc62


>From ffd56b5eaf10d7a6a67360bd64953c6ad5e1d3b8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 1 Sep 2009 09:31:57 +0200
Subject: [PATCH 2/5] build: make build slightly less verbose

* Makefile.am (vc-dwim): Use $(AM_V_GEN) and $(AM_V_at).
---
 ChangeLog   |    3 +++
 Makefile.am |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f03e656..f7e1f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-09-01  Jim Meyering  <address@hidden>

+       build: make build slightly less verbose
+       * Makefile.am (vc-dwim): Use $(AM_V_GEN) and $(AM_V_at).
+
        doc: you can use vc-dwim when ChangeLog is not version-controlled
        * vc-dwim.pl (--help): Give an example describing how to use vc-dwim
        in a project that does not maintain a version-controlled ChangeLog file.
diff --git a/Makefile.am b/Makefile.am
index 68a7155..bbec637 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,10 +60,10 @@ do_subst = sed                                              
\
 ## Use chmod a-w to prevent people from editing the wrong file by accident.
 ## Write this so it works even when hg is not installed on this system.
 vc-dwim: vc-dwim.pl Makefile
-       rm -f $@ address@hidden
-       $(do_subst) $(srcdir)/address@hidden >address@hidden
-       chmod a-w+x address@hidden
-       mv -f address@hidden $@
+       $(AM_V_GEN)rm -f $@ address@hidden
+       $(AM_V_at)$(do_subst) $(srcdir)/address@hidden >address@hidden
+       $(AM_V_at)chmod a-w+x address@hidden
+       $(AM_V_at)mv -f address@hidden $@

 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
--
1.6.4.2.384.g5fc62


>From 37feabc0c89788cf2232609a9b204478bc032303 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 1 Sep 2009 09:47:09 +0200
Subject: [PATCH 3/5] build: include update-copyright

* bootstrap.conf (gnulib_modules): Add update-copyright.
* cfg.mk (update-copyright-env): Define.
---
 ChangeLog      |    4 ++++
 bootstrap.conf |    1 +
 cfg.mk         |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f7e1f05..0a51e01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-01  Jim Meyering  <address@hidden>

+       build: include update-copyright
+       * bootstrap.conf (gnulib_modules): Add update-copyright.
+       * cfg.mk (update-copyright-env): Define.
+
        build: make build slightly less verbose
        * Makefile.am (vc-dwim): Use $(AM_V_GEN) and $(AM_V_at).

diff --git a/bootstrap.conf b/bootstrap.conf
index 96e8aa2..d5feee1 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -33,6 +33,7 @@ gnulib_modules="
        maintainer-makefile
        perl
        posix-shell
+       update-copyright
 "

 source_base=.
diff --git a/cfg.mk b/cfg.mk
index 793862c..dd4aa69 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -40,3 +40,6 @@ Exit_witness_file = tests/trap-setup
 export VERBOSE = yes

 old_NEWS_hash = 48eb0d85c40176e5aeb7430b013c675e
+
+update-copyright-env = \
+  UPDATE_COPYRIGHT_USE_INTERVALS=1
--
1.6.4.2.384.g5fc62


>From 4bb85e80eeda6c5900a7bd1d8019f9cf7eae8f93 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 1 Sep 2009 09:52:44 +0200
Subject: [PATCH 4/5] build: ignore all of build-aux/

* .gitignore: Ignore all of build-aux.
* build-aux/.gitignore: Remove file.
---
 .gitignore           |    1 +
 ChangeLog            |    4 ++++
 build-aux/.gitignore |   11 -----------
 3 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 build-aux/.gitignore

diff --git a/.gitignore b/.gitignore
index 0ae2f79..35219f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *~
+/build-aux
 /maint.mk
 GNUmakefile
 INSTALL
diff --git a/ChangeLog b/ChangeLog
index 0a51e01..2c01142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-09-01  Jim Meyering  <address@hidden>

+       build: ignore all of build-aux/
+       * .gitignore: Ignore all of build-aux.
+       * build-aux/.gitignore: Remove file.
+
        build: include update-copyright
        * bootstrap.conf (gnulib_modules): Add update-copyright.
        * cfg.mk (update-copyright-env): Define.
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
deleted file mode 100644
index b266148..0000000
--- a/build-aux/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-config.guess
-config.sub
-depcomp
-git-version-gen
-gitlog-to-changelog
-install-sh
-mdate-sh
-missing
-texinfo.tex
-useless-if-before-free
-vc-list-files
--
1.6.4.2.384.g5fc62


>From 58ab8e9e7d37833a28b91954c0dfbc62f73d564c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 1 Sep 2009 09:53:26 +0200
Subject: [PATCH 5/5] maint: update all copyright year lists to include 2009

* Coda.pm: Likewise.
* Makefile.am: Likewise.
* ProcessStatus.pm: Likewise.
* README: Likewise.
* VC.pm: Likewise.
* bootstrap: Likewise.
* vc-chlog.in: Likewise.
---
 ChangeLog        |    9 +++++++++
 Coda.pm          |    2 +-
 Makefile.am      |    2 +-
 ProcessStatus.pm |    2 +-
 README           |    2 +-
 VC.pm            |    2 +-
 bootstrap        |    2 +-
 vc-chlog.in      |    2 +-
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2c01142..acb599a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-09-01  Jim Meyering  <address@hidden>

+       update all copyright year lists to include 2009
+       * Coda.pm: Likewise.
+       * Makefile.am: Likewise.
+       * ProcessStatus.pm: Likewise.
+       * README: Likewise.
+       * VC.pm: Likewise.
+       * bootstrap: Likewise.
+       * vc-chlog.in: Likewise.
+
        build: ignore all of build-aux/
        * .gitignore: Ignore all of build-aux.
        * build-aux/.gitignore: Remove file.
diff --git a/Coda.pm b/Coda.pm
index 5d23d62..e53538a 100644
--- a/Coda.pm
+++ b/Coda.pm
@@ -1,6 +1,6 @@
 # Coda  -  a global destructor that closes stdout, with error-checking

-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/Makefile.am b/Makefile.am
index bbec637..e837169 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2008-2009 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/ProcessStatus.pm b/ProcessStatus.pm
index 96f93e0..4413d3e 100644
--- a/ProcessStatus.pm
+++ b/ProcessStatus.pm
@@ -1,6 +1,6 @@
 # ProcessStatus - given an exit code, return descriptive string

-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/README b/README
index 9b43053..c472f61 100644
--- a/README
+++ b/README
@@ -147,7 +147,7 @@ the output of
 into the .vc-chlogrc file at the root.

 ========================================================================
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2008-2009 Free Software Foundation, Inc.

 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/VC.pm b/VC.pm
index a7347ab..e083f41 100644
--- a/VC.pm
+++ b/VC.pm
@@ -1,6 +1,6 @@
 # VC  -  underpinnings of a VC-agnostic diff and commit tool.

-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/bootstrap b/bootstrap
index b35d856..942fd88 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@

 # Bootstrap this package from checked-out sources.

-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/vc-chlog.in b/vc-chlog.in
index 063275a..bba880d 100755
--- a/vc-chlog.in
+++ b/vc-chlog.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 # vc-chlog - generate a GCS-style ChangeLog entry from a diff
 #
-# Copyright (C) 2006-2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2009 Free Software Foundation, Inc.

 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
--
1.6.4.2.384.g5fc62