[SCM] mjpegtools/master: Finalize

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2e3b9f3d63f9c3f8561d09a1921bb31dc42742d6
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 1 17:47:16 2012 +0000

    Finalize

diff --git a/debian/changelog b/debian/changelog
index 6b5445b..e6e0b77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-mjpegtools (1:2.0.0+debian-2) UNRELEASED; urgency=low
+mjpegtools (1:2.0.0+debian-2) unstable; urgency=low
 
-  * Add epoch to allow Ubuntu auto-sync this.
+  * Team upload.
 
- -- Alessio Treglia <alessio at debian.org>  Tue, 30 Oct 2012 16:54:31 +0000
+  [ Fabian Greffrath ]
+  * dh --with autoreconf and autotools_dev are mutually exclusive.
+  * Fix patches to modify configure.ac instead of configure, we are
+    running autoreconf.
+  * Fix patches to not modify Makefile.in, we are running autoreconf.
+  * Change shebang line in scripts/lav2mpeg to bash, it is full of
+    bashisms (Closes: #690617), thanks Raphael Geissert.
+
+  [ Alessio Treglia ]
+  * Add epoch to allow Ubuntu auto-syncing this.
+  * Add headers to patches.
+
+ -- Alessio Treglia <alessio at debian.org>  Thu, 01 Nov 2012 17:45:57 +0000
 
 mjpegtools (2.0.0+debian-1) unstable; urgency=low
 

-- 
mjpegtools packaging