The following commit has been merged in the master branch:
commit 538b3ce799047e44a3b6079e171ee2726d2af3da
Author: Stephane Glondu <st...@glondu.net>
Date:   Sun Jan 15 15:00:01 2012 +0100

    More ocsigen -> ocsigenserver renamings

diff --git a/debian/README.Debian b/debian/README.Debian
index 41e79aa..41d4cba 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,4 +1,4 @@
-Ocsigen for Debian
+Ocsigen Server for Debian
 
   * Ocsigen uses heavily dynamic loading. It uses Findlib to handle
     dependencies between libraries, and therefore needs META
@@ -10,8 +10,9 @@ Ocsigen for Debian
     though. Please test it and report any anomaly. The bytecode
     version is still used by default.
 
-  * When the ocsigen package is upgraded, everything in
-    /etc/ocsigen/update.d will be executed using run-parts(8). This is
-    an opportunity to recompile any site-specific module.
+  * When the ocsigenserver package is upgraded, everything in
+    /etc/ocsigenserver/update.d will be executed using
+    run-parts(8). This is an opportunity to recompile any
+    site-specific module.
 
- -- Stephane Glondu <st...@glondu.net>, Sun, 21 Jun 2009 01:01:30 +0200
+ -- St├ęphane Glondu <glo...@debian.org>, Sun, 15 Jan 2012 14:58:52 +0100
diff --git a/debian/ocsigenserver.default b/debian/ocsigenserver.default
index ad5cea1..fca70c1 100644
--- a/debian/ocsigenserver.default
+++ b/debian/ocsigenserver.default
@@ -1,4 +1,4 @@
-# Defaults for ocsigen initscript
-# sourced by /etc/init.d/ocsigen
+# Defaults for ocsigenserver initscript
+# sourced by /etc/init.d/ocsigenserver
 
 LAUNCH_AT_STARTUP=false
