diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
| commit | 240550bbb94653907faa6e0bb1c5ac3d279cc252 (patch) | |
| tree | 1cd5346e52515dbeff187d040d79b92fae96caa9 /DOCS/tech | |
| parent | 9895f2360fd5e8c48f21117d6934254317891cde (diff) | |
| parent | fbb74e16a38d6a5af31a7fb369195988f7414766 (diff) | |
| download | mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.bz2 mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.xz | |
Merge svn changes up to r30848
Diffstat (limited to 'DOCS/tech')
| -rw-r--r-- | DOCS/tech/mirrors/update_mplayer_rsync | 9 | ||||
| -rw-r--r-- | DOCS/tech/nut.txt | 6 | ||||
| -rw-r--r-- | DOCS/tech/oggless-xiph-codecs.txt | 6 | ||||
| -rw-r--r-- | DOCS/tech/svn-howto.txt | 6 |
4 files changed, 9 insertions, 18 deletions
diff --git a/DOCS/tech/mirrors/update_mplayer_rsync b/DOCS/tech/mirrors/update_mplayer_rsync index cafaabe594..563ec77bc7 100644 --- a/DOCS/tech/mirrors/update_mplayer_rsync +++ b/DOCS/tech/mirrors/update_mplayer_rsync @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # MPlayer mirroring script # $Id$ @@ -10,7 +10,7 @@ MAILADR=<report_mail_to_adr> #TMPDIR = /tmp #export TMPDIR -TMPFILE=`mktemp -t mplayer.XXXXXXXXXXX` +TMPFILE=$(mktemp -t mplayer.XXXXXXXXXXX) # Check to see if another sync is in progress if lockfile -! -l 43200 -r 0 "$LOCK"; then @@ -30,9 +30,8 @@ rsync -pxlrHtWv --delete --delete-after --exclude '/benchmark' \ --exclude '/old_stuff' --exclude '/tests' rsync.mplayerhq.hu::ftp/ \ MPlayer >> $TMPFILE 2>&1 -x=`wc -l $TMPFILE | awk '{print $1}'` -if [ "$x" -ne "10" ] -then +x=$(wc -l $TMPFILE | awk '{print $1}') +if [ "$x" -ne "10" ]; then mailx -s "MPlayer mirror" $MAILADR < $TMPFILE fi rm -f $TMPFILE diff --git a/DOCS/tech/nut.txt b/DOCS/tech/nut.txt deleted file mode 100644 index 0d26d5f42b..0000000000 --- a/DOCS/tech/nut.txt +++ /dev/null @@ -1,6 +0,0 @@ -The NUT specification has been moved to another Subversion repository. -You can find it at: -http://svn.mplayerhq.hu/nut/docs/nut.txt?view=markup - -Its future location will be in a git repository. This file will be -updated when its location changes again. diff --git a/DOCS/tech/oggless-xiph-codecs.txt b/DOCS/tech/oggless-xiph-codecs.txt deleted file mode 100644 index 2b780b70de..0000000000 --- a/DOCS/tech/oggless-xiph-codecs.txt +++ /dev/null @@ -1,6 +0,0 @@ -oggless-xiph-codecs.txt has been moved to another Subversion repository. -You can find it at: -http://svn.mplayerhq.hu/nut/docs/oggless-xiph-codecs.txt?view=markup - -Its future location will be in a git repository. This file will be -updated when its location changes again. diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt index 054e18b4f3..932dad237d 100644 --- a/DOCS/tech/svn-howto.txt +++ b/DOCS/tech/svn-howto.txt @@ -21,10 +21,14 @@ http://svnbook.org/ For more information about the Subversion project, visit -http://subversion.tigris.org/ +http://subversion.apache.org/ Consult these resources whenever you have problems, they are quite exhaustive. +You do not need a special checkout that works through ssh or similar in order +to be able to commit changes. All you need is the username and password pair +that you received from the MPlayer Subversion server admin. + What follows now is a basic introduction to Subversion and some MPlayer-specific guidelines. Read it at least once, if you are granted commit privileges to the MPlayer project you are expected to be familiar with these rules. |