[SCM] x264/ubuntu: Merge branch 'master' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Oct 29 15:40:59 UTC 2011
update debian/changelog
Allow compilation on the Hurd
New upstream snapshot
Merge branch 'upstream'
Imported Upstream version 0.116.2042+git178455c
Update to new upstream snapshot
Fix typo in debian/changelog.
update debian/changelog
enable ffms2 input module
print config.log in case the configure script fails
enable parallel builds
Build ahsred lib with --enable-pic on mips*, hopefully fixes FTBFS on these arches.
Remove trailing comma from Build-Depends.
Build-Depend on yasm on all i386 and amd64 archs, fixes FTBFS on kfreebsd-i386. Remove lpia, it's deprecated.
Update changelog.
Generate x264 manpage only once and drop build-depends on help2man. This make for one less build dependency to put on the buildd machines. x264 manpage should be generated once for each new release on a dev machine and tracked in git packaging repo.
Update changelog.
Actually build the cli against the shared lib.
Override dh_auto_clean, not dh_clean.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: ccdd73624e57aa58c228088665d3d1659f9d81bd
X-Git-Newrev: 833a2a9e067676534741770be215fc84daba6489
The following commit has been merged in the ubuntu branch:
commit bdec66d1527d188fc6cea4743d6761b04db45502
Merge: ccdd73624e57aa58c228088665d3d1659f9d81bd 9ff687668eee416d3b34a18344c4f727060e8a1a
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Aug 9 21:57:07 2011 +0200
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index c5199b4,3010504..500c9d7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,41 +1,51 @@@
+ x264 (2:0.116.2042+git178455c-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ * Allow compilation on the Hurd
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 09 Aug 2011 20:44:54 +0200
+
+ x264 (2:0.116.2037+gitf8ebd4a-3) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Build-Depend on yasm on all i386 and amd64 archs,
+ fixes FTBFS on kfreebsd-i386. Remove lpia, it's deprecated.
+ * Remove trailing comma from Build-Depends.
+ * Build shared lib with --enable-pic on mips*,
+ hopefully fixes FTBFS on these arches.
+
+ [ Reinhard Tartler ]
+ * enable parallel builds
+ * print config.log in case the configure script fails
+ * enable ffms2 input module
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 27 Jul 2011 21:36:26 +0200
+
+ x264 (2:0.116.2037+gitf8ebd4a-2) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * Override dh_auto_clean, not dh_clean.
+ * Actually build the cli against the shared lib.
+
+ [ Andres Mejia ]
+ * Prepare new revision.
+ * Generate x264 manpage only once and drop build-depends on help2man. This
+ makes for one less build dependency to put on the buildd machines. x264
+ manpage should be generated once for each new release on a dev machine and
+ tracked in git packaging repo.
+
+ -- 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 ]
@@@ -37,62 -65,7 +75,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 2c71e11,e417e90..cd3a493
--- a/debian/control
+++ b/debian/control
@@@ -6,16 -6,10 +6,16 @@@ Uploaders: Reinhard Tartler <siretart at t
Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <amejia at debian.org>
Build-Depends: debhelper (>= 7.0.50~),
- libavformat-dev (>= 4:0.5),
- libffms2-dev,
+ 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],
+ 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
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list