From 5e217877d0d85c56c881da5c8a11fd253c11fe0a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 15 Apr 2017 12:05:50 +0100 Subject: [PATCH] Rename www-cgi to ucgi (in nearly all places) Leave userv service name the same, for compatibility. --- .gitignore | 2 +- debian/rules | 12 ++++++------ {www-cgi => ucgi}/.gitignore | 0 {www-cgi => ucgi}/INSTALL | 0 {www-cgi => ucgi}/Makefile | 4 ++-- {www-cgi => ucgi}/README.custom-env-filter | 0 {www-cgi => ucgi}/check | 0 {www-cgi => ucgi}/srm.conf.fragment | 0 {www-cgi => ucgi}/ucgi.c | 0 {www-cgi => ucgi}/ucgi.h | 0 {www-cgi => ucgi}/ucgicommon.c | 0 {www-cgi => ucgi}/ucgitarget.c | 0 {www-cgi => ucgi}/user-cgi.text | 0 {www-cgi => ucgi}/www-cgi | 2 +- 14 files changed, 10 insertions(+), 10 deletions(-) rename {www-cgi => ucgi}/.gitignore (100%) rename {www-cgi => ucgi}/INSTALL (100%) rename {www-cgi => ucgi}/Makefile (96%) rename {www-cgi => ucgi}/README.custom-env-filter (100%) rename {www-cgi => ucgi}/check (100%) rename {www-cgi => ucgi}/srm.conf.fragment (100%) rename {www-cgi => ucgi}/ucgi.c (100%) rename {www-cgi => ucgi}/ucgi.h (100%) rename {www-cgi => ucgi}/ucgicommon.c (100%) rename {www-cgi => ucgi}/ucgitarget.c (100%) rename {www-cgi => ucgi}/user-cgi.text (100%) rename {www-cgi => ucgi}/www-cgi (93%) 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 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 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 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 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 -- 2.30.2