From 8aeb8434d64f1f501b3f5590747c13bd3f379f3b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 17 Apr 2016 23:39:07 -0400 Subject: [PATCH] more svn->git updates --- Makefile.am | 2 +- autogen.sh | 2 +- doc/faq.html | 13 +++++++------ po/LINGUAS | 2 +- po/update_linguas.sh | 21 ++++++++------------- 5 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Makefile.am b/Makefile.am index f0c28457..52e8cb67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies SUBDIRS = doc m4 po src -EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec +EXTRA_DIST = ChangeLog.pre-2.1 README.GIT UPGRADE nano.spec ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index 57196b59..54007223 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ #!/bin/sh -# Generate configure & friends for SVN users. +# Generate configure & friends for GIT users. autoreconf -f -i -s diff --git a/doc/faq.html b/doc/faq.html index b82aaf02..9575e608 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -19,7 +19,7 @@

2.1. FTP and WWW sites that carry nano.
2.2. RedHat and derivatives (.rpm) packages.
2.3. Debian (.deb) packages.
- 2.4. By subversion (for the brave).

+ 2.4. By GIT (for the brave).

3. Installation and Configuration

3.1. How do I install the RPM or DEB package?
3.2. Compiling from source: WHAT THE HECK DO I DO NOW?
@@ -61,7 +61,7 @@ 7.2. I want to send the development team a big load of cash (or just a thank you).
7.3. How do I submit a bug report or patch?
7.4. How do I join the development team?
- 7.5. Can I have write access to the subversion tree?

+ 7.5. Can I have write access to the GIT tree?

8. ChangeLog

1. General

@@ -111,8 +111,8 @@

You can also have a look at the Package Pool to see all the available binary and source packages.

-

2.4. By subversion (for the brave).

-

For the 'bleeding edge' current version of nano, you can use subversion to download the current source code. Note: believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see the nano SVN document for info on anonymous SVN access to the nano source.

+

2.4. By GIT (for the brave).

+

For the 'bleeding edge' current version of nano, you can use GIT to download the current source code. Note: believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see the nano GIT document for info on anonymous GIT access to the nano source.

3. Installation and Configuration

3.1. How do I install the RPM or DEB package?

@@ -254,11 +254,12 @@ Of course, due to the license change you can now use the Savannah bug tracker as you can check whether the bug you are submitting has already been submitted.

Please submit patches for nano via the Savannah project's patch manager for the nano project.

7.4. How do I join the development team?

-

The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.

-

7.5. Can I have write access to the subversion tree?

+

The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.

+

7.5. Can I have write access to the git tree?

Re-read Section 7.4 and you should know the answer.

8. ChangeLog

+2016/04/17 - Update docs to refer to GIT instead of subversion. (Mike)
2015/07/18 - More small fixes and updates. (Benno)
2014/04/24 - A bunch of small fixes and updates. (Benno)
2009/11/30 - Update various bits for nano 2.2.x. (DLR)
diff --git a/po/LINGUAS b/po/LINGUAS index 51f16128..1ceb6b70 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,2 +1,2 @@ # List of available languages. -bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW +bg ca cs da de eo es eu fi fr ga gl hr hu id it ja ms nb nl nn pl pt_BR ro ru sl sr sv tr uk vi zh_CN zh_TW diff --git a/po/update_linguas.sh b/po/update_linguas.sh index b97f6756..036e53b7 100755 --- a/po/update_linguas.sh +++ b/po/update_linguas.sh @@ -1,21 +1,16 @@ #!/bin/sh +cd "$(dirname "$0")" || exit echo "Updating translations via TP" && \ rsync -Lrtvz translationproject.org::tp/latest/nano/ . -# -NEWSTUFF=`svn status | grep "^\? .*.po$" | awk '{ print $NF }'` -if [ "x$NEWSTUFF" != "x" ]; then - echo "Adding new languaes to SVN" - svn add $NEWSTUFF -fi -# +git add -v *.po echo "Updating LINGUAS for all translations" FILE=LINGUAS -echo "# List of available languages." >$FILE -/bin/ls *.po | tr '\n' ' ' | sed 's/\.po//g' >>$FILE -echo >> $FILE -# -if [ "x$NEWSTUFF" != "x" ]; then - echo -n "New langs found, re-running configure and make at top level (silently)..." +echo "# List of available languages." >"${FILE}" +echo $(printf '%s\n' *.po | LC_ALL=C sort | sed 's/\.po//g') >>"${FILE}" +git add -v "${FILE}" +NEWSTUFF=$(git status --porcelain *.po) +if [ -n "${NEWSTUFF}" ]; then + printf "New langs found, re-running configure and make at top level (silently)..." (cd .. && ./configure && make) >/dev/null echo "done" fi