From 0c681d51993d91425b4082ac18335ed0ba641b9b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 10:57:09 +0000 Subject: [PATCH 1/4] Initialize branch F-7 for videodog --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From bf60ef61d4c648abae4493dbaeeb69840d7bffcd Mon Sep 17 00:00:00 2001 From: Patrick Laughton Date: Tue, 21 Aug 2007 14:24:15 +0000 Subject: [PATCH 2/4] - License clarification --- videodog.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/videodog.spec b/videodog.spec index cb07643..c2ba952 100644 --- a/videodog.spec +++ b/videodog.spec @@ -1,10 +1,10 @@ Name: videodog Version: 0.31 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command-line video4linux frame-grabber Group: Applications/Multimedia -License: LGPL +License: LGPLv2+ URL: http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog.html Source0: http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 21 2007 Patrick "Jima" Laughton 0.31-5 +- License clarification + * Mon Aug 28 2006 Patrick "Jima" Laughton 0.31-4 - Rebuild for FC6 From 14c8d30da71ed8aa731e7e2ec84d0327cfedffc0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:43 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d9ec8d4..b9060d0 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := videodog SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3dfedfdde6de77c03e6278611f9eee758fc11c40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:58:21 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b9060d0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: videodog -# $Id$ -NAME := videodog -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7