fix conflicts

Wesnydy Ribeiro
2 parents a136619c 543388de
Showing 1 changed file with 64 additions and 0 deletions Show diff stats
README.md
@@ -0,0 +1,64 @@
+# VLibras Video Container
+
+## Requirements
+
+Recommended OS: [Linux Ubuntu 14.04.4 LTS 64-bit](http://releases.ubuntu.com/14.04/).
+
+Dependencies: [Docker](https://www.docker.com/), [RabbitMQ](https://www.rabbitmq.com/),
+              [Graylog](https://www.graylog.org/), [Nodejs](https://nodejs.org/en/),
+              [Redis](https://redis.io/), [MongoDB](https://www.mongodb.com/),
+              [FFMPEG](https://www.ffmpeg.org/).
+
+>Note: See Installation section to install dependencies.
+
+You need install some packages: `build-essential`, `git`, `libssl-dev`, `python-pip`,
+  `python-setuptools`.
+
+```sh
+    $ sudo apt-get update
+    $ sudo apt-get install -y build-essential git libssl-dev python-pip python-setuptools
+```
+
+## Sources
+
+To get source code, use these command:
+
+```sh
+    $ git clone 'git@gitlab.lavid.ufpb.br:vlibras/vlibras-video-container.git'
+```
+
+## Installation
+
+To install vlibras-video-container for production, use these commands:
+
+```sh
+    $ docker build
+```
+
+If you need to install for development, use these commands:
+
+```sh
+    $ cd dependencies
+    $ ./configure
+```
+
+## Execution instructions
+
+Execute each worker in the core folder
+
+## GPLv3 License
+
+{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1046{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
+{\colortbl ;\red0\green0\blue255;}
+{\*\generator Riched20 10.0.14393}\viewkind4\uc1
+\pard\sa200\sl276\slmult1\b\f0\fs48\lang22 Licen\'e7a GPLv3\b0\fs22\par
+Este arquivo esta sujeito a versao 3 da GNU General Public License, que foi adicionada nesse pacote no arquivo COPYING e esta disponivel pela Web em {{\field{\*\fldinst{HYPERLINK http://pt.wikipedia.org/wiki/GNU_General_Public_License }}{\fldrslt{http://pt.wikipedia.org/wiki/GNU_General_Public_License\ul0\cf0}}}}\f0\fs22 ; Qualquer notifica\'e7\'e3o mande um email para os mantenedores do projeto.\par
+{{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/gpl-3.0.html }}{\fldrslt{http://www.gnu.org/licenses/gpl-3.0.html\ul0\cf0}}}}\f0\fs22\par
+A GPL3 \'e9 recursiva! Com isso n\'e3o haver\'e1 prote\'e7\'e3o intelectual sobre tais sistemas! Ou seja, GPL \'e9 viral. O que significa dizer que qualquer coisa que ela toca, vira GPL. Se voc\'ea usar uma biblioteca GPL, seu aplicativo ser\'e1 GPL.\par
+}
+
+## Contributors
+
+* Erickson Silva <erickson.silva@lavid.ufpb.br>
+* Jonathan Lincoln Brilhante <jonathan.lincoln.brilhante@gmail.com>
+* Wesnydy Lima Ribeiro <wesnydy@lavid.ufpb.br>
...	...	@@ -0,0 +1,64 @@
	1	+# VLibras Video Container
	2	+
	3	+## Requirements
	4	+
	5	+Recommended OS: [Linux Ubuntu 14.04.4 LTS 64-bit](http://releases.ubuntu.com/14.04/).
	6	+
	7	+Dependencies: [Docker](https://www.docker.com/), [RabbitMQ](https://www.rabbitmq.com/),
	8	+ [Graylog](https://www.graylog.org/), [Nodejs](https://nodejs.org/en/),
	9	+ [Redis](https://redis.io/), [MongoDB](https://www.mongodb.com/),
	10	+ [FFMPEG](https://www.ffmpeg.org/).
	11	+
	12	+>Note: See Installation section to install dependencies.
	13	+
	14	+You need install some packages: `build-essential`, `git`, `libssl-dev`, `python-pip`,
	15	+ `python-setuptools`.
	16	+
	17	+```sh
	18	+ $ sudo apt-get update
	19	+ $ sudo apt-get install -y build-essential git libssl-dev python-pip python-setuptools
	20	+```
	21	+
	22	+## Sources
	23	+
	24	+To get source code, use these command:
	25	+
	26	+```sh
	27	+ $ git clone 'git@gitlab.lavid.ufpb.br:vlibras/vlibras-video-container.git'
	28	+```
	29	+
	30	+## Installation
	31	+
	32	+To install vlibras-video-container for production, use these commands:
	33	+
	34	+```sh
	35	+ $ docker build
	36	+```
	37	+
	38	+If you need to install for development, use these commands:
	39	+
	40	+```sh
	41	+ $ cd dependencies
	42	+ $ ./configure
	43	+```
	44	+
	45	+## Execution instructions
	46	+
	47	+Execute each worker in the core folder
	48	+
	49	+## GPLv3 License
	50	+
	51	+{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1046{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
	52	+{\colortbl ;\red0\green0\blue255;}
	53	+{\*\generator Riched20 10.0.14393}\viewkind4\uc1
	54	+\pard\sa200\sl276\slmult1\b\f0\fs48\lang22 Licen\'e7a GPLv3\b0\fs22\par
	55	+Este arquivo esta sujeito a versao 3 da GNU General Public License, que foi adicionada nesse pacote no arquivo COPYING e esta disponivel pela Web em {{\field{\*\fldinst{HYPERLINK http://pt.wikipedia.org/wiki/GNU_General_Public_License }}{\fldrslt{http://pt.wikipedia.org/wiki/GNU_General_Public_License\ul0\cf0}}}}\f0\fs22 ; Qualquer notifica\'e7\'e3o mande um email para os mantenedores do projeto.\par
	56	+{{\field{\*\fldinst{HYPERLINK http://www.gnu.org/licenses/gpl-3.0.html }}{\fldrslt{http://www.gnu.org/licenses/gpl-3.0.html\ul0\cf0}}}}\f0\fs22\par
	57	+A GPL3 \'e9 recursiva! Com isso n\'e3o haver\'e1 prote\'e7\'e3o intelectual sobre tais sistemas! Ou seja, GPL \'e9 viral. O que significa dizer que qualquer coisa que ela toca, vira GPL. Se voc\'ea usar uma biblioteca GPL, seu aplicativo ser\'e1 GPL.\par
	58	+}
	59	+
	60	+## Contributors
	61	+
	62	+* Erickson Silva <erickson.silva@lavid.ufpb.br>
	63	+* Jonathan Lincoln Brilhante <jonathan.lincoln.brilhante@gmail.com>
	64	+* Wesnydy Lima Ribeiro <wesnydy@lavid.ufpb.br>
...	...