[SCM] x264/master: Fix packaging for new release. version.sh modifications no longer need to be made, an updated version.sh is installed in upstream tarball. Shared library package is renamed to lib264-115. fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch is removed, has been applied upstream.

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

The following commit has been merged in the master branch:
commit 812eb8769f76cca1733f9522ecc27ce16efddd32
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 4 18:01:08 2011 -0400

    Fix packaging for new release.
    version.sh modifications no longer need to be made, an updated version.sh is
    installed in upstream tarball.
    Shared library package is renamed to lib264-115.
    fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch is removed, has been
    applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 5b64045..937ab0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x264 (2:0.115.1943+git6e33b51-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Wed, 04 May 2011 17:51:48 -0400
+
 x264 (2:0.98.1653+git88b90d9-3) unstable; urgency=low
 
   * Build for unstable.
diff --git a/debian/control b/debian/control
index 1d4ed32..636dd5a 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-98
+Package: libx264-115
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -59,7 +59,7 @@ Description: x264 video coding library
 Package: libx264-dev
 Section: libdevel
 Architecture: any
-Depends: libx264-98 (= ${binary:Version}),
+Depends: libx264-115 (= ${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-98.install b/debian/libx264-115.install
similarity index 100%
rename from debian/libx264-98.install
rename to debian/libx264-115.install
diff --git a/debian/patches/fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch b/debian/patches/fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch
deleted file mode 100644
index fa07551..0000000
--- a/debian/patches/fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Jason Garrett-Glaser <darkshikari at gmail.com>
-Date: Thu, 15 Jul 2010 01:47:14 +0000 (-0700)
-Subject: Fix 8x8dct+slices+no sliced threads+cavlc+deblock
-X-Git-Url: http://git.videolan.org/?p=x264.git;a=commitdiff_plain;h=c953140b3b622b33e892c1a3d327d35b74762293;hp=d6228aea4f0adf29be8526b8ce1d9d1237d23975
-
-Fix 8x8dct+slices+no sliced threads+cavlc+deblock
-Deblocking was done slightly incorrectly.
-Regression in r1612.
----
-
-diff --git a/common/macroblock.c b/common/macroblock.c
-index f0a624f..ebff1c5 100644
---- a/common/macroblock.c
-+++ b/common/macroblock.c
-@@ -929,6 +929,7 @@ void x264_macroblock_cache_load_deblock( x264_t *h )
-         int mb_x = h->mb.i_mb_x;
-         int mb_y = h->mb.i_mb_y;
-         x264_macroblock_cache_load_neighbours_deblock( h, mb_x, mb_y );
-+        int new_neighbour = h->mb.i_neighbour;
-         h->mb.i_neighbour &= ~old_neighbour;
-         if( h->mb.i_neighbour )
-         {
-@@ -984,6 +985,7 @@ void x264_macroblock_cache_load_deblock( x264_t *h )
-                 }
-             }
-         }
-+        h->mb.i_neighbour = new_neighbour;
-     }
- 
-     if( h->param.analyse.i_weighted_pred && h->sh.i_type == SLICE_TYPE_P )
diff --git a/debian/patches/series b/debian/patches/series
index 229b4a4..cafd205 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch
+# Nothing to patch
diff --git a/debian/rules b/debian/rules
index c8dd316..7603f60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,6 @@ LDFLAGS += -Wl,--as-needed
 build: build-stamp
 build-stamp: debian/stamp-patched
 	dh_testdir
-	# fix version.sh for the debian package
-	mv version.sh version.sh-upstream
-	cp debian/debian-version.sh version.sh
-	chmod +x version.sh
 	# Build static lib
 	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags)
 	$(MAKE)
@@ -40,7 +36,6 @@ ifeq ($(do_opt),yes)
 	$(MAKE)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/install/opt
 endif
-	mv version.sh-upstream version.sh
 	touch $@
 
 debian/x264.1: build-stamp
@@ -52,7 +47,6 @@ clean:
 	dh_testroot
 	rm -rf debian/install
 	$(MAKE) -o config.mak distclean
-	[ ! -f version.sh-upstream ] ||  mv version.sh-upstream version.sh
 	$(MAKE) -f debian/rules unpatch
 	dh_clean build-stamp debian/x264.1 config.mak2
 

-- 
x264 packaging