[SCM] x264 packaging branch, master, updated. debian/0.85.1448+git1a6d32-3-36-ga57f928

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

The following commit has been merged in the master branch:
commit 3d41890979551aa7bd2a4276f87d1cd5eb72cb45
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 8 02:07:08 2010 -0400

    Place x264 back into main.

diff --git a/debian/control b/debian/control
index 208299e..daef3f6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: x264
-Section: non-free/libs
+Section: libs
 Priority: extra
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
@@ -16,7 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git
 Homepage: http://www.videolan.org/developers/x264.html
 
 Package: x264
-Section: non-free/graphics
+Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -56,7 +56,7 @@ Description: x264 video coding library
  This package contains the libx264 shared library.
 
 Package: libx264-dev
-Section: non-free/libdevel
+Section: libdevel
 Architecture: any
 Depends: libx264-85 (= ${binary:Version}),
          ${misc:Depends} 

-- 
x264 packaging