diff --git a/FAQ b/FAQ index fb6f705a..d34b8065 100644 --- a/FAQ +++ b/FAQ @@ -1,24 +1,2 @@ This FAQ is no longer kept up to date -Look at this URL for a more up to date wiki based FAQ -http://www.lavrsen.dk/twiki/bin/view/Motion/FrequentlyAskedQuestions - -Q: motion crashes while parsing the config file. - -A: Appearantly the behaviour of strtok in glibc has changed somewhat. - This problem should be fixed as of 2.3 - - -Q: Were does motion look for the config file? - -A: First it will look for 'motion.conf' in the current directory, next it will - try to find '.motion/motion.conf' in your home directory (pointed to by - the HOME environment variable). If these don't exist it will try to open - '/usr/local/etc/motion/motion.conf' if you specified /usr/local as the prefix - to configure (this is the default). - -Q: What codingstyle is used for motion? - -A: Motion follows the same style as the linux kernel. - Read Documentation/Codingstyle in the kernel tree for some good reasons. - Also be aware that motion is multithreaded and as such all functions should - be reentrant, using static variables is usually a bad idea. +Look at the guide in /usr/share/doc/motion/motion_guide.html diff --git a/Makefile.in b/Makefile.in index b430efb8..2fdc6e88 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,7 +7,7 @@ # Please read the file COPYING for more info. # ################################################################################ # Please visit the Motion home page: # -# http://www.lavrsen.dk/twiki/bin/view/Motion # +# https://motion-project.github.io/ # ################################################################################ CC = @CC@ @@ -40,7 +40,7 @@ OBJ = motion.o logger.o conf.o draw.o jpegutils.o vloopback_motion.o $( alg.o event.o picture.o rotate.o webhttpd.o \ stream.o md5.o netcam_rtsp.o @FFMPEG_OBJ@ @SDL_OBJ@ SRC = $(OBJ:.o=.c) -DOC = CHANGELOG COPYING CREDITS README motion_guide.html +DOC = CHANGELOG COPYING CREDITS README motion_guide.html mask1.png normal.jpg outputmotion1.jpg outputnormal1.jpg EXAMPLES = *.conf EXAMPLES_BIN = motion.init-Debian motion.init-Fedora motion.init-FreeBSD.sh PROGS = motion @@ -281,15 +281,4 @@ distclean: clean @echo "You will need to re-run configure if you want to build Motion." @echo -################################################################################ -# UPDATEGUIDE downloads the Motion Guide from TWiki. # -################################################################################ -updateguide: pre-build-info - @echo "Downloading Motion Guide. If it fails, please check your Internet connection." - @echo - wget www.lavrsen.dk/twiki/bin/view/Motion/MotionGuideOneLargeDocument?skin=text -O motion_guide.tmp - @echo "Cleaning up and fixing links..." - @cat motion_guide.tmp | sed -e 's/\?skin=text//g;s,"/twiki/,"http://www.lavrsen.dk/twiki/,g' > motion_guide.html - @rm -f motion_guide.tmp - @echo "All done, you should now have a local copy of the Motion guide from the home page." - @echo + diff --git a/README b/README index 624e03c0..795ce877 100644 --- a/README +++ b/README @@ -41,20 +41,17 @@ Read the motion.1 manpage for more info And most of all read the Motion Guide for very detailed description of both installation and use. -The Motion Guide is part of the distribution (motion_guide.htm). -You are encouraged to look up an up to date version by visiting the Motion -homepage at -http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome -and specifically the Motion Guide at -http://www.lavrsen.dk/twiki/bin/view/Motion/MotionGuide +The Motion Guide is part of the distribution (/usr/share/doc/motion/motion_guide.html). +You are encouraged to visit the Motion homepage at +https://motion-project.github.io/ Support: -Lots of resources at http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome +Lots of resources at https://motion-project.github.io/ Please join the mailing list -http://www.lavrsen.dk/twiki/bin/view/Motion/MailingList +https://lists.sourceforge.net/lists/listinfo/motion-user Newbies and silly questions are welcome. We prefer support through the mailing list because more will have benefit from the answers. diff --git a/README.FreeBSD b/README.FreeBSD index 29805324..b204cd42 100644 --- a/README.FreeBSD +++ b/README.FreeBSD @@ -76,13 +76,4 @@ Packages needed (dependencies for 6.x): - And many others ... Any question / fix / suggestion please send it to motion mailing list. - - - http://www.lavrsen.dk/twiki/bin/view/Motion/FreeBSD - - * WEBCAMS - ---------- - http://www.lavrsen.dk/twiki/bin/view/Motion/HowtoMotionPwcFreeBSD - - Angel Carpintero - ack@telefonica.net + \ No newline at end of file diff --git a/conf.c b/conf.c index 6a9f8910..324d066f 100644 --- a/conf.c +++ b/conf.c @@ -2404,7 +2404,7 @@ static struct context **config_thread(struct context **cnt, const char *str, */ static void usage() { - printf("motion Version "VERSION", Copyright 2000-2005 Jeroen Vreeken/Folkert van Heusden/Kenneth Lavrsen\n"); + printf("motion Version "VERSION", Copyright 2000-2016 Jeroen Vreeken/Folkert van Heusden/Kenneth Lavrsen/Motion-Project maintainers\n"); printf("\nusage:\tmotion [options]\n"); printf("\n\n"); printf("Possible options:\n\n"); diff --git a/mask1.png b/mask1.png new file mode 100644 index 00000000..1d4350d6 Binary files /dev/null and b/mask1.png differ diff --git a/motion.1 b/motion.1 index 2c262526..fbbe6b5e 100644 --- a/motion.1 +++ b/motion.1 @@ -1,4 +1,4 @@ -.TH MOTION 1 2015-09-26 "Motion" "Motion Options and Config Files" +.TH MOTION 1 2016-08-25 "Motion" "Motion Options and Config Files" .SH NAME motion \- Detct motion using a video4linux device or network camera .SH SYNOPSIS @@ -2022,11 +2022,10 @@ The time zone or name or abbreviation. .TP .B More information -Motion homepage: http://www.lavrsen.dk/foswiki/bin/view/Motion/ +Motion homepage: https://motion-project.github.io/ Motion Guide (user and installation guide): -.br http://www.lavrsen.dk/twiki/bin/view/Motion/MotionGuide -.br http://www.lavrsen.dk/twiki/bin/view/Motion/VideoFourLinuxLoopbackDevice +.br /usr/share/doc/motion/motion_guide.html .SH AUTHORS Jeroen Vreeken (pe1rxq@amsat.org), Folkert van Heusden, diff --git a/motion.spec.in b/motion.spec.in index 6cebd6cf..41c04ebd 100644 --- a/motion.spec.in +++ b/motion.spec.in @@ -5,8 +5,8 @@ Summary: A motion detection system Group: Applications/Multimedia License: GPLv2+ -URL: http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome -Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +URL: https://motion-project.github.io/ +Source0: https://github.com/Motion-Project/motion BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel diff --git a/motion_guide.html b/motion_guide.html index bca5c89d..e127b2c2 100644 --- a/motion_guide.html +++ b/motion_guide.html @@ -77,44 +77,39 @@ under the Maintenance and Support

