[SCM] ffms2/master: merge ubuntu branch

[siretart at users.alioth.debian.org]

update debian/changelog
add patch description
bump standards version
add patch description
delete cleaned up files from branch
remove generated files on clean
dpkg options that help with Source Format 3.0 (quilt) in git
ignore quilt control directory
remove symbols file
update debian/changelog for ubuntu
add git-buildpackage configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5f7d0bdf74a6bcfd9f0ec1839299eb04d07c2742
X-Git-Newrev: 0e50e647c90350329d3bdebe81b0563bb1199953

The following commit has been merged in the master branch:
commit f8eea2f3eb22f9b7f50f1701967341df8d84e27e
Merge: 628658c07c846f8cea31fe5342e4c6d24c2db770 4b7f7479f8e81426737d241700bfe78be884076e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Nov 4 23:52:34 2010 +0100

    merge ubuntu branch

diff --combined debian/changelog
index 5781020,44c1dce..c87d55b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
- ffms2 (2.13-1) unstable; urgency=low
 -ffms2 (2.13-0ubuntu1) natty; urgency=low
++ffms2 (2.13-1) experimental; urgency=low
  
    [ Rickard Närström ]
    * Initial release. (Closes: #601114, LP: #559620)
@@@ -6,6 -6,13 +6,13 @@@
      - Made ffms2_2.13/configure executable
  
    [ Reinhard Tartler ]
-   * Prepare upload for debian
 -  * Prepare upload for ubuntu
++  * Prepare upload for ubuntu and debian
+   * add patch descriptions
+   * bump standards version
+   * delete cleaned up files from branch
+   * remove generated files on clean
+   * dpkg options that help with Source Format 3.0 (quilt) in git
+   * ignore quilt control directory
+   * remove symbols file (still a PITA for C++ libraries)
  
-  -- Reinhard Tartler <siretart at ubuntu>  Sat, 23 Oct 2010 16:58:59 +0200
 - -- Reinhard Tartler <siretart at tauware.de>  Sun, 31 Oct 2010 20:23:03 +0100
++ -- Reinhard Tartler <siretart at tauware.de>  Thu, 04 Nov 2010 23:52:12 +0100

-- 
ffms2 packaging