[oggvideotools] 01/02: Move to source format 3.0 (quilt) and move all upstream changes to new version-0.8a-1.patch.
Petter Reinholdtsen
pere at moszumanska.debian.org
Wed Oct 22 07:42:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
pere pushed a commit to branch master
in repository oggvideotools.
commit 9a2c8747f8e292160139b7ff265b5ec9e25caa73
Author: Petter Reinholdtsen <pere at hungry.com>
Date: Wed Oct 22 09:35:15 2014 +0200
Move to source format 3.0 (quilt) and move all upstream changes to new version-0.8a-1.patch.
---
debian/patches/series | 1 +
debian/patches/version-0.8a-1.patch | 140 ++++++++++++++++++++++++++++++++++++
debian/source/format | 1 +
docs/oggThumb.1 | 6 +-
docs/oggThumb.html | 4 +-
src/CMakeLists.txt | 3 +-
src/oggCat.cpp | 1 -
src/oggCut.cpp | 1 -
src/oggDump.cpp | 1 -
src/oggLength.cpp | 1 -
src/oggSilence.cpp | 1 -
src/oggSlideshow.cpp | 1 -
src/oggTranscode.cpp | 1 -
13 files changed, 148 insertions(+), 14 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cd97580
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+version-0.8a-1.patch
diff --git a/debian/patches/version-0.8a-1.patch b/debian/patches/version-0.8a-1.patch
new file mode 100644
index 0000000..4c6ae08
--- /dev/null
+++ b/debian/patches/version-0.8a-1.patch
@@ -0,0 +1,140 @@
+Description: changes foudn in version 0.8a-1
+Author: ?
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- oggvideotools-0.8a.orig/src/oggCat.cpp
++++ oggvideotools-0.8a/src/oggCat.cpp
+@@ -32,6 +32,7 @@
+
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+
+ #include "definition.h"
+ #include "helper.h"
+--- oggvideotools-0.8a.orig/src/CMakeLists.txt
++++ oggvideotools-0.8a/src/CMakeLists.txt
+@@ -123,7 +123,8 @@ INCLUDE_DIRECTORIES ( ${THEORADEC_INCLUD
+ IF ( $ENV{MAKE_PACKAGE} )
+ ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} )
+ ELSE ( $ENV{MAKE_PACKAGE} )
+- ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} )
++ ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} )
++# ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} )
+ ENDIF ( $ENV{MAKE_PACKAGE} )
+ TARGET_LINK_LIBRARIES ( oggvideotools ${ALL_LIBS})
+
+--- oggvideotools-0.8a.orig/src/oggDump.cpp
++++ oggvideotools-0.8a/src/oggDump.cpp
+@@ -31,6 +31,7 @@
+ #include <fstream>
+ #include <ostream>
+ #include <cstdlib>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "rawMediaPacket.h"
+--- oggvideotools-0.8a.orig/src/oggLength.cpp
++++ oggvideotools-0.8a/src/oggLength.cpp
+@@ -27,6 +27,7 @@
+ #include <iostream>
+ #include <string>
+ #include <cstdlib>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+--- oggvideotools-0.8a.orig/src/oggSilence.cpp
++++ oggvideotools-0.8a/src/oggSilence.cpp
+@@ -30,6 +30,7 @@
+ #include <sstream>
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+
+ #include "vorbisEncoder.h"
+ #include "streamMux.h"
+--- oggvideotools-0.8a.orig/src/oggSlideshow.cpp
++++ oggvideotools-0.8a/src/oggSlideshow.cpp
+@@ -36,6 +36,7 @@
+ #include <cstring>
+ #include <ctime>
+ #include <exception>
++#include <unistd.h>
+
+ #include "th_helper.h"
+
+--- oggvideotools-0.8a.orig/src/oggCut.cpp
++++ oggvideotools-0.8a/src/oggCut.cpp
+@@ -29,6 +29,7 @@
+ #include <map>
+ #include <cstdlib>
+ #include <ctime>
++#include <unistd.h>
+
+ #include "fileRepository.h"
+ #include "streamSerializer.h"
+--- oggvideotools-0.8a.orig/src/oggTranscode.cpp
++++ oggvideotools-0.8a/src/oggTranscode.cpp
+@@ -34,6 +34,7 @@
+ #include <cstdlib>
+ #include <cmath>
+ #include <ctime>
++#include <unistd.h>
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+--- oggvideotools-0.8a.orig/docs/oggThumb.html
++++ oggvideotools-0.8a/docs/oggThumb.html
+@@ -35,13 +35,13 @@ Where x starts with 0 and is incremented
+
+ <DL COMPACT>
+ <DT>-t<DD>
+-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
++Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
+ <P>
+ <I>Example: -t 12.4,14.157,13.23</I>
+
+ <P>
+ <DT>-f<DD>
+-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
++Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
+ <P>
+ <I>Example: -f 12000,13000,11000</I>
+
+--- oggvideotools-0.8a.orig/docs/oggThumb.1
++++ oggvideotools-0.8a/docs/oggThumb.1
+@@ -15,12 +15,12 @@ Where x starts with 0 and is incremented
+
+ .SH OPTIONS
+ .IP -t
+-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
++Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
+
+ .I Example: \-t 12.4,14.157,13.23
+
+ .IP -f
+-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
++Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
+
+ .I Example: \-f 12000,13000,11000
+
+@@ -58,4 +58,4 @@ Joern Seger <yorn at gmx dot net>
+ .BR oggSplit (1),
+ .BR oggTranscode (1),
+ .BR oggSlideshow (1),
+-.BR oggSilence (1)
+\ No newline at end of file
++.BR oggSilence (1)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/docs/oggThumb.1 b/docs/oggThumb.1
index 793be8b..fdfdea2 100644
--- a/docs/oggThumb.1
+++ b/docs/oggThumb.1
@@ -15,12 +15,12 @@ Where x starts with 0 and is incremented with every created thumbnail. So the th
.SH OPTIONS
.IP -t
-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
+Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
.I Example: \-t 12.4,14.157,13.23
.IP -f
-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
+Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
.I Example: \-f 12000,13000,11000
@@ -58,4 +58,4 @@ Joern Seger <yorn at gmx dot net>
.BR oggSplit (1),
.BR oggTranscode (1),
.BR oggSlideshow (1),
-.BR oggSilence (1)
+.BR oggSilence (1)
\ No newline at end of file
diff --git a/docs/oggThumb.html b/docs/oggThumb.html
index 1c24032..a4fda56 100644
--- a/docs/oggThumb.html
+++ b/docs/oggThumb.html
@@ -35,13 +35,13 @@ Where x starts with 0 and is incremented with every created thumbnail. So the th
<DL COMPACT>
<DT>-t<DD>
-Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by commas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
+Time at which a thumbnail should be created. More than one thumbnail time can be concatenated by komas. The times can be set by integer or floating point values in seconds. If the time is not exactly matching, the next frame is used. The times don't have to be sorted incrementally.
<P>
<I>Example: -t 12.4,14.157,13.23</I>
<P>
<DT>-f<DD>
-Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by commas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
+Number of a frame that should be created as a thumbnail. More than one thumbnail frame can be concatenated by komas. The frame numbers must be an integers. The frame numbers don't have to be sorted incrementally.
<P>
<I>Example: -f 12000,13000,11000</I>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22451be..678a828 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,8 +123,7 @@ INCLUDE_DIRECTORIES ( ${THEORADEC_INCLUDE_DIRS} ${THEORAENC_INCLUDE_DIRS}
IF ( $ENV{MAKE_PACKAGE} )
ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} )
ELSE ( $ENV{MAKE_PACKAGE} )
- ADD_LIBRARY ( oggvideotools STATIC ${LIBRARY_SRC} ${RESAMPLE_SRC} )
-# ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} )
+ ADD_LIBRARY ( oggvideotools SHARED ${LIBRARY_SRC} ${RESAMPLE_SRC} )
ENDIF ( $ENV{MAKE_PACKAGE} )
TARGET_LINK_LIBRARIES ( oggvideotools ${ALL_LIBS})
diff --git a/src/oggCat.cpp b/src/oggCat.cpp
index 56bdbb0..708e74d 100644
--- a/src/oggCat.cpp
+++ b/src/oggCat.cpp
@@ -32,7 +32,6 @@
#include <cstdlib>
#include <ctime>
-#include <unistd.h>
#include "definition.h"
#include "helper.h"
diff --git a/src/oggCut.cpp b/src/oggCut.cpp
index c91c3ca..d66f3b5 100644
--- a/src/oggCut.cpp
+++ b/src/oggCut.cpp
@@ -29,7 +29,6 @@
#include <map>
#include <cstdlib>
#include <ctime>
-#include <unistd.h>
#include "fileRepository.h"
#include "streamSerializer.h"
diff --git a/src/oggDump.cpp b/src/oggDump.cpp
index 5641c64..37480c2 100644
--- a/src/oggDump.cpp
+++ b/src/oggDump.cpp
@@ -31,7 +31,6 @@
#include <fstream>
#include <ostream>
#include <cstdlib>
-#include <unistd.h>
#include "fileRepository.h"
#include "rawMediaPacket.h"
diff --git a/src/oggLength.cpp b/src/oggLength.cpp
index e284397..07ec77c 100644
--- a/src/oggLength.cpp
+++ b/src/oggLength.cpp
@@ -27,7 +27,6 @@
#include <iostream>
#include <string>
#include <cstdlib>
-#include <unistd.h>
#include "fileRepository.h"
#include "streamSerializer.h"
diff --git a/src/oggSilence.cpp b/src/oggSilence.cpp
index c37d1dc..ec0a7d2 100644
--- a/src/oggSilence.cpp
+++ b/src/oggSilence.cpp
@@ -30,7 +30,6 @@
#include <sstream>
#include <cstdlib>
#include <ctime>
-#include <unistd.h>
#include "vorbisEncoder.h"
#include "streamMux.h"
diff --git a/src/oggSlideshow.cpp b/src/oggSlideshow.cpp
index 3190abb..1aef196 100644
--- a/src/oggSlideshow.cpp
+++ b/src/oggSlideshow.cpp
@@ -36,7 +36,6 @@
#include <cstring>
#include <ctime>
#include <exception>
-#include <unistd.h>
#include "th_helper.h"
diff --git a/src/oggTranscode.cpp b/src/oggTranscode.cpp
index 09cc1b8..f212c46 100644
--- a/src/oggTranscode.cpp
+++ b/src/oggTranscode.cpp
@@ -34,7 +34,6 @@
#include <cstdlib>
#include <cmath>
#include <ctime>
-#include <unistd.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xiph/oggvideotools.git
More information about the pkg-xiph-commits
mailing list