From 126025f58355a657720ecce525121be6aac9ea89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 9 Jan 2011 13:01:05 +0200
Subject: CVS -> Git migration.

---
 .gitignore   |  9 +++++++++
 INSTALL      | 10 +++-------
 make.sh      |  7 ++-----
 vdradmind.pl |  3 +--
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bca64c8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/locale/
+/po/*.mo
+/ChangeLog*
+/vdradmind.at
+/vdradmind.conf
+/vdradmind.done
+/vdradmind.log
+/vdradmind.pid
+/*.bz2
diff --git a/INSTALL b/INSTALL
index e2c0ba2..d705bcf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,15 +1,11 @@
 ***********************************************************
-*** Using CVS                                           ***
+*** Using Git                                           ***
 ***********************************************************
 
-If this is a CVS snapshot you have to perform some steps yourself
+If this is a Git snapshot you have to perform some steps yourself
 to get a complete VDRAdmin-AM folder:
 
-1) Always call "./make.sh cvs" after every "cvs checkout" or
-   "cvs update". At the moment this will only create some links
-	 but might do more in the future.
-
-2) The CVS checkout contains no locales (.mo files). You have
+1) The Git repository contains no locales (.mo files). You have
    create them yourself if you want to use a language other than
 	 English: ./make.sh po
 	 Please note that you need the "msgfmt" utility for this!
diff --git a/make.sh b/make.sh
index 6822aa1..9b23077 100755
--- a/make.sh
+++ b/make.sh
@@ -3,7 +3,6 @@
 LANGS="cs de es fr fi it nl ru"
 DIST_FILES="autotimer2searchtimer.pl ChangeLog COPYING CREDITS FAQ HISTORY INSTALL LGPL.txt README README.translators REQUIREMENTS contrib convert.pl install.sh lib locale make.sh template uninstall.sh vdradmind vdradmind.pl vdradmind.pl.1"
 INSTALL_SH=./install.sh
-CVS2CL="./cvs2cl.pl"	# get it at http://www.red-bean.com/cvs2cl/
 TMPDIR=/tmp
 
 
@@ -14,7 +13,6 @@ function Usage()
 	echo "Usage: $0 <action>"
 	echo
 	echo "Available actions:"
-	echo "  cvs       - always use this after a \"cvs update \" or \"cvs checkout\""
 	echo "  install   - install VDRAdmin-AM"
 	echo "  uninstall - uninstall VDRAdmin-AM"
 	echo "  po        - convert .po files to .mo files"
@@ -65,7 +63,7 @@ function do_dist()
 	cp -a po/*.po po/*.pot $TMPDIR/$DIST_NAME/po
 	(
 		cd $TMPDIR
-		tar --exclude CVS --exclude '.#*' --exclude '.nfs*' -cjf $DIST_NAME.tar.bz2 $DIST_NAME
+		tar --exclude '.#*' --exclude '.nfs*' -cjf $DIST_NAME.tar.bz2 $DIST_NAME
 		rm -rf $TMPDIR/$DIST_NAME
 	)
 	mv $TMPDIR/$DIST_NAME.tar.bz2 .
@@ -75,8 +73,7 @@ function do_dist()
 #
 function do_cl()
 {
-	[ -x $CVS2CL ] || Error "Missing $CVS2CL (http://www.red-bean.com/cvs2cl/)"
-	$CVS2CL --FSF --separate-header --no-wrap --no-times --tagdates --log-opts "-d>2006-07-08"
+	git log > ChangeLog
 }
 
 # check requirements.
diff --git a/vdradmind.pl b/vdradmind.pl
index 82a4728..8173417 100755
--- a/vdradmind.pl
+++ b/vdradmind.pl
@@ -6525,7 +6525,6 @@ sub config {
     for my $dir (<$TEMPLATEDIR/*>) {
         next if (!-d $dir);
         $dir =~ s/.*\///g;
-        next if ($dir eq 'CVS');
         my $found = 0;
         for (@template) { ($found = 1) if ($1 && ($_->{name} eq $1)); }
         if (!$found) {
@@ -6556,7 +6555,7 @@ sub config {
     my @skinlist;
     foreach my $file (glob(sprintf("%s/%s/*", $TEMPLATEDIR, $CONFIG_TEMP{TEMPLATE}))) {
         my $name = (split('\/', $file))[-1];
-        next if ($name eq 'CVS' || $name eq 'js');
+        next if ($name eq 'js');
         push(@skinlist,
              {  name => $name,
                 sel  => ($CONFIG_TEMP{SKIN} eq $name ? 1 : 0)
-- 
cgit v1.2.3