-Both Motion and the Motion Guide are written by people that do all this as a hobby and without asking for any payments or donations. We have a life other than developing Motion and its documentation. This means that bugfixes and updates to this guide are done as our time and families allow it. You are however encouraged to participate and contribute in a very active mailing list. It is a list with a very "positive attitude" and with many contributors that propose features, post patches, discuss problems and patiently answer newbie questions with a very positive spirit. Expect 1-10 emails per day. +Both Motion and the Motion Guide are written by people that do all this as a hobby and without asking for any payments or donations. We have a life other than developing Motion and its documentation. This means that bugfixes and updates to this guide are done as our time and families allow it. You are however encouraged to participate and contribute in a very active mailing list. It is a list with a very "positive attitude" and with many contributors that propose features, post patches, discuss problems and patiently answer newbie questions with a very positive spirit. Expect 1-10 emails per day.

-To get motion direct your browser to the Motion Homepage. +To get motion direct your browser to the Motion Homepage.

-On the Download Files page you will find +On the Releases page you will find links to the latest stable version both as sources and binaries for some of the most popular Linux distributions. -You will also find links to development versions. Snapshot releases are special test releases that are normally -stable. Every day a Motion Daily Source Snap is created from the Motion Subversion -

+p>

Motion was originally written by Jeroen Vreeken and later Folkert van Heusden continued as a lead programmer with Kenneth Lavrsen responsible for Motion Guide, website and releases on Sourceforge.

-From version 3.1.12 Motion is now project managed entirely by Kenneth Lavrsen, and the project now shift -towards being developed by many contributers. +From version 3.4.1 Motion is now managed on github via a many maintainers and contributors.

-For support we encourage you to join the mailing list instead of writing to Jeroen, Folkert or Kenneth directly. -Newbies and stupid questions are welcome on the list. Contributions in the form of patches are also very welcome -on the mailing list. +For support we encourage you to join the mailing list instead of writing to the maintainers directly. +Newbies and stupid questions are welcome on the list. Contributions in the form of pull requests to the github +repository are also very welcome.

Which version to download and use?

-Versions 3.2.12 is the current official version released in June 2010. The trunk of the SVN represents the official -development branch of Motion. Additional independent development forks exist on Github that contain additional bug -fixes, enhanced features and updated documentation. +The most current release version can be found on the github releases page here. The master branch of the github +repository represents the official development branch of Motion. Additional independent development forks exist +in other Github repos that contain additional bug fixes, enhanced features and updated documentation. This guide is based upon the features and options included in the source code with which it is distributed. It was re-written in September 2015 to reflect the changes and options in the code at that time. -The majority of the new options and changed names represent differences between the official 3.2.12 version -and the SVN trunk and as a result this guide will generally apply to the code in the trunk as well. There may -however be some options and features included in this guide that are not incorporated into the trunk source code. -Users are encouraged to evaluate the pros and cons for themselves of using any particular source. +The majority of the new options and changed names represent differences between the 3.2.12 version +and the legacy SVN trunk.

-Since 3.2.12 many options have been renamed in the development branches to make setting up Motion easier. +Since 3.2.12 many options have been renamed to make setting up Motion easier.

-Motion is included in Debian and Ubuntu while RPM users can find the binary package for 3.2.12 on the Motion Sourceforge file download page. +Motion is included in Debian and Ubuntu while RPM users currently must build from source.

What features does Motion have?

-See more description at the Motion Homepage. +See more description at the Motion Homepage.