r188 - in unstable/x264/debian: . patches

Samuel Hocevar sho at alioth.debian.org
Wed Mar 14 14:23:24 CET 2007 

Author: sho
Date: 2007-03-13 01:43:09 +0000 (Tue, 13 Mar 2007)
New Revision: 188

Removed:
   unstable/x264/debian/patches/000_usr_prefix.diff
Modified:
   unstable/x264/debian/changelog
   unstable/x264/debian/control
   unstable/x264/debian/copyright
   unstable/x264/debian/patches/series
   unstable/x264/debian/rules
   unstable/x264/debian/x264.1
Log:
x264 (0.svn20070309-2) unstable; urgency=low

  * debian/rules:
    + Activate --enable-pthread.
  * debian/control:
    + Added conflicts/replaces x264-bin because of unofficial packages that
      decided "x264" was not a good package name for the "x264" program
      (Closes: #414648).
  * debian/copyright:
    + Cleaned up, removed mention to NetBSD files that are no longer here.
  * debian/patches/000_usr_prefix.diff:
    + Remove this patch in favour of --prefix=/usr.

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 13 Mar 2007 02:04:58 +0100


Modified: unstable/x264/debian/changelog
===================================================================
--- unstable/x264/debian/changelog	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/changelog	2007-03-13 01:43:09 UTC (rev 188)
@@ -1,3 +1,18 @@
+x264 (0.svn20070309-2) unstable; urgency=low
+
+  * debian/rules:
+    + Activate --enable-pthread.
+  * debian/control:
+    + Added conflicts/replaces x264-bin because of unofficial packages that
+      decided "x264" was not a good package name for the "x264" program
+      (Closes: #414648).
+  * debian/copyright:
+    + Cleaned up, removed mention to NetBSD files that are no longer here.
+  * debian/patches/000_usr_prefix.diff:
+    + Remove this patch in favour of --prefix=/usr.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 13 Mar 2007 02:04:58 +0100
+
 x264 (0.svn20070309-1) unstable; urgency=low
 
   * Initial release (Closes: #405212).

Modified: unstable/x264/debian/control
===================================================================
--- unstable/x264/debian/control	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/control	2007-03-13 01:43:09 UTC (rev 188)
@@ -11,6 +11,8 @@
 Section: graphics
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: x264-bin
+Replaces: x264-bin
 Description: video encoder for the H.264/MPEG-4 AVC standard
  x264 is an advanced commandline encoder for creating H.264 (MPEG-4 AVC)
  video streams.

Modified: unstable/x264/debian/copyright
===================================================================
--- unstable/x264/debian/copyright	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/copyright	2007-03-13 01:43:09 UTC (rev 188)
@@ -3,11 +3,10 @@
 
 It was downloaded from svn://svn.videolan.org/x264/trunk/
 
-extras/getopt.c:
-  Copyright (c) 2000 The NetBSD Foundation, Inc.
-  This code is derived from software contributed to The NetBSD Foundation
-  by Dieter Baron and Thomas Klausner.
-  Licensed under the NetBSD license.
+encoder/eval.c, extras/getopt.c:
+  Copyright (C) 2002 Michael Niedermayer <michaelni at gmx.at>
+  Copyright (C) 1987-1996, 1998-2001 Free Software Foundation, Inc.
+  Licensed unter the GNU LGPL, version 2.1 or later.
 
 all other files:
   Copyright (c) 2003-2006 Laurent Aimar <fenrir at via.ecp.fr>
@@ -29,37 +28,24 @@
                           Riccardo Stievano (walkunafraid(at)tin.it)
                           Tuukka Toivonen (tuukkat(at)ee.oulu.fi)
                           Vincent Torri (Vincent.Torri(at)iecn.u-nancy.fr)
+  Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc.
   Licensed under the GNU General Public License, version 2 or later.
 
-The NetBSD license:
+The blurb for the GNU Lesser General Publice License, version 2.1 or later:
 
- | Redistribution and use in source and binary forms, with or without
- | modification, are permitted provided that the following conditions
- | are met:
- | 1. Redistributions of source code must retain the above copyright
- |    notice, this list of conditions and the following disclaimer.
- | 2. Redistributions in binary form must reproduce the above copyright
- |    notice, this list of conditions and the following disclaimer in the
- |    documentation and/or other materials provided with the distribution.
- | 3. All advertising materials mentioning features or use of this software
- |    must display the following acknowledgement:
- |        This product includes software developed by the NetBSD
- |        Foundation, Inc. and its contributors.
- | 4. Neither the name of The NetBSD Foundation nor the names of its
- |    contributors may be used to endorse or promote products derived
- |    from this software without specific prior written permission.
+ | This library is free software; you can redistribute it and/or
+ | modify it under the terms of the GNU Lesser General Public
+ | License as published by the Free Software Foundation; either
+ | version 2.1 of the License, or (at your option) any later version.
  |
- | THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- | ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- | TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- | PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- | BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- | POSSIBILITY OF SUCH DAMAGE.
+ | This library is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ | Lesser General Public License for more details.
+ |
+ | You should have received a copy of the GNU Lesser General Public
+ | License along with this library; if not, write to the Free Software
+ | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,  MA 02110-1301, USA.
 
 The blurb for the GNU General Publice License, version 2 or later:
 
@@ -77,6 +63,9 @@
  | along with this program; if not, write to the Free Software
  | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL'. and the
+complete text of the GNU Lesser General Public License can be found in
+the `/usr/share/common-licenses/LGPL' file.
 
+

Deleted: unstable/x264/debian/patches/000_usr_prefix.diff
===================================================================
--- unstable/x264/debian/patches/000_usr_prefix.diff	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/patches/000_usr_prefix.diff	2007-03-13 01:43:09 UTC (rev 188)
@@ -1,13 +0,0 @@
-Index: x264-0.svn20070309/configure
-===================================================================
---- x264-0.svn20070309.orig/configure	2007-03-10 00:20:28.000000000 +0100
-+++ x264-0.svn20070309/configure	2007-03-10 00:20:38.000000000 +0100
-@@ -37,7 +37,7 @@
- 
- rm -f config.h config.mak x264.pc
- 
--prefix='/usr/local'
-+prefix='/usr'
- exec_prefix='${prefix}'
- bindir='${exec_prefix}/bin'
- libdir='${exec_prefix}/lib'

Modified: unstable/x264/debian/patches/series
===================================================================
--- unstable/x264/debian/patches/series	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/patches/series	2007-03-13 01:43:09 UTC (rev 188)
@@ -1,2 +1 @@
-000_usr_prefix.diff
 005_link_with_shared_lib.diff

Modified: unstable/x264/debian/rules
===================================================================
--- unstable/x264/debian/rules	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/rules	2007-03-13 01:43:09 UTC (rev 188)
@@ -11,6 +11,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+confflags = --enable-debug --enable-pthread --prefix=/usr
 
 CFLAGS = -Wall -g
 
@@ -26,14 +27,14 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	# Build static lib
 	$(MAKE) clean
-	./configure --enable-debug
+	CFLAGS="$(CFLAGS)" ./configure $(confflags)
 	$(MAKE) libx264.a
 	# Backup static lib
 	mv libx264.a libx264.a.bak
 	# Build shared lib + GTK frontend
 	$(MAKE) clean
 	# TODO: --enable-visualize --enable-gtk
-	./configure --enable-debug --enable-shared --enable-pic
+	CFLAGS="$(CFLAGS)" ./configure $(confflags) --enable-shared --enable-pic
 	$(MAKE)
 	# Restore static lib
 	mv libx264.a.bak libx264.a

Modified: unstable/x264/debian/x264.1
===================================================================
--- unstable/x264/debian/x264.1	2007-03-12 21:03:38 UTC (rev 187)
+++ unstable/x264/debian/x264.1	2007-03-13 01:43:09 UTC (rev 188)
@@ -331,3 +331,8 @@
 Use access unit delimiters
 .SH "SEE ALSO"
 .B ffmpeg(1)
+.SH AUTHORS
+x264 was written by Laurent Aimar <fenrir at via.ecp.fr> et al.
+.PP
+This manual page was written by Sam Hocevar <sam at zoy.org> for the Debian
+project (but may be used by others).

More information about the Pkg-multimedia-commits mailing list