[SCM] x264/ubuntu: Merge branch 'ubuntu' of ssh://git.debian.org/git/pkg-multimedia/x264 into ubuntu

[siretart at users.alioth.debian.org]

Update dev package depends on library package to libx264-106 package.
Set debian-branch back to ubuntu.
Merge branch 'master' into ubuntu
Add config.mak2 to be removed during clean.
Make CFLAGS assignment more elegant as suggested by Jonas.
Disable debugging by default. Enable it via nostrip option of DEB_BUILD_OPTIONS.
Force CFLAGS to be set by user via DEB_CFLAGS instead of by dpkg-buildpackage.
Merge branch 'ubuntu'
Include a watch file with comment that explains there's no release files.
Specify source format 1.0 for packaging.
Remove redundant Sections entry for library package.
Update my e-mail address.
Update changelog.
Bump to Standards-Version 3.9.1, no changes needed.
Relax build-depends on libavformat-dev to versions 4:0.5 or greater.
target experimental for now
remove libgpac-dev from build-depends, not available in debian yet.
avoid running configure on distclean
update download site in debian/copyright
update debian/changelog
Merge branch 'ubuntu'
Update changelog.
Place x264 back into main.
Readd gbp.conf file.
Place x264 in non-free.
Note the x264 homepage.
Add myself to Uploaders field.
Prepare new upload for Debian.
Remove git-buildpackage config file.
Merge branch 'ubuntu'
Merge branch 'ubuntu'
Add Vcs-* headers
Last time, I swear.
Again, update debian/changelog.
Bumped Standards-Version to 3.8.2.
Fixed binary-control-field-duplicates-source.
Added patch description to debian/patches/01_link.diff.
Revert changes to Makefile in the master branch.
Update debian/changelog.
update debian/changelog
Revert "update debian/changelog"
Merge commit 'origin/master'
update debian/changelog
update gbp.conf
Added missing comma :/
update debian/changelog
Kill some whitespace from debian/rules to improve readability.
Repeat the last change for the shared_confflags.
Add one confflag per line, makes it easier to track minor changes.
Remove -Wl,--as-needed from LDFLAGS. It has become unnecessary since we don't link against GTK+ anymore. Redundant linking of the frontend against -lX11 and -lm doesn't hurt, because the shared library links against them anyway.
Clean up CFLAGS.
Append to CFLAGS/LDFLAGS instead of overriding.
Added myself to uploaders.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: bd861182ab78e1e9d151b4e035e08d88551630eb
X-Git-Newrev: 81514707c46c262787b8d3ee9eb8f23f3ce1f5e4

The following commit has been merged in the ubuntu branch:
commit 1d241eac04c35fc30517724d5731f17228c29c7e
Merge: 597862cc2bb1bb200bc305d83cb5accfde9152d1 bd861182ab78e1e9d151b4e035e08d88551630eb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 28 13:03:15 2010 +0200

    Merge branch 'ubuntu' of ssh://git.debian.org/git/pkg-multimedia/x264 into ubuntu

diff --combined debian/changelog
index 113b865,3fd6108..098731a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,9 @@@
 +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
@@@ -17,11 -11,20 +17,20 @@@
  
  x264 (2:0.98.1653+git88b90d9-2) maverick; urgency=low
  
-   * reintroduce quilt infrastructure
-   * add fix-8x8dct+slices+no-sliced-threads+cavlc+deblock.patch on
-     upstream's request
+   * Build for unstable.
+   * Relax dependency on libavformat-dev down to 4:0.5 or greater.
+   * Bump Standards-Version to 3.9.1, no changes needed.
  
-  -- Reinhard Tartler <siretart at tauware.de>  Sat, 18 Sep 2010 11:39:17 +0200
+  -- Andres Mejia <mcitadel at gmail.com>  Thu, 05 Aug 2010 16:28:28 -0400
+ 
+ x264 (2:0.98.1653+git88b90d9-2) experimental; urgency=low
+ 
+   * Upload to Debian. Closes: #354667, #405212
+   * update download site in debian/copyright
+   * avoid running configure on distclean
+   * remove libgpac-dev from build-depends, not available in debian yet.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 31 Jul 2010 20:57:46 -0400
  
  x264 (2:0.98.1653+git88b90d9-1) maverick; urgency=low
  
@@@ -32,6 -35,15 +41,15 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 04 Jul 2010 16:23:51 -0400
  
+ x264 (2:0.85.1448+git1a6d32-5) unstable; urgency=low
+ 
+   * Prepare new upload for Debian.
+   * Edit git-buildpackage config file for master branch.
+   * Add myself to Uploaders field.
+   * Note the x264 homepage.
+ 
+  -- Andres Mejia <mcitadel at gmail.com>  Sat, 08 May 2010 02:08:19 -0400
+ 
  x264 (2:0.85.1448+git1a6d32-4) lucid; urgency=low
  
    * install sse optimized version in /usr/lib/sse2. LP: #550524

-- 
x264 packaging