puiterwijk pushed to php-pear-Auth-OpenID (epel7). "Merging identical branches."

[notifications at fedoraproject.org]

>From fc307b54b7e5aaa97635c09e18b8617c5d5ed81a Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Tue, 29 Sep 2009 06:22:56 +0000
Subject: Initialize branch F-12 for php-pear-Auth-OpenID


diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12
-- 
cgit v0.10.2


>From 092712385c3113fe89dd48761f7ad8dc02bb8c2a Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Thu, 26 Nov 2009 01:58:46 +0000
Subject: Fix typo that causes a failure to update the common directory.
 (releng     #2781)


diff --git a/Makefile b/Makefile
index c2cd22f..c161622 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: php-pear-Auth-OpenID
-# $Id$
+# $Id: Makefile,v 1.1 2008/08/01 16:02:43 kevin Exp $
 NAME := php-pear-Auth-OpenID
 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))
-- 
cgit v0.10.2


>From a9de08af47b5ff9fa959927d36fd7f26ca63a436 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 08:57:02 +0000
Subject: dist-git conversion


diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 1c8fa2f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-php-openid-2.1.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1c8fa2f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+php-openid-2.1.1.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c161622..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: php-pear-Auth-OpenID
-# $Id: Makefile,v 1.1 2008/08/01 16:02:43 kevin Exp $
-NAME := php-pear-Auth-OpenID
-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
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-pear-Auth-OpenID.git/commit/?h=epel7&id=67eead5a70216dcea49a054f2ad1b93ce12c990f