[SCM] x264/ubuntu: Merge commit 'debian/2%0.118.2085+git8a62835-1' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Oct 29 15:51:32 UTC 2011
upload to unstable
Update changelog
Rename shared library package to lib264-118
Drop basic-spell-check.patch which is upstream
New upstream snapshot
Merge commit 'upstream/0.118.2085+git8a62835'
Imported Upstream version 0.118.2085+git8a62835
Update to new upstream snapshot
Add Forwarded information to patch header
update debian/changelog
Debian\'s alpha buildds identify themselves as alphaev67, so consider alpha* as ALPHA (Closes: #642810).
Convert package to include multiarch support. .gitignore file must have been removed from upstream tarball, so removed here too.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 833a2a9e067676534741770be215fc84daba6489
X-Git-Newrev: 55346e531eb19474ebb2faa6f74dea754e8ae699
The following commit has been merged in the ubuntu branch:
commit 41081aea21dc2caea9cb2b0e781d9b3604b77829
Merge: 833a2a9e067676534741770be215fc84daba6489 73373a69360a857825c36f4255a120bb5d8cadf6
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Oct 29 17:43:27 2011 +0200
Merge commit 'debian/2%0.118.2085+git8a62835-1' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 99d7bd9,8f21f75..b6e7542
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,25 +1,34 @@@
+ x264 (2:0.118.2085+git8a62835-1) unstable; urgency=low
+
+ * Team upload.
+ * New upstream snapshot.
+ * Drop basic-spell-check.patch which is upstream
+ * Rename shared library package to lib264-118
+
+ -- Rico Tzschichholz <ricotz at ubuntu.com> Thu, 13 Oct 2011 10:27:50 +0200
+
+ x264 (2:0.116.2042+git178455c-3) unstable; urgency=low
+
+ * Debian's alpha buildds identify themselves as alphaev67,
+ so consider alpha* as ALPHA (Closes: #642810).
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Thu, 06 Oct 2011 10:33:25 +0200
+
+ x264 (2:0.116.2042+git178455c-2) unstable; urgency=low
+
+ * Convert package to include multiarch support.
+
+ -- Andres Mejia <amejia at debian.org> Sat, 17 Sep 2011 14:08:08 -0400
+
+x264 (2:0.116.2042+git178455c-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian (seriously!), remaining changes
+ - tighten dependencies on Libav 0.7
+ - Build against libffms2-dev
+ - build against libgpac-dev to enable .mp4 output
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 09 Aug 2011 21:57:53 +0200
+
x264 (2:0.116.2042+git178455c-1) unstable; urgency=low
* New upstream snapshot.
@@@ -45,16 -58,6 +67,16 @@@ x264 (2:0.116.2037+gitf8ebd4a-2) unstab
-- Andres Mejia <amejia at debian.org> Tue, 26 Jul 2011 22:23:58 -0400
+x264 (2:0.116.2037+gitf8ebd4a-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian (seriously!), remaining changes
+ - tighten dependencies on Libav 0.7
+ - Build against libffms2-dev
+ - build against libgpac-dev to enable .mp4 output
+ - allow parallel builds
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 26 Jul 2011 14:25:22 +0200
+
x264 (2:0.116.2037+gitf8ebd4a-1) unstable; urgency=low
[ Andres Mejia ]
@@@ -84,62 -87,7 +106,62 @@@
-- 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/control
index cd3a493,03d1bc2..9b31e08
--- a/debian/control
+++ b/debian/control
@@@ -5,17 -5,11 +5,18 @@@ Maintainer: Debian Multimedia Maintaine
Uploaders: Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 8.1.3~),
- libavformat-dev (>= 4:0.5),
+Build-Depends: debhelper (>= 7.0.50~),
+ 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,
+ libffms2-dev,
yasm [any-i386 any-amd64],
- libx11-dev
+ libffms2-dev,
+ libgpac-dev,
+ libx11-dev,
Standards-Version: 3.9.2
DM-Upload-Allowed: yes
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/x264.git
@@@ -52,8 -46,10 +53,10 @@@ Description: video encoder for the H.26
* parallel encoding on multiple CPUs
* interlaced streams
- Package: libx264-116
+ Package: libx264-118
Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: x264 video coding library
@@@ -65,7 -61,7 +68,7 @@@
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)
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list