From 89560a05cb3371cc883f234104d496e23aab972f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 05:18:06 +0000 Subject: [PATCH 1/7] Initialize branch F-12 for libcanberra --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 92161bd292a89de331891461e20407c9fcb5c1d4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 14 Oct 2009 19:25:44 +0000 Subject: [PATCH 2/7] New version 0.19 --- .cvsignore | 2 +- libcanberra.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5d806ab..5261784 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.18.tar.gz +libcanberra-0.19.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index 35b1c63..3cc7ca3 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,6 +1,6 @@ Name: libcanberra -Version: 0.18 -Release: 2%{?dist} +Version: 0.19 +Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries Source0: http://0pointer.de/lennart/projects/libcanberra/libcanberra-%{version}.tar.gz @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Wed Oct 14 2009 Lennart Poettering 0.19-1 +- New version 0.19 + * Fri Sep 25 2009 Matthias Clasen - 0.18-2 - Don't require vala in -devel (#523473) diff --git a/sources b/sources index b42f55f..c738ea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -395e83f7eac48b3ce8372a714026c85d libcanberra-0.18.tar.gz +4c7a718b8314d87737e4f91c2a06e1fc libcanberra-0.19.tar.gz From 4a534c86b52233738108f4659ea45ad07096c2f4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 15 Oct 2009 02:35:00 +0000 Subject: [PATCH 3/7] New version 0.20 --- .cvsignore | 2 +- libcanberra.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5261784..338041f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.19.tar.gz +libcanberra-0.20.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index 3cc7ca3..b5eaec5 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.19 +Version: 0.20 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Thu Oct 15 2009 Lennart Poettering 0.20-1 +- New version 0.20 + * Wed Oct 14 2009 Lennart Poettering 0.19-1 - New version 0.19 diff --git a/sources b/sources index c738ea1..12c70ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c7a718b8314d87737e4f91c2a06e1fc libcanberra-0.19.tar.gz +2f603086a1c994e96143c18739bc4200 libcanberra-0.20.tar.gz From 455a86544e1b784a28cac6c917927e3c33599d25 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 15 Oct 2009 23:28:59 +0000 Subject: [PATCH 4/7] New version 0.21 --- .cvsignore | 2 +- libcanberra.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 338041f..afa8d8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.20.tar.gz +libcanberra-0.21.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index b5eaec5..e1757ae 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.20 +Version: 0.21 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Fri Oct 16 2009 Lennart Poettering 0.21-1 +- New version 0.21 + * Thu Oct 15 2009 Lennart Poettering 0.20-1 - New version 0.20 diff --git a/sources b/sources index 12c70ff..ce3d417 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f603086a1c994e96143c18739bc4200 libcanberra-0.20.tar.gz +6d7b5eb6be8fca491008da529a02f5d5 libcanberra-0.21.tar.gz From 170d17ce7ce5456de1a62a4b8a88a29f45c04530 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 20 Oct 2009 01:11:52 +0000 Subject: [PATCH 5/7] new upstream --- .cvsignore | 2 +- libcanberra.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index afa8d8e..0cc410f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libcanberra-0.21.tar.gz +libcanberra-0.22.tar.gz diff --git a/libcanberra.spec b/libcanberra.spec index e1757ae..e80a3eb 100644 --- a/libcanberra.spec +++ b/libcanberra.spec @@ -1,5 +1,5 @@ Name: libcanberra -Version: 0.21 +Version: 0.22 Release: 1%{?dist} Summary: Portable Sound Event Library Group: System Environment/Libraries @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/vala/vapi/libcanberra.vapi %changelog +* Tue Oct 20 2009 Lennart Poettering 0.22-1 +- New version 0.22 + * Fri Oct 16 2009 Lennart Poettering 0.21-1 - New version 0.21 diff --git a/sources b/sources index ce3d417..3b84408 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6d7b5eb6be8fca491008da529a02f5d5 libcanberra-0.21.tar.gz +e24e2f956fedfbcc58edfa40471b18d8 libcanberra-0.22.tar.gz From 00790b3a21f510ffc6876d9ed33febba0a160821 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:45:58 +0000 Subject: [PATCH 6/7] 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 6498fce..4ad9d15 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := libcanberra 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 05efb6fcd4bf8a23ab961a4e2022f562b7a55822 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 20:45:52 +0000 Subject: [PATCH 7/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log 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 4ad9d15..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libcanberra -# $Id$ -NAME := libcanberra -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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 7bf54a3..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libcanberra-0_3-1_fc10:HEAD:libcanberra-0.3-1.fc10.src.rpm:1213637385