[SCM] mjpegtools/master: Imported Debian patch 1:2.1.0+debian-2.1

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26f5919fb20980bfa125cf07ac0363aa67ed648b
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Nov 16 13:47:23 2013 +0100

    Imported Debian patch 1:2.1.0+debian-2.1

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 00db02a..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.pc
-*~
-*.rej
diff --git a/debian/changelog b/debian/changelog
index 22c1582..8f05218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mjpegtools (1:2.1.0+debian-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add Breaks+Replaces against the improperly transitioned library packages
+    from 1:2.1.0+debian-1.  (Closes: #727097, #727635)
+  * Ship lav2avi.sh.  (Closes: #709256)
+
+ -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Nov 2013 13:47:23 +0100
+
 mjpegtools (1:2.1.0+debian-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 117771e..1b76889 100644
--- a/debian/control
+++ b/debian/control
@@ -96,6 +96,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ liblavfile-2.0-0 (>> 1:2.1.0)
+Replaces:
+ liblavfile-2.0-0 (>> 1:2.1.0)
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -111,6 +115,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ liblavjpeg-2.0-0 (>> 1:2.1.0)
+Replaces:
+ liblavjpeg-2.0-0 (>> 1:2.1.0)
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -126,6 +134,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ liblavplay-2.0-0 (>> 1:2.1.0)
+Replaces:
+ liblavplay-2.0-0 (>> 1:2.1.0)
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -141,6 +153,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ libmjpegutils-2.0-0 (>> 1:2.1.0)
+Replaces:
+ libmjpegutils-2.0-0 (>> 1:2.1.0)
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -156,6 +172,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ libmpeg2encpp-2.0-0 (>> 1:2.1.0)
+Replaces:
+ libmpeg2encpp-2.0-0 (>> 1:2.1.0)
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
@@ -171,6 +191,10 @@ Pre-Depends:
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Breaks:
+ libmplex2-2.0-0 (>> 1:2.1.0)
+Replaces:
+ libmplex2-2.0-0 (>> 1:2.1.0)
 Description: MJPEG capture/editing/replay and MPEG encoding toolset (library)
  The mjpeg programs are a set of tools that can do recording of videos and
  playback, simple cut-and-paste editing and the MPEG compression of audio and
diff --git a/debian/mjpegtools.install b/debian/mjpegtools.install
index bf119b9..e21d87b 100644
--- a/debian/mjpegtools.install
+++ b/debian/mjpegtools.install
@@ -35,3 +35,4 @@ usr/bin/yuvmedianfilter
 usr/bin/yuvplay
 usr/bin/yuvycsnoise
 usr/share/*
+usr/bin/lav2avi.sh	usr/lib/mjpegtools/bin/
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes

-- 
mjpegtools packaging