diff --git a/debian/ocsigenserver.examples b/debian/ocsigenserver.examples
index f063f2f..350da23 100644
--- a/debian/ocsigenserver.examples
+++ b/debian/ocsigenserver.examples
@@ -1 +1 @@
-debian/tmp/etc/ocsigen/*.sample
+debian/tmp/etc/ocsigenserver/*.sample
diff --git a/debian/ocsigenserver.init b/debian/ocsigenserver.init
index 4738cc3..4b50918 100644
--- a/debian/ocsigenserver.init
+++ b/debian/ocsigenserver.init
@@ -3,7 +3,7 @@
 # Init script written by Samuel Mimram <smim...@debian.org>.
 #
 ### BEGIN INIT INFO
-# Provides:          ocsigen
+# Provides:          ocsigenserver
 # Required-Start:    $syslog $network $remote_fs
 # Required-Stop:     $syslog $network $remote_fs
 # Should-Start:      $local_fs
@@ -15,15 +15,15 @@
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/ocsigen
-NAME=ocsigen
-DESC=ocsigen
+DAEMON=/usr/bin/ocsigenserver
+NAME=ocsigenserver
+DESC=ocsigenserver
 PIDFILE=/var/run/$NAME.pid
-DEFAULTFILE=/etc/default/ocsigen
+DEFAULTFILE=/etc/default/ocsigenserver
 
 test -x $DAEMON || exit 0
 
-# Include ocsigen defaults if available
+# Include ocsigenserver defaults if available
 if [ -f $DEFAULTFILE ] ; then
        . $DEFAULTFILE
 fi
@@ -52,7 +52,7 @@ case "$1" in
        ;;
   reload)
         echo -n "Reloading $DESC: "
-        echo reload > /var/run/ocsigen_command
+        echo reload > /var/run/ocsigenserver_command
         echo "$NAME."
         ;;
   restart|force-reload)
diff --git a/debian/ocsigenserver.install.in b/debian/ocsigenserver.install.in
index e0fc137..5fa7a64 100644
--- a/debian/ocsigenserver.install.in
+++ b/debian/ocsigenserver.install.in
@@ -1,7 +1,7 @@
-etc/ocsigen/mime.types
-etc/ocsigen/ocsigen.conf
+etc/ocsigenserver/mime.types
+etc/ocsigenserver/ocsigenserver.conf
 etc/logrotate.d
 usr/bin
 usr/share/man
-usr/share/ocsigen
-var/lib/ocsigen
+usr/share/ocsigenserver
+var/lib/ocsigenserver
diff --git a/debian/ocsigenserver.links b/debian/ocsigenserver.links
index b06fc9e..cd6984c 100644
--- a/debian/ocsigenserver.links
+++ b/debian/ocsigenserver.links
@@ -1 +1 @@
-usr/share/man/man1/ocsigen.1.gz                
usr/share/man/man1/ocsigen.opt.1.gz
+usr/share/man/man1/ocsigenserver.1.gz          
usr/share/man/man1/ocsigenserver.opt.1.gz
diff --git a/debian/ocsigenserver.postinst b/debian/ocsigenserver.postinst
index ae74efb..b59d3df 100644
--- a/debian/ocsigenserver.postinst
+++ b/debian/ocsigenserver.postinst
@@ -14,7 +14,7 @@ USERADD="/usr/sbin/useradd"
 GROUPDEL="/usr/sbin/groupdel"
 GROUPMOD="/usr/sbin/groupmod"
 ID="/usr/bin/id"
-HOOKSDIR="/etc/ocsigen/update.d"
+HOOKSDIR="/etc/ocsigenserver/update.d"
 
 ###
 # 1. Get current uid and gid if user exists.
@@ -42,11 +42,11 @@ if [ "$IUID" = "NONE" ] || [ $IUID -ge 1000 ]; then # we 
must do sth :)
 #    Issue a warning if it fails.
   if $GROUPMOD $OCSIGEN > /dev/null 2>&1; then
     # group already exists, use --ingroup
-    if ! $ADDUSER --system --disabled-password --disabled-login --home 
/var/lib/ocsigen --no-create-home --ingroup $OCSIGEN $OCSIGEN; then
+    if ! $ADDUSER --system --disabled-password --disabled-login --home 
/var/lib/ocsigenserver --no-create-home --ingroup $OCSIGEN $OCSIGEN; then
       echo "The adduser command failed."
     fi
   else
-    if ! $ADDUSER --system --disabled-password --disabled-login --home 
/var/lib/ocsigen --no-create-home --group $OCSIGEN; then
+    if ! $ADDUSER --system --disabled-password --disabled-login --home 
/var/lib/ocsigenserver --no-create-home --group $OCSIGEN; then
       echo "The adduser command failed."
     fi
   fi
@@ -55,12 +55,12 @@ set +e
 
 ###
 # 4.1 Change ownership of directory.
-$CHOWN -R $OCSIGEN:$OCSIGEN /var/lib/ocsigen/
-$CHMOD 750 /var/lib/ocsigen/
+$CHOWN -R $OCSIGEN:$OCSIGEN /var/lib/ocsigenserver/
+$CHMOD 750 /var/lib/ocsigenserver/
 
 ###
 # 4.2 Create log directory and empty log if needed
-LOGDIR="/var/log/ocsigen"
+LOGDIR="/var/log/ocsigenserver"
 LOGFILE="${LOGDIR}/access.log"
 mkdir -p $LOGDIR
 $CHOWN $OCSIGEN:$OCSIGEN $LOGDIR
diff --git a/debian/ocsigenserver.postrm b/debian/ocsigenserver.postrm
index f3a4cc1..080cbdc 100644
--- a/debian/ocsigenserver.postrm
+++ b/debian/ocsigenserver.postrm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for ocsigen
+# postrm script for ocsigenserver
 
 set -e
 
@@ -8,8 +8,8 @@ case "$1" in
     ;;
 
     purge)
-        if test -d /var/log/ocsigen; then
-          rm -Rf /var/log/ocsigen
+        if test -d /var/log/ocsigenserver; then
+          rm -Rf /var/log/ocsigenserver
         fi
     ;;
 

-- 
ocsigenserver packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to