diff -Nru flvmeta-1.2.0/CHANGELOG.md flvmeta-1.2.1/CHANGELOG.md --- flvmeta-1.2.0/CHANGELOG.md 2016-08-07 14:23:17.000000000 +0000 +++ flvmeta-1.2.1/CHANGELOG.md 2016-08-09 09:37:17.000000000 +0000 @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [1.2.1] - 2016-08-09 +### Fixed +- Fixed spelling in documentation. +- Fixed changelog. + ## [1.2.0] - 2016-08-08 ### Added - Added dumping of AVC and AAC packet information. @@ -196,7 +201,8 @@ ## [1.0] - 2007-09-21 This is the first public release. -[unreleased]: https://github.com/noirotm/flvmeta/compare/v1.1.2...HEAD +[1.2.1]: https://github.com/noirotm/flvmeta/releases/tag/v1.2.1 +[1.2.0]: https://github.com/noirotm/flvmeta/releases/tag/v1.2.0 [1.1.2]: https://github.com/noirotm/flvmeta/releases/tag/v1.1.2 [1.1.1]: https://github.com/noirotm/flvmeta/releases/tag/v1.1.1 [1.1.0.1]: https://github.com/noirotm/flvmeta/releases/tag/v1.1.0.1 diff -Nru flvmeta-1.2.0/CMakeLists.txt flvmeta-1.2.1/CMakeLists.txt --- flvmeta-1.2.0/CMakeLists.txt 2016-08-07 14:23:17.000000000 +0000 +++ flvmeta-1.2.1/CMakeLists.txt 2016-08-09 09:37:17.000000000 +0000 @@ -3,7 +3,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) -set(FLVMETA_VERSION "1.2.0") +set(FLVMETA_VERSION "1.2.1") set(FLVMETA_RELEASE yes) # check whether we are building a release or a git snapshot diff -Nru flvmeta-1.2.0/debian/changelog flvmeta-1.2.1/debian/changelog --- flvmeta-1.2.0/debian/changelog 2016-08-08 07:05:21.000000000 +0000 +++ flvmeta-1.2.1/debian/changelog 2016-10-02 02:44:23.000000000 +0000 @@ -1,3 +1,10 @@ +flvmeta (1.2.1-1) unstable; urgency=medium + + * New upstream version 1.2.1 + * Drop d/p/fix-manpage-spelling-errors.patch, Merged upstream. + + -- Neutron Soutmun Sun, 02 Oct 2016 09:44:23 +0700 + flvmeta (1.2.0-1) unstable; urgency=medium * Imported Upstream version 1.2.0 diff -Nru flvmeta-1.2.0/debian/patches/fix-manpage-spelling-errors.patch flvmeta-1.2.1/debian/patches/fix-manpage-spelling-errors.patch --- flvmeta-1.2.0/debian/patches/fix-manpage-spelling-errors.patch 2016-08-08 07:05:21.000000000 +0000 +++ flvmeta-1.2.1/debian/patches/fix-manpage-spelling-errors.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -Description: Fix manpage spelling errors -Author: Neutron Soutmun -Forwarded: https://github.com/noirotm/flvmeta/pull/11 -Last-Update: 2016-08-08 - -From 100c291de5ee55099ba022533686cb4c136ac81d Mon Sep 17 00:00:00 2001 -From: Neutron Soutmun -Date: Mon, 8 Aug 2016 13:33:50 +0700 -Subject: [PATCH] Fix manpage spelling errors - -* s/implicitely/implicitly -* s/occured/occurred ---- - man/flvmeta.1.md | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/man/flvmeta.1.md b/man/flvmeta.1.md -index 13cd4e9..9d055fb 100644 ---- a/man/flvmeta.1.md -+++ b/man/flvmeta.1.md -@@ -55,7 +55,7 @@ the file's tags headers in memory. - Only one command can be specified for an invocation of **flvmeta**. The chosen - command determines the mode of execution of the program. - --By default, if no command is specified, **flvmeta** will implicitely choose the -+By default, if no command is specified, **flvmeta** will implicitly choose the - command to use according to the presence of *INPUT_FILE* and *OUTPUT_FILE*. - - If only *INPUT_FILE* is present, the **\--dump** command will be executed. -@@ -287,12 +287,12 @@ as JSON. - # EXIT STATUS - - * **0** flvmeta exited without error --* **1** an error occured when trying to open an input file -+* **1** an error occurred when trying to open an input file - * **2** the input file was not recognized as an FLV file - * **3** an end-of-file condition was encountered unexpectedly --* **4** a memory allocation error occured during the run of the program -+* **4** a memory allocation error occurred during the run of the program - * **5** an empty tag was encountered in an input file --* **6** an error occured when trying to open an output file -+* **6** an error occurred when trying to open an output file - * **7** an invalid tag was encountered in an input file - * **8** an error was encountered while writing an output file - * **9** the **\--check** command reported an invalid file (one or more errors) --- -2.8.1 - diff -Nru flvmeta-1.2.0/debian/patches/series flvmeta-1.2.1/debian/patches/series --- flvmeta-1.2.0/debian/patches/series 2016-08-08 07:05:21.000000000 +0000 +++ flvmeta-1.2.1/debian/patches/series 2016-10-02 02:44:23.000000000 +0000 @@ -1,2 +1 @@ 90-cmake-use-system-libyaml.patch -fix-manpage-spelling-errors.patch diff -Nru flvmeta-1.2.0/man/flvmeta.1.md flvmeta-1.2.1/man/flvmeta.1.md --- flvmeta-1.2.0/man/flvmeta.1.md 2016-08-07 14:23:17.000000000 +0000 +++ flvmeta-1.2.1/man/flvmeta.1.md 2016-08-09 09:37:17.000000000 +0000 @@ -55,7 +55,7 @@ Only one command can be specified for an invocation of **flvmeta**. The chosen command determines the mode of execution of the program. -By default, if no command is specified, **flvmeta** will implicitely choose the +By default, if no command is specified, **flvmeta** will implicitly choose the command to use according to the presence of *INPUT_FILE* and *OUTPUT_FILE*. If only *INPUT_FILE* is present, the **\--dump** command will be executed. @@ -287,12 +287,12 @@ # EXIT STATUS * **0** flvmeta exited without error -* **1** an error occured when trying to open an input file +* **1** an error occurred when trying to open an input file * **2** the input file was not recognized as an FLV file * **3** an end-of-file condition was encountered unexpectedly -* **4** a memory allocation error occured during the run of the program +* **4** a memory allocation error occurred during the run of the program * **5** an empty tag was encountered in an input file -* **6** an error occured when trying to open an output file +* **6** an error occurred when trying to open an output file * **7** an invalid tag was encountered in an input file * **8** an error was encountered while writing an output file * **9** the **\--check** command reported an invalid file (one or more errors)