[SCM] faad2/master: Merge remote-tracking branch 'origin/unstable'

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

Set urgency to high.
Prepare new upload, fixing upload of 2.7-5.
The target is squeeze.
Add gbp config file.
Place credits for who did what change.
Update changelog. Prepare for upload to unstable to fix RC bug.
Refresh patches.
Fix segmentation fault in faad due to an incorrect pointer size (Closes: #603807, LP: #665802).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 72c4fa27071f1309e8b1b555bd099ef6a16a1657
X-Git-Newrev: 62a2816c8759c7f0b5f87da866029f98b5585a97

The following commit has been merged in the master branch:
commit beef460386bb35651aee673e3b114b412e8f99ad
Merge: 72c4fa27071f1309e8b1b555bd099ef6a16a1657 005521ed80bd75e2c88319373b6a885db721a903
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jul 17 13:29:05 2011 -0400

    Merge remote-tracking branch 'origin/unstable'

diff --combined debian/changelog
index 86d34e1,8ace095..111953c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,16 +1,16 @@@
+ faad2 (2.7-6) unstable; urgency=high
+ 
+   [ Alessio Treglia ]
+   * Fix segmentation fault in faad due to an incorrect pointer size
+     (Closes: #603807, LP: #665802).
+   * Add gbp config file.
+ 
+   [ Andres Mejia ]
+   * Revert changes in 2.7-5. Upload of 2.7-5 was unintentionally done.
+   * Refresh patches.
+ 
+  -- Andres Mejia <mcitadel at gmail.com>  Mon, 22 Nov 2010 19:17:36 -0500
+ 
  faad2 (2.7-5) unstable; urgency=low
  
    * Update my e-mail address.
@@@ -10,8 -23,7 +23,8 @@@
  faad2 (2.7-4) unstable; urgency=low
  
    * debian/control: Do not build the shared libmp4ff library packages
 -    anymore (Closes: #550679).
 +    anymore (Closes: #550679). The use of mp4ff from faad2 is discouraged
 +    by upstream, see <http://xbmc.org/trac/ticket/6882#comment:15>.
    * Removed debian/patches/force-include-stdint_h.patch.
    * Removed debian/patches/libmp4ff-shared-lib.patch.
    * Removed debian/patches/70_automake-1.9.patch.

-- 
faad2 packaging