[fcm] 14/16: Upstream tag 2016.05.1
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Nov 1 12:16:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository fcm.
commit 33b6fd7a66e94e30157a91f1ce6d10b2ae621b50
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Jul 3 17:15:38 2016 +0100
Upstream tag 2016.05.1
---
CHANGES.md | 26 +++++++++++++++++++++++++-
CONTRIBUTING.md | 2 ++
bin/fcm | 2 +-
doc/etc/fcm-terms-of-use.html | 4 ++--
doc/etc/fcm-version.js | 2 +-
doc/user_guide/getting_started.html | 5 +----
doc/user_guide/make.html | 5 +++--
lib/FCM/Admin/System.pm | 12 ++----------
lib/FCM/System/CM/CommitMessage.pm | 2 +-
lib/FCM/System/Make/Share/Dest.pm | 4 +++-
man/man1/fcm.1 | 2 +-
11 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1f961a7..481556a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,9 +5,33 @@ for a full listing of issues for each release.
--------------------------------------------------------------------------------
+## 2016.05.1 (2016-05-19)
+
+FCM release 34. Minor update to admin utilities, nothing noteworthy for users.
+
+--------------------------------------------------------------------------------
+
+## 2016.05.0 (2016-05-05)
+
+FCM release 33. Minor bug fix and update.
+
+### Noteworthy Changes
+
+[#229](https://github.com/metomi/fcm/pull/229):
+fcm commit, branch-create, branch-delete, etc: the default graphical editor for
+commit message is modified from `gedit` to `gvim -f`, as `gedit` is not
+reliable for running in the foreground.
+
+[#227](https://github.com/metomi/fcm/pull/227):
+fcm make: on gunzip of the context file, pass a file handle rather than a path
+to the `gunzip` function to work around problems when files are made read-only
+via ACL.
+
+--------------------------------------------------------------------------------
+
## 2016.02.0 (2016-02-11)
-FCM release 31. Minor bug fix and update.
+FCM release 32. Minor bug fix and update.
### Noteworthy Changes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d659346..12e7758 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,6 +24,8 @@ the Contributor Licence Agreement and Certificate of Origin detailed
below:
* Jim Bolton (Met Office, UK)
+* Andrew Clark (Met Office, UK)
+* Martin Dix (CSIRO, Australia)
* Ben Fitzpatrick (Met Office, UK)
* Dave Matthews (Met Office, UK)
* Stephen Oxley (Met Office, UK)
diff --git a/bin/fcm b/bin/fcm
index 2468e0e..4b140b6 100755
--- a/bin/fcm
+++ b/bin/fcm
@@ -107,7 +107,7 @@ Type "svn help APPLICATION" for help on other B<svn> application.
=head1 AUTHOR
-FCM Team L<fcm-team at metoffice.gov.uk>.
+FCM Team L<metomi at metoffice.gov.uk>.
Please feedback any bug reports or feature requests to us by e-mail.
=head1 SEE ALSO
diff --git a/doc/etc/fcm-terms-of-use.html b/doc/etc/fcm-terms-of-use.html
index b1eba74..9aa1583 100644
--- a/doc/etc/fcm-terms-of-use.html
+++ b/doc/etc/fcm-terms-of-use.html
@@ -72,8 +72,8 @@
<h2 id="team">FCM: Maintenance</h2>
<p>The FCM software and <a href="..">FCM Documentation</a> are maintained
- by the <a href="mailto:fcm-team at metoffice.gov.uk">FCM Team</a>, Met Office,
- FitzRoy Road, Exeter, EX1 3PB, UK.</p>
+ by the <a href="mailto:metomi at metoffice.gov.uk">Modelling Infrastructure
+ Support Systems Team</a>, Met Office, FitzRoy Road, Exeter, EX1 3PB, UK.</p>
</div>
</div>
diff --git a/doc/etc/fcm-version.js b/doc/etc/fcm-version.js
index a2de4fa..f15894a 100644
--- a/doc/etc/fcm-version.js
+++ b/doc/etc/fcm-version.js
@@ -1 +1 @@
-FCM.VERSION="2016.02.0";
+FCM.VERSION="2016.05.1";
diff --git a/doc/user_guide/getting_started.html b/doc/user_guide/getting_started.html
index 166e235..c81acba 100644
--- a/doc/user_guide/getting_started.html
+++ b/doc/user_guide/getting_started.html
@@ -74,7 +74,7 @@
<li>environment variable <var>EDITOR</var></li>
- <li>default to <code>vi</code> (or <code>gedit</code> when running the
+ <li>default to <code>vi</code> (or <code>gvim</code> when running the
FCM GUI)</li>
</ol>
@@ -88,9 +88,6 @@ export SVN_EDITOR='gvim -f'
# Emacs
export SVN_EDITOR=emacs
-# gedit
-export SVN_EDITOR=gedit
-
# Kate
export SVN_EDITOR=kate
</pre>
diff --git a/doc/user_guide/make.html b/doc/user_guide/make.html
index 00b5eb4..64986bd 100644
--- a/doc/user_guide/make.html
+++ b/doc/user_guide/make.html
@@ -952,8 +952,9 @@ build/o/...
<p>If <code>fcm make</code> is invoked with the <code>--archive</code> option,
sub-directories in categories containing intermediate build files (or any
- category specified in the <a href=
- "#make.build.prop.archive-ok-target-category">archive-ok-target-category</a>
+ category specified in the
+ <a href="annex_cfg.html#make.build.prop.archive-ok-target-category">
+ archive-ok-target-category</a>
property) will be put into TAR-GZIP files. E.g. with the default setting,
<samp>include/</samp> and <samp>o/</samp> will become
<samp>include.tar.gz</samp> and <samp>o.tar.gz</samp> respectively.</p>
diff --git a/lib/FCM/Admin/System.pm b/lib/FCM/Admin/System.pm
index cdee714..d8738bd 100644
--- a/lib/FCM/Admin/System.pm
+++ b/lib/FCM/Admin/System.pm
@@ -275,11 +275,7 @@ sub backup_svn_repository {
}
my $base_name = $project->get_svn_base_name();
run_mkpath($CONFIG->get_svn_backup_dir());
- my $work_dir = tempdir(
- "$base_name.backup.XXXXXX",
- DIR => $CONFIG->get_svn_backup_dir(),
- CLEANUP => 1,
- );
+ my $work_dir = tempdir("$base_name.backup.XXXXXX", CLEANUP => 1);
my $work_path = catfile($work_dir, $base_name);
$RUN->(
sprintf(
@@ -357,11 +353,7 @@ sub backup_trac_environment {
my $trac_live_path = $project->get_trac_live_path();
my $base_name = $project->get_name();
run_mkpath($CONFIG->get_trac_backup_dir());
- my $work_dir = tempdir(
- "$base_name.backup.XXXXXX",
- DIR => $CONFIG->get_trac_backup_dir(),
- CLEANUP => 1,
- );
+ my $work_dir = tempdir("$base_name.backup.XXXXXX", CLEANUP => 1);
my $work_path = catfile($work_dir, $base_name);
$RUNNER->run_with_retries(
sprintf(
diff --git a/lib/FCM/System/CM/CommitMessage.pm b/lib/FCM/System/CM/CommitMessage.pm
index 439e726..39ef6c6 100644
--- a/lib/FCM/System/CM/CommitMessage.pm
+++ b/lib/FCM/System/CM/CommitMessage.pm
@@ -44,7 +44,7 @@ our $DELIMITER_INFO
= '--Change summary (not part of commit message)--'
. "\n";
our $EDITOR = 'vi';
-our $GEDITOR = 'gedit';
+our $GEDITOR = 'gvim -f';
our $SUBVERSION_CONFIG_FILE = catfile((getpwuid($<))[7], qw{.subversion/config});
__PACKAGE__->class({gui => '$', util => '&'},
diff --git a/lib/FCM/System/Make/Share/Dest.pm b/lib/FCM/System/Make/Share/Dest.pm
index dd0fdab..517785d 100644
--- a/lib/FCM/System/Make/Share/Dest.pm
+++ b/lib/FCM/System/Make/Share/Dest.pm
@@ -102,7 +102,9 @@ sub _ctx_load {
}
my $old_m_ctx = eval {
my $handle = IO::File->new_tmpfile();
- gunzip($path, $handle) || die($!);
+ # Open the file here to work around permission problems with file ACLs
+ my $path_handle = new IO::File $path || die("Cannot open cache file $path\n");
+ gunzip($path_handle, $handle) || die($!);
$handle->seek(0, 0);
fd_retrieve($handle);
};
diff --git a/man/man1/fcm.1 b/man/man1/fcm.1
index 1c64afa..24d0a9b 100644
--- a/man/man1/fcm.1
+++ b/man/man1/fcm.1
@@ -20,7 +20,7 @@ should receive with this distribution.
.PP
Run "fcm help" to access the built-in tool documentation.
.SH AUTHOR
-FCM Team <fcm-team at metoffice.gov.uk>.
+FCM Team <metomi at metoffice.gov.uk>.
Please feedback any bug reports or feature requests to us by e-mail.
.SH COPYRIGHT
\(co British Crown Copyright 2006-16 Met Office.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fcm.git
More information about the debian-science-commits
mailing list