[Restricted-changes] r178 - in dists/trunk: lame/debian libdvdcss/debian mjpegtools/debian mjpegtools/debian/patches xvidcore/debian xvidcore/debian/patches
fabian-guest at alioth.debian.org
fabian-guest at alioth.debian.org
Thu Mar 13 08:10:12 UTC 2008
Author: fabian-guest
Date: 2008-03-13 08:10:11 +0000 (Thu, 13 Mar 2008)
New Revision: 178
Added:
dists/trunk/xvidcore/debian/patches/01_missing-shebang.patch
Removed:
dists/trunk/xvidcore/debian/patches/00list
dists/trunk/xvidcore/debian/patches/01-shebang.dpatch
Modified:
dists/trunk/lame/debian/copyright
dists/trunk/libdvdcss/debian/copyright
dists/trunk/mjpegtools/debian/changelog
dists/trunk/mjpegtools/debian/copyright
dists/trunk/mjpegtools/debian/patches/02_as-needed.patch
dists/trunk/xvidcore/debian/control
dists/trunk/xvidcore/debian/copyright
dists/trunk/xvidcore/debian/rules
Log:
Xvid revisited
Minor fixes in mjpegtools
Minor fixes in */debian/copyright
Modified: dists/trunk/lame/debian/copyright
===================================================================
--- dists/trunk/lame/debian/copyright 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/lame/debian/copyright 2008-03-13 08:10:11 UTC (rev 178)
@@ -50,5 +50,6 @@
On Debian systems, the complete text of the GNU General Public License
can be found in /usr/share/common-licenses/GPL file.
-The Debian packaging is (C) 2007-2008, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2005-2008, Daniel Baumann <daniel at debian.org> and
+Fabian Greffrath <fabian at debian-unofficial.org> and is licensed under the GPL,
+see `/usr/share/common-licenses/GPL'.
Modified: dists/trunk/libdvdcss/debian/copyright
===================================================================
--- dists/trunk/libdvdcss/debian/copyright 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/libdvdcss/debian/copyright 2008-03-13 08:10:11 UTC (rev 178)
@@ -33,5 +33,6 @@
Copyright (C) 2001-2003 Sam Hocevar <sam at zoy.org>
This code is public domain.
-The Debian packaging is (C) 2007-2008, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2005-2008, Daniel Baumann <daniel at debian.org> and
+Fabian Greffrath <fabian at debian-unofficial.org> and is licensed under the GPL,
+see `/usr/share/common-licenses/GPL'.
Modified: dists/trunk/mjpegtools/debian/changelog
===================================================================
--- dists/trunk/mjpegtools/debian/changelog 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/mjpegtools/debian/changelog 2008-03-13 08:10:11 UTC (rev 178)
@@ -1,5 +1,6 @@
mjpegtools (1.9.0~rc3+debian-1) unstable; urgency=low
* Initial release.
+ * Rebuilt upstream tarball without debian directory.
-- Fabian Greffrath <fabian at debian-unofficial.org> Sat, 1 Mar 2008 00:00:00 +0100
Modified: dists/trunk/mjpegtools/debian/copyright
===================================================================
--- dists/trunk/mjpegtools/debian/copyright 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/mjpegtools/debian/copyright 2008-03-13 08:10:11 UTC (rev 178)
@@ -23,7 +23,7 @@
License:
- Copyright © 2000-2008 mjpegtools authors
+ Copyright © 2000-2008, mjpegtools authors
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: dists/trunk/mjpegtools/debian/patches/02_as-needed.patch
===================================================================
--- dists/trunk/mjpegtools/debian/patches/02_as-needed.patch 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/mjpegtools/debian/patches/02_as-needed.patch 2008-03-13 08:10:11 UTC (rev 178)
@@ -78,7 +78,7 @@
+ deplibs="$deplibs $arg"
+ continue
+ ;;
-+
++
-Wl,*)
args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
arg=
Modified: dists/trunk/xvidcore/debian/control
===================================================================
--- dists/trunk/xvidcore/debian/control 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/xvidcore/debian/control 2008-03-13 08:10:11 UTC (rev 178)
@@ -7,9 +7,8 @@
Origin: debian-unofficial.org
Bugs: mailto:restricted-devel at lists.alioth.debian.org
Build-Depends: autotools-dev,
- cdbs,
+ cdbs (>= 0.4.41),
debhelper (>= 5),
- dpatch,
yasm
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/restricted/dists/trunk/xvidcore/
Modified: dists/trunk/xvidcore/debian/copyright
===================================================================
--- dists/trunk/xvidcore/debian/copyright 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/xvidcore/debian/copyright 2008-03-13 08:10:11 UTC (rev 178)
@@ -15,7 +15,7 @@
License:
- Copyright (C) 2001-2004 xvid team <xvid-devel at xvid.org>
+ Copyright © 2001-2004, xvid team <xvid-devel at xvid.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -34,5 +34,6 @@
On Debian systems, the complete text of the GNU General Public License
can be found in the `/usr/share/common-licenses/GPL' file.
-The Debian packaging is (C) 2005-2008, Daniel Baumann <daniel at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2005-2008, Daniel Baumann <daniel at debian.org> and
+Fabian Greffrath <fabian at debian-unofficial.org> and is licensed under the GPL,
+see `/usr/share/common-licenses/GPL'.
Deleted: dists/trunk/xvidcore/debian/patches/00list
===================================================================
--- dists/trunk/xvidcore/debian/patches/00list 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/xvidcore/debian/patches/00list 2008-03-13 08:10:11 UTC (rev 178)
@@ -1 +0,0 @@
-01-shebang
Deleted: dists/trunk/xvidcore/debian/patches/01-shebang.dpatch
===================================================================
--- dists/trunk/xvidcore/debian/patches/01-shebang.dpatch 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/xvidcore/debian/patches/01-shebang.dpatch 2008-03-13 08:10:11 UTC (rev 178)
@@ -1,15 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-shebang.dpatch by Daniel Baumann <panthera at debian-unofficial.org>
-##
-## DP: Add missing shebang.
-
- at DPATCH@
-
-diff -Naur xvidcore-1.1.0.orig/examples/bench_list.pl xvidcore-1.1.0/examples/bench_list.pl
---- xvidcore-1.1.0.orig/examples/bench_list.pl 2005-12-30 14:34:56.000000000 +0000
-+++ xvidcore-1.1.0/examples/bench_list.pl 2006-01-31 22:33:57.723095192 +0000
-@@ -1,3 +1,4 @@
-+#!/usr/bin/perl
- #
- # List of benches to run
- #
Added: dists/trunk/xvidcore/debian/patches/01_missing-shebang.patch
===================================================================
--- dists/trunk/xvidcore/debian/patches/01_missing-shebang.patch (rev 0)
+++ dists/trunk/xvidcore/debian/patches/01_missing-shebang.patch 2008-03-13 08:10:11 UTC (rev 178)
@@ -0,0 +1,8 @@
+diff -Nur ../../examples/bench_list.pl~ ../../examples/bench_list.pl
+--- ../../examples/bench_list.pl~ 2008-03-11 13:22:57.000000000 +0100
++++ ../../examples/bench_list.pl 2008-03-11 13:26:38.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/perl
+ #
+ # List of benches to run
+ #
Modified: dists/trunk/xvidcore/debian/rules
===================================================================
--- dists/trunk/xvidcore/debian/rules 2008-03-11 10:25:08 UTC (rev 177)
+++ dists/trunk/xvidcore/debian/rules 2008-03-13 08:10:11 UTC (rev 178)
@@ -2,11 +2,13 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_SRCDIR = build/generic
-DEB_BUILDDIR = build/generic
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_SRCDIR := build/generic
+DEB_BUILDDIR := build/generic
+
DEB_INSTALL_CHANGELOGS_ALL += ChangeLog
DEB_INSTALL_DOCS_ALL += AUTHORS README TODO
More information about the Restricted-changes
mailing list