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

Leave userv service name the same, for compatibility.

diff --git a/.gitignore b/.gitignore
index eb564c852475b5af40711e6c050ca40dadfadaae..00fe1cbc70af11d551e10e719623d38a243102b1 100644 (file)
--- 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 6ff8c3bea0c4a19892821d9b198bdebe349d40d1..00c75c3a6045f012690b682546b9003a1372a77e 100755 (executable)
--- 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
similarity index 100%
rename from www-cgi/.gitignore
rename to ucgi/.gitignore

diff --git a/www-cgi/INSTALL b/ucgi/INSTALL
similarity index 100%
rename from www-cgi/INSTALL
rename to ucgi/INSTALL

diff --git a/www-cgi/Makefile b/ucgi/Makefile
similarity index 96%
rename from www-cgi/Makefile
rename to ucgi/Makefile
index 6e969d62bbbd3909e9dd1ae4c10cedba707e03f3..1d8b34bbd7512500779785779bc8e486205b7a26 100644 (file)
--- 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
similarity index 100%
rename from www-cgi/README.custom-env-filter
rename to ucgi/README.custom-env-filter

diff --git a/www-cgi/check b/ucgi/check
similarity index 100%
rename from www-cgi/check
rename to ucgi/check

diff --git a/www-cgi/srm.conf.fragment b/ucgi/srm.conf.fragment
similarity index 100%
rename from www-cgi/srm.conf.fragment
rename to ucgi/srm.conf.fragment

diff --git a/www-cgi/ucgi.c b/ucgi/ucgi.c
similarity index 100%
rename from www-cgi/ucgi.c
rename to ucgi/ucgi.c

diff --git a/www-cgi/ucgi.h b/ucgi/ucgi.h
similarity index 100%
rename from www-cgi/ucgi.h
rename to ucgi/ucgi.h

diff --git a/www-cgi/ucgicommon.c b/ucgi/ucgicommon.c
similarity index 100%
rename from www-cgi/ucgicommon.c
rename to ucgi/ucgicommon.c

diff --git a/www-cgi/ucgitarget.c b/ucgi/ucgitarget.c
similarity index 100%
rename from www-cgi/ucgitarget.c
rename to ucgi/ucgitarget.c

diff --git a/www-cgi/user-cgi.text b/ucgi/user-cgi.text
similarity index 100%
rename from www-cgi/user-cgi.text
rename to ucgi/user-cgi.text

diff --git a/www-cgi/www-cgi b/ucgi/www-cgi
similarity index 93%
rename from www-cgi/www-cgi
rename to ucgi/www-cgi
index 364f7e526a08aca607d564ef9025f1b90a3ab4d1..6692349855f94f16c1b789ba9e4480fce93bf237 100644 (file)
--- 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