compile | 142 --------------------------------------------- debian/changelog | 9 ++ debian/control | 8 +- debian/libxvmc-dev.install | 1 debian/rules | 2 5 files changed, 13 insertions(+), 149 deletions(-)
New commits: commit ca9adb230714bb7ab95188a205611a448980fcbb Author: Julien Cristau <[email protected]> Date: Wed Nov 25 20:16:49 2009 +0100 Prepare changelog for upload diff --git a/debian/changelog b/debian/changelog index e27fadd..fa5ed04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxvmc (2:1.0.5-1) UNRELEASED; urgency=low +libxvmc (2:1.0.5-1) unstable; urgency=low [ Timo Aaltonen ] * Bump the epoch so that this can be synced to Ubuntu in the future. @@ -25,7 +25,7 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low * Remove -1 debian revisions from build-deps to appease lintian. * Install XvMC_API.txt in libxvmc-dev. - -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 13:02:59 +0200 + -- Julien Cristau <[email protected]> Wed, 25 Nov 2009 20:16:44 +0100 libxvmc (1:1.0.4-2) unstable; urgency=low commit 1b5cb383eeb5421a9051b6a36487fe23564a9218 Author: Julien Cristau <[email protected]> Date: Wed Nov 25 20:16:36 2009 +0100 Install XvMC_API.txt in libxvmc-dev. diff --git a/debian/changelog b/debian/changelog index 6b4b71f..e27fadd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low [ Julien Cristau ] * Bump Standards-Version to 3.8.3. * Remove -1 debian revisions from build-deps to appease lintian. + * Install XvMC_API.txt in libxvmc-dev. -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 13:02:59 +0200 diff --git a/debian/libxvmc-dev.install b/debian/libxvmc-dev.install index 03e98f5..a8b1a8f 100644 --- a/debian/libxvmc-dev.install +++ b/debian/libxvmc-dev.install @@ -4,3 +4,4 @@ usr/lib/libXvMC.so usr/lib/libXvMCW.a usr/lib/libXvMCW.so usr/lib/pkgconfig/xvmc.pc +usr/share/doc/libXvMC/* usr/share/doc/libxvmc-dev commit 3851840d567d3918d0b708006a49b673678e7c85 Author: Julien Cristau <[email protected]> Date: Wed Nov 25 20:14:40 2009 +0100 Remove -1 debian revisions from build-deps to appease lintian. diff --git a/debian/changelog b/debian/changelog index 820cd3f..6b4b71f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low [ Julien Cristau ] * Bump Standards-Version to 3.8.3. + * Remove -1 debian revisions from build-deps to appease lintian. -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 13:02:59 +0200 diff --git a/debian/control b/debian/control index 67607cc..bc174f7 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,10 @@ Maintainer: Debian X Strike Force <[email protected]> Uploaders: David Nusinow <[email protected]>, Andres Salomon <[email protected]>, Drew Parsons <[email protected]> Build-Depends: debhelper (>= 5.0.0), - libx11-dev (>= 1:0.99.2-1), - libxext-dev (>= 1:0.99.1-1), + libx11-dev (>= 1:0.99.2), + libxext-dev (>= 1:0.99.1), x11proto-video-dev, - libxv-dev (>= 1:0.99.1-1), + libxv-dev (>= 1:0.99.1), xutils-dev (>= 1:7.5~1), pkg-config, quilt, commit 808aac2d5145174dc124de968d3d444037750639 Author: Julien Cristau <[email protected]> Date: Wed Nov 25 20:13:41 2009 +0100 Also remove compile on clean diff --git a/compile b/compile deleted file mode 100755 index 1b1d232..0000000 --- a/compile +++ /dev/null @@ -1,142 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. - -scriptversion=2005-05-14.22 - -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. -# Written by Tom Tromey <[email protected]>. -# -# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to <[email protected]> or send patches to -# <[email protected]>. - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. - -Report bugs to <[email protected]>. -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; -esac - -ofile= -cfile= -eat= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` - -# Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/debian/rules b/debian/rules index 21078cd..20f2bc2 100755 --- a/debian/rules +++ b/debian/rules @@ -57,7 +57,7 @@ clean: xsfclean rm -rf autom4te.cache */autom4te.cache rm -rf obj-* rm -f aclocal.m4 config.guess config.h.in config.sub configure - rm -f depcomp install-sh ltmain.sh missing mkinstalldirs + rm -f compile depcomp install-sh ltmain.sh missing mkinstalldirs find -name Makefile.in -delete dh_clean commit 417519ded26a394257022739e64a186e482eb7ee Author: Julien Cristau <[email protected]> Date: Wed Nov 25 20:11:39 2009 +0100 Bump Standards-Version to 3.8.3. diff --git a/debian/changelog b/debian/changelog index 70527d6..820cd3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ libxvmc (2:1.0.5-1) UNRELEASED; urgency=low * Use updated xsfbs, closes: #538593. * Move -dbg package to section debug. + [ Julien Cristau ] + * Bump Standards-Version to 3.8.3. + -- Brice Goglin <[email protected]> Sat, 01 Aug 2009 13:02:59 +0200 libxvmc (1:1.0.4-2) unstable; urgency=low diff --git a/debian/control b/debian/control index eb2ddfc..67607cc 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: quilt, automake, libtool -Standards-Version: 3.8.2 +Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxvmc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxvmc.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
