[SCM] gpac packaging branch, master, updated. debian/0.4.5-0.3ubuntu6-10-gd82a40b

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

The following commit has been merged in the master branch:
commit 65b498f90412517af413dde11e4ffe461b0b0d22
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 3 23:34:12 2010 -0400

    Get rid of silly build conflicts of libgpac-dev.

diff --git a/debian/control b/debian/control
index 9aecfc7..bad176e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Andres Mejia <mcitadel at gmail.com>
 Homepage: http://gpac.sourceforge.net
 Standards-Version: 3.8.0
-Build-Conflicts: libgpac-dev
 Build-Depends: debhelper (>= 7), libxvidcore-dev, libsdl1.2-dev,
  libpng-dev, libfreetype6-dev, libjpeg62-dev, libmad0-dev, libwxgtk2.8-dev,
  libxml2-dev, quilt, libssl-dev, libasound2-dev, freeglut3-dev,

-- 
gpac packaging