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

[ceros-guest at users.alioth.debian.org]

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: 311b804463862b90290e51df4c31f362515c80c9
X-Git-Newrev: bd861182ab78e1e9d151b4e035e08d88551630eb

The following commit has been merged in the ubuntu branch:
commit 09efc84644dd282b27a9f12de9e049ee3c51a13a
Merge: 311b804463862b90290e51df4c31f362515c80c9 3b31713c8d474080dd1e6fd5249162bb50bd250a
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Oct 27 21:05:00 2010 -0400

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 83a2a65,5b64045..3fd6108
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,19 +1,30 @@@
 -x264 (2:0.98.1653+git88b90d9-3) unstable; urgency=low
 +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-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
  
@@@ -26,6 -24,15 +35,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
diff --combined debian/control
index 39204ff,9aa1d62..c6e10db
--- a/debian/control
+++ b/debian/control
@@@ -9,7 -9,6 +9,6 @@@ Build-Depends: debhelper (>= 7)
                 libavformat-dev (>= 4:0.5),
                 help2man,
                 yasm [i386 amd64 kfreebsd-amd64 lpia],
-                libgpac-dev,
                 libx11-dev,
                 quilt
  Standards-Version: 3.9.1
@@@ -47,7 -46,7 +46,7 @@@ Description: video encoder for the H.26
    * parallel encoding on multiple CPUs
    * interlaced streams
  
 -Package: libx264-98
 +Package: libx264-106
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}

-- 
x264 packaging