[SCM] x264/ubuntu: Merge with master. Resolve conflicts with: debian/control debian/copyright debian/rules

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

The following commit has been merged in the ubuntu branch:
commit edf1b55ce0996912e23a9e1a4be22b2ac1f0c322
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Oct 4 14:06:42 2010 -0400

    Merge with master.
    Resolve conflicts with:
      debian/control
      debian/copyright
      debian/rules

diff --git a/debian/control b/debian/control
index db273be..a720fa8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,20 @@ Source: x264
 Section: libs
 Priority: extra
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Reinhard Tartler <siretart at tauware.de>
+Uploaders: Reinhard Tartler <siretart at tauware.de>,
+           Fabian Greffrath <fabian+debian at greffrath.com>,
+           Andres Mejia <mcitadel at gmail.com>
 Build-Depends: debhelper (>= 7),
-               libavformat-dev (>= 4:0.6-1~),
+               libavformat-dev (>= 4:0.5),
                help2man,
                yasm [i386 amd64 kfreebsd-amd64 lpia],
                libgpac-dev,
                libx11-dev,
                quilt
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/x264.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/x264.git
+Homepage: http://www.videolan.org/developers/x264.html
 
 Package: x264
 Section: graphics
@@ -45,7 +48,6 @@ Description: video encoder for the H.264/MPEG-4 AVC standard
   * interlaced streams
 
 Package: libx264-98
-Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index 72c437d..ead2958 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Sam Hocevar (Debian packages)
 <sam+deb at zoy.org> on Fri, 9 Mar 2007 22:59:37 +0100.
 
-It was downloaded from svn://svn.videolan.org/x264/trunk/
+It was downloaded from http://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable
 
 encoder/eval.c, extras/getopt.c:
   Copyright (C) 2002 Michael Niedermayer <michaelni at gmx.at>
diff --git a/debian/rules b/debian/rules
index e6a7afe..0c7f78f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -rf debian/install
-	[ ! -f Makefile ] || $(MAKE) distclean
+	$(MAKE) -o config.mak distclean
 	[ ! -f version.sh-upstream ] ||  mv version.sh-upstream version.sh
 	$(MAKE) -f debian/rules unpatch
 	dh_clean build-stamp debian/x264.1
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..72d6c7d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1 @@
+# x264 currently does not have any releases

-- 
x264 packaging