[SCM] x264/ubuntu: Merge branch 'master' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Mon Oct 31 19:00:29 UTC 2011
finalize debian/changelog
remove unnecessary Conflicts/Replaces on non-existing package x264-bin
reintroduce upstream's .gitignore file to the branch
debian/control: normalize fieldswith wrap-and-sort
New upstream snapshot
Drop arch-alpha.patch which is upstream
Merge commit 'upstream/0.118.2092+git6eac7c3'
Imported Upstream version 0.118.2092+git6eac7c3
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: 55346e531eb19474ebb2faa6f74dea754e8ae699
X-Git-Newrev: 5f3754b2af8ce2b2a79d72bdf56947ae21edc127
The following commit has been merged in the ubuntu branch:
commit 3148afc5b616e694f5eec02851eae9a84da2fc4c
Merge: f9daea3d2dfb35ededde2533fb1461a9fbcb92bf aaef219c2dd19ecc9ce2354b577458b50ae5cf62
Author: Reinhard Tartler <siretart at tauware.de>
Date: Mon Oct 31 19:53:37 2011 +0100
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 318e307,c9830a2..3e4e850
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,24 @@@
+ x264 (2:0.118.2092+git6eac7c3-1) unstable; urgency=low
+
+ [ Rico Tzschichholz ]
+ * New upstream snapshot.
+ * Drop arch-alpha.patch which is upstream
+
+ [ Reinhard Tartler ]
+ * debian/control: normalize fieldswith wrap-and-sort
+ * remove unnecessary Conflicts/Replaces on non-existing package x264-bin
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 31 Oct 2011 19:47:16 +0100
+
+x264 (2:0.118.2085+git8a62835-1ubuntu1) precise; urgency=low
+
+ * Merge from Debian, 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> Sat, 29 Oct 2011 17:46:52 +0200
+
x264 (2:0.118.2085+git8a62835-1) unstable; urgency=low
* Team upload.
@@@ -29,15 -32,6 +41,15 @@@ x264 (2:0.116.2042+git178455c-2) unstab
-- 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.
@@@ -76,16 -70,6 +88,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 ]
@@@ -115,62 -99,7 +127,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 27c69d2,37b468e..284876a
--- a/debian/control
+++ b/debian/control
@@@ -8,13 -8,8 +8,9 @@@ Uploaders
Andres Mejia <amejia at debian.org>
Build-Depends:
debhelper (>= 8.1.3~),
- libavcodec-dev (>= 4:0.7~),
- libavformat-dev (>= 4:0.7~),
- libavutil-dev (>= 4:0.7~),
+ libavformat-dev (>= 4:0.5),
libffms2-dev,
+ libgpac-dev,
- libpostproc-dev (>= 4:0.7~),
- libswscale-dev (>= 4:0.7~),
libx11-dev,
yasm [any-i386 any-amd64]
Standards-Version: 3.9.2
@@@ -29,10 -24,6 +25,6 @@@ Architecture: an
Depends:
${misc:Depends},
${shlibs:Depends}
- Conflicts:
- x264-bin
- Replaces:
- x264-bin
Description: video encoder for the H.264/MPEG-4 AVC standard
x264 is an advanced commandline encoder for creating H.264 (MPEG-4 AVC)
video streams.
--
x264 packaging
More information about the pkg-multimedia-commits
mailing list