From e7bb90e073ce2a7407d2b9d2b58b734e649f7aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Tue, 4 Aug 2009 20:27:03 +0000 Subject: [PATCH 1/2] Initialize branch EL-4 for znc-extra --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From b6e4bfa2e0872fb53eace4daff12122eaa115782 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 21 Aug 2009 06:02:00 +0000 Subject: [PATCH 2/2] znc-extra is now a subpackage of znc --- .cvsignore | 0 Makefile | 21 --------------------- branch | 1 - dead.package | 1 + sources | 0 5 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile delete mode 100644 branch create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 9d5a6eb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc-extra -# $Id$ -NAME := znc-extra -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 -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 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..ee19beb --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +znc-extra is now a subpackage of znc diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000