[SCM] videotrans/master: Imported Debian patch 1.6.1-6

[hpfn-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dcaccbdbccfeb8098a26e74416366a0940f57bab
Author: Herbert Parentes Fortes Neto <hpfn at ig.com.br>
Date:   Wed Mar 2 13:21:34 2016 -0300

    Imported Debian patch 1.6.1-6

diff --git a/debian/changelog b/debian/changelog
index 46a57d3..dfeac53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+videotrans (1.6.1-6) unstable; urgency=low
+
+  * avconv -> ffmpeg conversion.
+  * debian/control:
+      - Replace libav-tools with ffmpeg in the Depends field.
+  * debian/copyright updated.
+  * debian/lintian-overrides created.
+  * debian/patches:
+      - 03-ffmpeg_to_avconv.patch comment in series file. So not in use.
+        File kept.
+  * debian/rules:
+      - hardening added.
+  * debian/watch:
+      - version 4.
+
+ -- Herbert Parentes Fortes Neto <hpfn at ig.com.br>  Wed, 02 Mar 2016 13:21:34 -0300
+
 videotrans (1.6.1-5) unstable; urgency=low
 
   * New maintainer. Thanks Alessio for the working done.
diff --git a/debian/control b/debian/control
index 20ff020..4b67c2c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,15 @@ Build-Depends:
  dh-autoreconf
 Standards-Version: 3.9.7
 Homepage: http://videotrans.sourceforge.net
+Vcs-Git: https://anonscm.debian.org/git/collab-maint/videotrans.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/videotrans.git
 
 Package: videotrans
 Architecture: any
 Depends:
  dvdauthor,
  imagemagick,
- libav-tools,
+ ffmpeg,
  mjpegtools,
  mplayer,
  ${misc:Depends},
diff --git a/debian/copyright b/debian/copyright
index 96ec823..83cf631 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,13 @@ Upstream-Contact: Sven Berkvens-Matthijsse <sven at berkvens.net>
 Source: http://sf.net/projects/videotrans/files/
 
 Files: *
-Copyright: 2005-2007 Sven Berkvens-Matthijsse
+Copyright: 2005-2011 Sven Berkvens-Matthijsse
 License: BSD-3-clause
 
 Files: debian/*
-Copyright:
- 2012 Alessio Treglia <alessio at debian.org>
- 2007 Matvey Kozhev <sikon at lucidfox.org>
+Copyright: 2007 Matvey Kozhev <sikon at lucidfox.org>
+           2012 Alessio Treglia <alessio at debian.org>
+           2016 Herbert Parentes Fortes Neto <hpfn at ig.com.br>
 License: BSD-3-clause
 
 License: BSD-3-clause
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..9de6a57
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,3 @@
+# the script is source directly instead of having
+# to create an expensive subshell.
+videotrans: script-not-executable usr/share/videotrans/library.sh
diff --git a/debian/patches/series b/debian/patches/series
index 094aadc..a7af308 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 01-fix_shebang.patch
 02-buildsystem.patch
-03-ffmpeg_to_avconv.patch
+#03-ffmpeg_to_avconv.patch
 04-update_imagemagick.patch
diff --git a/debian/rules b/debian/rules
index 836152b..75ef1d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+
 CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
 
 %:
diff --git a/debian/watch b/debian/watch
index 180080e..8d7e5ed 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
+version=4
 http://sf.net/videotrans/videotrans-(.*)\.tar\.gz

-- 
videotrans packaging