[SCM] x264/ubuntu: Merge branch 'master' into ubuntu

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Jul 26 13:12:49 UTC 2011 

Update changelog.
Include all public headers in dev package.
Add patch to do basic spell check.
Fix location to get copy of GPL and LGPL licenses.
Updated debian/copyright with new license information for new upstream snapshot.
Add proper version depends for debhelper.
Fix install for libx264-116.
--enable-static must be explicitely set to build static library.
--disable-debug is no longer a known option for ./configure.
Update library package name for soname bump.
Update VCS-* entries to new anonscm location.
Update to my @debian.org email.
Update changelog.
Merge commit 'upstream/0.116.2037+gitf8ebd4a'
Imported Upstream version 0.116.2037+gitf8ebd4a
Update to new upstream snapshot.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 1b30f0a2b81c31568ab001326edd0be7ffaa0c06
X-Git-Newrev: ccdd73624e57aa58c228088665d3d1659f9d81bd

The following commit has been merged in the ubuntu branch:
commit b301ba84a1b3fb474d53ee60b2e4e163d5a471fa
Merge: 1b30f0a2b81c31568ab001326edd0be7ffaa0c06 558f1122792268136003162645d64fd1f1783ebd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 26 14:23:24 2011 +0200

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/confflags
    	debian/control
    	debian/libx264-dev.install

diff --combined debian/changelog
index ad79cd6,42d12e6..4ec3dea
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,59 -1,33 +1,88 @@@
+ x264 (2:0.116.2037+gitf8ebd4a-1) unstable; urgency=low
+ 
+   [ Andres Mejia ]
+   * New upstream release. (Closes: #405212)
+   * 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-116.
+   * fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch is removed, has
+     been applied upstream.
+   * Add DM-Upload-Allowed: yes.
+   * Convert package to 3.0 (quilt).
+   * Convert packaging to dh 7.
+   * Change Priority to optional.
+   * Update to my @debian.org email.
+   * Update VCS-* entries to new anonscm location.
+   * --enable-static must be explicitly set to build static library.
+   * Add proper version depends for debhelper.
+   * Update debian/copyright with new license information for new upstream
+     snapshot.
+   * Update debian/copyright to use DEP-5 spec.
+   * Add patch to do basic spell check.
+   * Include all public headers in dev package.
+ 
+   [ Reinhard Tartler ]
+   * Lower debhelper compat level to 7
+   * Don't set --enable-debug, no longer a known option for ./configure.
+ 
+  -- Andres Mejia <amejia at debian.org>  Mon, 25 Jul 2011 19:37:52 -0400
+ 
 -x264 (2:0.98.1653+git88b90d9-3) unstable; urgency=low
 +x264 (2:0.115.1943+git6e33b51-2) oneiric; urgency=low
 +
 +  * install all header files in the -dev package
 +  * make parallel builds actually work
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 23 May 2011 21:34:08 +0200
 +
 +x264 (2:0.115.1943+git6e33b51-1) oneiric; urgency=low
 +
 +  [ Andres Mejia ]
 +  * New upstream 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.
 +  * Add DM-Upload-Allowed: yes.
 +  * Convert package to 3.0 (quilt).
 +  * Convert packaging to dh 8.
 +  * Change Priority to optional.
 +
 +  [ Reinhard Tartler ]
 +  * lower debhelper compat level to 7
 +  * don't set --disable-debug
 +  * bump requirements on libav, also depend on libswscale
 +  * fix typo in dependency declaration
 +  * drop patch link-x264cli-explicitly-against-lavf
 +  * even more strict dependencies on libav libraries
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 22 May 2011 20:11:48 +0200
 +
 +x264 (2:0.106.1741-3) natty; urgency=low
 +
 +  * add libffms2-dev to build-deps
 +  * link x264cli explicitly against lavf
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 10 Nov 2010 08:47:07 +0100
 +
 +x264 (2:0.106.1741-2) natty; urgency=low
 +
 +  * fix dependency on libx264-106 in package libx264-dev
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 26 Oct 2010 21:13:50 +0200
 +
 +x264 (2:0.106.1741-1) natty; urgency=low
 +
 +  * New upstream Version
 +  * New version fixes LP: #542943
 +  * remove applied patch
 +  * bump shlibs 98 -> 106
 +  * remove fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch,
 +    applied upstream
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 26 Oct 2010 17:07:52 +0200
 +
 +x264 (2:0.98.1653+git88b90d9-3) maverick; urgency=low
  
    * Build for unstable.
    * Relax dependency on libavformat-dev down to 4:0.5 or greater.
diff --combined debian/confflags
index 565c610,c95651d..5b77d60
--- a/debian/confflags
+++ b/debian/confflags
@@@ -5,20 -5,13 +5,18 @@@
  # Set CFLAGS from DEB_CFLAGS if defined, otherwise simply add -Wall
  CFLAGS = $(or $(DEB_CFLAGS),-Wall)
  
 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 +	MAKEFLAGS += -j$(NUMJOBS)
 +endif
 +
  common_confflags += --prefix=/usr
- ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-   common_confflags += --enable-debug
- endif
  
  # XXX why isn't --enable-visualize used in the static build?
  # TODO --disable-asm when we build an opt flavor?
  static_confflags += \
- 	$(common_confflags)
+ 	$(common_confflags) \
+ 	--enable-static
  
  # upstream defaults to forcing a bunch of optimizations on various arches;
  # --disable-asm should disable them all, but then we need to figure out what
diff --combined debian/control
index 0640297,1424e79..2c71e11
--- a/debian/control
+++ b/debian/control
@@@ -4,22 -4,16 +4,22 @@@ Priority: optiona
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Reinhard Tartler <siretart at tauware.de>,
             Fabian Greffrath <fabian+debian at greffrath.com>,
-            Andres Mejia <mcitadel at gmail.com>
- Build-Depends: debhelper (>= 7),
+            Andres Mejia <amejia at debian.org>
+ Build-Depends: debhelper (>= 7.0.50~),
 -               libavformat-dev (>= 4:0.5),
 +               libavcodec-dev (>= 4:0.7~),
 +               libavformat-dev (>= 4:0.7~),
 +               libavutil-dev (>= 4:0.7~),
 +               libpostproc-dev (>= 4:0.7~),
 +               libswscale-dev (>= 4:0.7~),
                 help2man,
                 yasm [i386 amd64 kfreebsd-amd64 lpia],
 +               libffms2-dev,
 +               libgpac-dev,
                 libx11-dev,
  Standards-Version: 3.9.2
  DM-Upload-Allowed: yes
- Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git
- Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git
+ Vcs-Git: git://anonscm.debian.org/pkg-multimedia/x264.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/x264.git
  Homepage: http://www.videolan.org/developers/x264.html
  
  Package: x264
@@@ -52,7 -46,7 +52,7 @@@ Description: video encoder for the H.26
    * parallel encoding on multiple CPUs
    * interlaced streams
  
- Package: libx264-115
+ Package: libx264-116
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
@@@ -65,7 -59,7 +65,7 @@@ Description: x264 video coding librar
  Package: libx264-dev
  Section: libdevel
  Architecture: any
- Depends: libx264-115 (= ${binary:Version}),
+ Depends: libx264-116 (= ${binary:Version}),
           ${misc:Depends} 
  Description: development files for libx264
   libx264 is an advanced encoding library for creating H.264 (MPEG-4 AVC)

-- 
x264 packaging

More information about the pkg-multimedia-commits mailing list