[SCM] x264/master: Rename shared library package to lib264-118

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

The following commit has been merged in the master branch:
commit c02ff06079e1267bbefc22f0159864271aa5ab2b
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Thu Oct 13 10:26:41 2011 +0200

    Rename shared library package to lib264-118

diff --git a/debian/control b/debian/control
index 385c8b9..03d1bc2 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Description: video encoder for the H.264/MPEG-4 AVC standard
   * parallel encoding on multiple CPUs
   * interlaced streams
 
-Package: libx264-116
+Package: libx264-118
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -61,7 +61,7 @@ Description: x264 video coding library
 Package: libx264-dev
 Section: libdevel
 Architecture: any
-Depends: libx264-116 (= ${binary:Version}),
+Depends: libx264-118 (= ${binary:Version}),
          ${misc:Depends} 
 Description: development files for libx264
  libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)
diff --git a/debian/libx264-116.install.in b/debian/libx264-118.install.in
similarity index 100%
rename from debian/libx264-116.install.in
rename to debian/libx264-118.install.in
diff --git a/debian/rules b/debian/rules
index 367d50a..21a374e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ include debian/confflags
 
 LDFLAGS += -Wl,--as-needed
 
-DH_INSTALL_INPUT_FILES = debian/libx264-116.install.in \
+DH_INSTALL_INPUT_FILES = debian/libx264-118.install.in \
                          debian/libx264-dev.install.in
 
 DH_INSTALL_OUTPUT_FILES = $(DH_INSTALL_INPUT_FILES:.in=)
diff --git a/debian/x264.1 b/debian/x264.1
index d257026..6d0a529 100644
--- a/debian/x264.1
+++ b/debian/x264.1
@@ -3,7 +3,7 @@
 .SH NAME
 x264 \- fast h264 encoder
 .SH DESCRIPTION
-x264 core:116 r2037 f8ebd4a
+x264 core:118 r2085 8a62835
 Syntax: x264 [options] \fB\-o\fR outfile infile
 .PP
 Infile can be raw (in which case resolution is required),

-- 
x264 packaging