Rename www-cgi to ucgi (in nearly all places)

Leave userv service name the same, for compatibility.

14 files changed, 10 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index eb564c8..00fe1cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ debian/debhelper-build-stamp
 debian/.debhelper
 
 debian/userv-utils
-debian/userv-www-cgi
+debian/userv-ucgi
 debian/userv-dyndns
 debian/userv-git-daemon
 debian/userv-groupmanage
diff --git a/debian/rules b/debian/rules
index 6ff8c3b..00c75c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
-subdirs_build=	ipif www-cgi git-daemon
+subdirs_build=	ipif ucgi git-daemon
 subdirs_nobuild=dyndns groupmanage misc
 package=	userv-utils
 packages_indep=	userv-dyndns userv-groupmanage userv-utils userv-git-daemon
@@ -65,13 +65,13 @@ override_dh_auto_install:
 		mv service.c.txt ipif.txt
 	cp -al debian/userv-ipif/. debian/userv-utils/.
 	-
-	set -e; cd debian/userv-www-cgi/usr/share/doc;	\
-		mv userv-cgi userv-utils;		\
+	set -e; cd debian/userv-ucgi/usr/share/doc;	\
+		mv userv-ucgi userv-utils;		\
 		cd userv-utils;				\
 		rename 's/^/ucgi-/' *
-	cp -al debian/userv-www-cgi/. debian/userv-utils/.
-	cp www-cgi/www-cgi \
-		debian/userv-utils/etc/userv/services.d/ucgi
+	cp -al debian/userv-ucgi/. debian/userv-utils/.
+	perl -pe 's{/usr/local/}{/usr/}' ucgi/www-cgi	\
+		>debian/userv-utils/etc/userv/services.d/www-cgi
 	-
 	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
 	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage
diff --git a/www-cgi/.gitignore b/ucgi/.gitignore
index 79f731a..79f731a 100644
--- a/www-cgi/.gitignore
+++ b/ucgi/.gitignore
diff --git a/www-cgi/INSTALL b/ucgi/INSTALL
index 33a2231..33a2231 100644
--- a/www-cgi/INSTALL
+++ b/ucgi/INSTALL
diff --git a/www-cgi/Makefile b/ucgi/Makefile
index 6e969d6..1d8b34b 100644
--- a/www-cgi/Makefile
+++ b/ucgi/Makefile
@@ -21,9 +21,9 @@
 
 include ../settings.make
 
-uslibdir=	$(libdir)/userv/cgi
+uslibdir=	$(libdir)/userv/ucgi
 uslibcgidir=	$(uslibdir)/cgi
-usdocdir=	$(docdir)/userv-cgi
+usdocdir=	$(docdir)/userv-ucgi
 
 TARGETS=	ucgi ucgitarget
 
diff --git a/www-cgi/README.custom-env-filter b/ucgi/README.custom-env-filter
index 58ef39b..58ef39b 100644
--- a/www-cgi/README.custom-env-filter
+++ b/ucgi/README.custom-env-filter
diff --git a/www-cgi/check b/ucgi/check
index fca7431..fca7431 100755
--- a/www-cgi/check
+++ b/ucgi/check
diff --git a/www-cgi/srm.conf.fragment b/ucgi/srm.conf.fragment
index 8acbe24..8acbe24 100644
--- a/www-cgi/srm.conf.fragment
+++ b/ucgi/srm.conf.fragment
diff --git a/www-cgi/ucgi.c b/ucgi/ucgi.c
index fc9888b..fc9888b 100644
--- a/www-cgi/ucgi.c
+++ b/ucgi/ucgi.c
diff --git a/www-cgi/ucgi.h b/ucgi/ucgi.h
index e20e764..e20e764 100644
--- a/www-cgi/ucgi.h
+++ b/ucgi/ucgi.h
diff --git a/www-cgi/ucgicommon.c b/ucgi/ucgicommon.c
index c3eb4b3..c3eb4b3 100644
--- a/www-cgi/ucgicommon.c
+++ b/ucgi/ucgicommon.c
diff --git a/www-cgi/ucgitarget.c b/ucgi/ucgitarget.c
index 178fa4e..178fa4e 100644
--- a/www-cgi/ucgitarget.c
+++ b/ucgi/ucgitarget.c
diff --git a/www-cgi/user-cgi.text b/ucgi/user-cgi.text
index 464686b..464686b 100644
--- a/www-cgi/user-cgi.text
+++ b/ucgi/user-cgi.text
diff --git a/www-cgi/www-cgi b/ucgi/www-cgi
index 364f7e5..6692349 100644
--- a/www-cgi/www-cgi
+++ b/ucgi/www-cgi
@@ -19,5 +19,5 @@ if ( grep service-user-shell /etc/shells
 	reset
 	no-suppress-args
 	no-set-environment
-	execute /usr/local/lib/userv/cgi/target public-cgi
+	execute /usr/local/lib/userv/ucgi/target public-cgi
 fi