chiark / gitweb /
Rename www-cgi to ucgi (in nearly all places)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 15 Apr 2017 11:05:50 +0000 (12:05 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 15 Apr 2017 11:05:50 +0000 (12:05 +0100)
Leave userv service name the same, for compatibility.

14 files changed:
.gitignore
debian/rules
ucgi/.gitignore [moved from www-cgi/.gitignore with 100% similarity]
ucgi/INSTALL [moved from www-cgi/INSTALL with 100% similarity]
ucgi/Makefile [moved from www-cgi/Makefile with 96% similarity]
ucgi/README.custom-env-filter [moved from www-cgi/README.custom-env-filter with 100% similarity]
ucgi/check [moved from www-cgi/check with 100% similarity]
ucgi/srm.conf.fragment [moved from www-cgi/srm.conf.fragment with 100% similarity]
ucgi/ucgi.c [moved from www-cgi/ucgi.c with 100% similarity]
ucgi/ucgi.h [moved from www-cgi/ucgi.h with 100% similarity]
ucgi/ucgicommon.c [moved from www-cgi/ucgicommon.c with 100% similarity]
ucgi/ucgitarget.c [moved from www-cgi/ucgitarget.c with 100% similarity]
ucgi/user-cgi.text [moved from www-cgi/user-cgi.text with 100% similarity]
ucgi/www-cgi [moved from www-cgi/www-cgi with 93% similarity]

index eb564c8..00fe1cb 100644 (file)
@@ -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
index 6ff8c3b..00c75c3 100755 (executable)
@@ -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
similarity index 100%
rename from www-cgi/.gitignore
rename to ucgi/.gitignore
similarity index 100%
rename from www-cgi/INSTALL
rename to ucgi/INSTALL
similarity index 96%
rename from www-cgi/Makefile
rename to ucgi/Makefile
index 6e969d6..1d8b34b 100644 (file)
@@ -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
 
similarity index 100%
rename from www-cgi/check
rename to ucgi/check
similarity index 100%
rename from www-cgi/ucgi.c
rename to ucgi/ucgi.c
similarity index 100%
rename from www-cgi/ucgi.h
rename to ucgi/ucgi.h
similarity index 100%
rename from www-cgi/ucgicommon.c
rename to ucgi/ucgicommon.c
similarity index 100%
rename from www-cgi/ucgitarget.c
rename to ucgi/ucgitarget.c
similarity index 100%
rename from www-cgi/user-cgi.text
rename to ucgi/user-cgi.text
similarity index 93%
rename from www-cgi/www-cgi
rename to ucgi/www-cgi
index 364f7e5..6692349 100644 (file)
@@ -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