[SCM] xvidcore/master-ubuntu: Merge branch 'master' into master-ubuntu

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

Set CFLAGS via DEB_CFLAGS, otherwise let xvidcore's build system chose CFLAGS.
Update changelog.
Use 'UNRELEASED' as suite since 2:1.2.2+debian-3 hasn't been uploaded yet.
Update Standards-Version to 3.9.1. No changes needed.
Update build-system-update.patch description with instructions on how to update build system.
Fix issue where autoconf outputs badly formatted configure script. AC_CHECK_HEADER and AC_CHECK_LIB arguments have to be sandwiched between [].
update debian/changelog
Update debian/patches/build-system-update.patch with a recent autoconf and autotools-dev.
Update my e-mail address.
Remove ltmain.sh from debian/patches/build-system-update.patch, xvidcore does not even use libtool.
Make use of dh --sourcedirectory, instead of overriding all of dh_auto_*.
update debian changelog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master-ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: dfeb385fe56c6617e9aa5f24b024a1129387eb28
X-Git-Newrev: c598ee48de7cc205ba873765d6a48f7350ceb1ab

The following commit has been merged in the master-ubuntu branch:
commit c598ee48de7cc205ba873765d6a48f7350ceb1ab
Merge: dfeb385fe56c6617e9aa5f24b024a1129387eb28 8b6f48befb0e4287a756e24152faadd181be00aa
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Oct 27 21:46:08 2010 -0400

    Merge branch 'master' into master-ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/patches/build-system-update.patch
    	debian/rules

diff --combined debian/changelog
index 725f8da,87bda28..7337cc0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,6 +1,12 @@@
 +xvidcore (2:1.2.2+debian-3ubuntu1) UNRELEASED; urgency=low
 +
 +  * Merge from Debian.
 +
 + -- Maia Kozheva <sikon at ubuntu.com>  Sun, 29 Aug 2010 18:30:32 +0700
 +
- xvidcore (2:1.2.2+debian-3) unstable; urgency=low
+ xvidcore (2:1.2.2+debian-3) UNRELEASED; urgency=low
  
+   [ Fabian Greffrath ]
    * Update my e-mail address.
    * Make use of dh --sourcedirectory, instead of overriding all of
      dh_auto_*.
@@@ -14,7 -9,13 +15,13 @@@
    * Update debian/patches/build-system-update.patch with a recent
      autoconf and autotools-dev.
  
-  -- Fabian Greffrath <fabian+debian at greffrath.com>  Fri, 06 Aug 2010 16:38:59 +0200
+   [ Andres Mejia ]
+   * Fix issue where autoconf outputs badly formatted configure script.
+   * Update build-system-update.patch description with instructions on
+     how to update build system.
+   * Update Standards-Version to 3.9.1. No changes needed.
+ 
+  -- Andres Mejia <mcitadel at gmail.com>  Sat, 11 Sep 2010 15:38:00 -0400
  
  xvidcore (2:1.2.2+debian-2) unstable; urgency=low
  
@@@ -26,20 -27,6 +33,20 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Sat, 31 Jul 2010 21:52:24 -0400
  
 +xvidcore (2:1.2.2+debian-1ubuntu2) maverick; urgency=low
 +
 +  * Really merge README.Source and README.source now.
 +
 + -- Maia Kozheva <sikon at ubuntu.com>  Sat, 05 Jun 2010 18:02:44 +0700
 +
 +xvidcore (2:1.2.2+debian-1ubuntu1) maverick; urgency=low
 +
 +  * Merged from debian-unofficial release 2:1.2.2+debian-1, remaining
 +    Ubuntu changes:
 +    - Merged README.Source and README.source.
 +
 + -- Maia Kozheva <sikon at ubuntu.com>  Sat, 05 Jun 2010 17:47:10 +0700
 +
  xvidcore (2:1.2.2+debian-1) unstable; urgency=low
  
    * Prepare release for Debian.
diff --combined debian/control
index f11c3ac,f9301cf..e75d844
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
  Source: xvidcore
  Section: libs
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
             Reinhard Tartler <siretart at tauware.de>,
             Fabian Greffrath <fabian+debian at greffrath.com>,
@@@ -10,7 -9,7 +10,7 @@@
  Build-Depends: debhelper (>= 7.3~),
                 quilt (>= 0.46-7~),
                 yasm (>= 0.8) [i386 amd64]
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.1
  Homepage: http://www.xvid.org/
  
  Package: libxvidcore4

-- 
xvidcore packaging