[SCM] ffmpeg/ubuntu.extra: Remove dummy packages with 'unstripped' notation

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 001d453c024dfc6a313cf52d585a1ed2d724be45
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 11:34:52 2010 +0100

    Remove dummy packages with 'unstripped' notation
    
    These were necessary for transitional purposes only

diff --git a/debian/control b/debian/control
index 8b63535..8b4ad51 100644
--- a/debian/control
+++ b/debian/control
@@ -55,8 +55,8 @@ Package: libavutil-extra-50
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavutil50, libavutil-unstripped-50 (<< ${binary:Version})
-Replaces: libavutil50, libavutil-unstripped-50 (<< ${binary:Version})
+Conflicts: libavutil50
+Replaces: libavutil50
 Description: ffmpeg utility library
  This is the common utility library from the ffmpeg project. It is required
  by all other ffmpeg libraries.
@@ -64,19 +64,13 @@ Description: ffmpeg utility library
  This package contains a unrestricted version of the libavutil shared
  object that should only be used by Debian packages.
 
-Package: libavutil-unstripped-50
-Architecture: any
-Depends: libavutil-extra-50 (= ${binary:Version}), ${misc:Depends}
-Description: ffmpeg utility library - transitional package
- This package can be safely removed if no other packages depend on this
-
 Package: libavcodec-extra-52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: libfaad0
-Conflicts: libavcodec52, libavcodec-unstripped-52 (<< ${binary:Version})
-Replaces: libavcodec52, libavcodec-unstripped-52 (<< ${binary:Version}), ffmpeg (<< 4:0.5.1-1)
+Conflicts: libavcodec52
+Replaces: libavcodec52, ffmpeg (<< 4:0.5.1-1)
 Description: ffmpeg codec library
  This is the codec library from the ffmpeg project. It supports most existing
  encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
@@ -84,30 +78,18 @@ Description: ffmpeg codec library
  This package contains a unrestricted version of the libavcodec shared
  object that should only be used by Debian packages.
 
-Package: libavcodec-unstripped-52
-Architecture: any
-Depends: libavcodec-extra-52 (= ${binary:Version}), ${misc:Depends}
-Description: ffmpeg utility library - transitional package
- This package can be safely removed if no other packages depend on this
-
 Package: libavdevice-extra-52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavdevice52, libavdevice-unstripped-52 (<< ${binary:Version})
-Replaces: libavdevice52, libavdevice-unstripped-52 (<< ${binary:Version})
+Conflicts: libavdevice52
+Replaces: libavdevice52
 Description: ffmpeg device handling library
  This is the device handling library from the ffmpeg project.
  .
  This package contains a unrestricted version of the libavdevice shared
  object that should only be used by Debian packages.
 
-Package: libavdevice-unstripped-52
-Architecture: any
-Depends: libavdevice-extra-52 (= ${binary:Version}), ${misc:Depends}
-Description: ffmpeg utility library - transitional package
- This package can be safely removed if no other packages depend on this
-
 Package: libavfilter-extra-1
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -124,26 +106,20 @@ Package: libpostproc-extra-51
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libpostproc51, libpostproc-unstripped-51 (<< ${binary:Version})
-Replaces: libpostproc51, libpostproc-unstripped-51 (<< ${binary:Version})
+Conflicts: libpostproc51
+Replaces: libpostproc51
 Description: ffmpeg video postprocessing library
  This is the video postprocessing library from the ffmpeg project.
  .
  This package contains a unrestricted version of the libpostproc shared
  object that should only be used by Debian packages.
 
-Package: libpostproc-unstripped-51
-Architecture: any
-Depends: libpostproc-extra-51 (= ${binary:Version}), ${misc:Depends}
-Description: ffmpeg utility library - transitional package
- This package can be safely removed if no other packages depend on this
-
 Package: libavformat-extra-52
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libavformat52, libavformat-unstripped-52 (<< ${binary:Version})
-Replaces: libavformat52, libavformat-unstripped-52 (<< ${binary:Version})
+Conflicts: libavformat52
+Replaces: libavformat52
 Breaks: libavcodec51
 Description: ffmpeg file format library
  This is the demuxer library from the ffmpeg project. It supports most
@@ -152,27 +128,14 @@ Description: ffmpeg file format library
  This package contains a unrestricted version of the libavformat shared
  object that should only be used by Debian packages.
 
-Package: libavformat-unstripped-52
-Architecture: any
-Depends: libavformat-extra-52 (= ${binary:Version}), ${misc:Depends}
-Description: ffmpeg utility library - transitional package
- This package can be safely removed if no other packages depend on this
-
 Package: libswscale-extra-0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Conflicts: libswscale0, libswscale-unstripped-0 (<< ${binary:Version})
-Replaces: libswscale0, libswscale-unstripped-0 (<< ${binary:Version})
+Conflicts: libswscale0
+Replaces: libswscale0
 Description: ffmpeg video scaling library
  This is the video scaling library from the ffmpeg project.
  .
  This package contains a unrestricted version of the libswscale shared
  object that should only be used by Debian packages.
-
-Package: libswscale-unstripped-0
-Architecture: any
-Depends: libswscale-extra-0 (= ${binary:Version}), ${misc:Depends}
-Description: ffmpeg utility library - transitional package
- This package can be safely removed if no other packages depend on this
-

-- 
FFmpeg packaging