[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090706-6-22-gef11c38

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Mar 3 21:34:01 UTC 2010


The following commit has been merged in the master branch:
commit ef11c38f6872dc951dce7bd445c3786c57a8a298
Merge: b1a4cc4e36a5661a4a99b61896f7f4654a18999c d31bcc468df78cdacaf4fdfc02759c67c690479d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 22:32:10 2010 +0100

    Merge remote branch 'origin/master'

diff --combined debian/changelog
index 9049ba5,647a5e8..87d573f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,16 +1,23 @@@
 -ffmpeg (4:0.5+svn20090706-7) unstable; urgency=low
 -
 -  * start new upload
 -
 - -- Reinhard Tartler <siretart at tauware.de>  Mon, 01 Feb 2010 13:33:31 +0100
 +ffmpeg (4:0.5.1-1) unstable; urgency=low
 +
 +  * new upstream release:
 +    - clarifies documentation on metadata, Closes: #570050, LP: #501729
 +    - further security backports, Closes: #570713
 +  * adapt to new versioning scheme
 +  * use '<<' instead of '<' relationship for internal shlib file
 +  * merge changes from ubuntu packaging
 +  * drop wmapro backport again as discussed with upstream. The unrelated
 +    changes seem too risky for a stable release.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 03 Mar 2010 22:28:24 +0100
  
  ffmpeg (4:0.5+svn20090706-6) unstable; urgency=low
  
    [ Fabian Greffrath ]
    * debian/patches/901-fix-misc-typos.patch: New patch taken from
      upstream GIT (slightly modified) to fix some spelling errors.
+   * Document our calling of debhelper programs in an odd order in
+     debian/rules.
  
    [ Reinhard Tartler ]
    * document some unattributed patches

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list