[SCM] libav/ubuntu: bump epoch from 4:->6: for consistency with debian

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 3971cdd47af17b814571cb00734b5bf244276164
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 11 11:48:30 2012 +0200

    bump epoch from 4:->6: for consistency with debian

diff --git a/debian/changelog b/debian/changelog
index f139435..2019cbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-libav (4:0.8.3-6ubuntu1) quantal; urgency=low
+libav (6:0.8.3-6ubuntu1) quantal; urgency=low
 
   * Merge from debian, remaining changes:
-    - epoch set to 4:
     - don't build against libdirac, lame, libopenjpeg, librtmp, frei0r,
       vo-aacenc, vo-amrenc, x264, and xvid  (all in universe)
     - do not build libav-extra-dbg, it is build from the libav-extra source
diff --git a/debian/control b/debian/control
index 4a1d46c..0f00c5e 100644
--- a/debian/control
+++ b/debian/control
@@ -81,9 +81,9 @@ Section: oldlibs
 Priority: extra
 Architecture: any
 Conflicts:
- libav-tools (<< 4:0.8.3-0ubuntu1)
+ libav-tools (<< 6:0.8.3-0ubuntu1)
 Replaces:
- libav-tools (<< 4:0.8.3-0ubuntu1)
+ libav-tools (<< 6:0.8.3-0ubuntu1)
 Depends:
  libav-tools,
  ${misc:Depends},
@@ -114,13 +114,13 @@ Section: debug
 Priority: extra
 Architecture: any
 Replaces:
- ffmpeg-dbg (<< 4:0.8.3-5),
- libav-regular-dbg (<< 4:0.8.3-5),
- libav-extra-dbg (<< 4:0.8.3-5)
+ ffmpeg-dbg (<< 6:0.8.3-5),
+ libav-regular-dbg (<< 6:0.8.3-5),
+ libav-extra-dbg (<< 6:0.8.3-5)
 Breaks:
- ffmpeg-dbg (<< 4:0.8.3-5),
- libav-regular-dbg (<< 4:0.8.3-5),
- libav-extra-dbg (<< 4:0.8.3-5)
+ ffmpeg-dbg (<< 6:0.8.3-5),
+ libav-regular-dbg (<< 6:0.8.3-5),
+ libav-extra-dbg (<< 6:0.8.3-5)
 Depends:
  ffmpeg (= ${binary:Version}),
  libav-tools (= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 2d9a208..93c2b96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-EPOCH=4:
+EPOCH=6:
 DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')

-- 
Libav/FFmpeg packaging