[Monotone-commits-diffs] org.debian.monotone: e54c5c07d91ad289fa5e132be69c3b5505907a7a

[code]

revision:            e54c5c07d91ad289fa5e132be69c3b5505907a7a
date:                2010-11-25T16:15:51
author:              Richard Levitte <address@hidden>
branch:              org.debian.monotone
changelog:
Change all --norc to --no-standard-rcfiles

manifest:
format_version "1"

new_manifest [5e889e250063f7b6ada8d81c1e569e939f73d347]

old_revision [a5567749e993f422a91a2c3a492c6bdeb12e5b3d]

patch "changelog"
 from [32bce93004fe0c694e493766678e19db2ca38d1c]
   to [cde9a53bf2c70cba73c4f9b8132ed389b01ffbb4]

patch "monotone-server.monotone.init"
 from [0252e2d038ead1a191bb35610f452afd632a70a7]
   to [5874ff073563523d1e8ea744929c7b7e0586bca4]

patch "monotone-server.postinst"
 from [fdd39965c94fbeb2c93bf6d599ce2e3b4ddbbbad]
   to [170047d4029f2e1a2d43884380df691d132442c6]
============================================================
--- changelog	32bce93004fe0c694e493766678e19db2ca38d1c
+++ changelog	cde9a53bf2c70cba73c4f9b8132ed389b01ffbb4
@@ -9,7 +9,10 @@ monotone (0.99.1-1) UNRELEASED; urgency=
   * debian/patches/20-empty-command.diff: removed, since it's been fixed
     upstream.
   * debian/monotone-server.postinst: updated because 0.99 has another need
-    for database migration.
+    for database migration.  Changed all occurences of --norc to
+    --no-standard-rcfiles.
+  * debian/monotone-server.monotone.init: changed all occurences of --norc
+    to --no-standard-rcfiles.
 
   [ Francis Russell ]
   * Make monotone-doc suggest monotone instead of require.
============================================================
--- monotone-server.monotone.init	0252e2d038ead1a191bb35610f452afd632a70a7
+++ monotone-server.monotone.init	5874ff073563523d1e8ea744929c7b7e0586bca4
@@ -64,8 +64,8 @@ d_start()
     if start-stop-daemon --start --quiet --oknodo --background \
         --pidfile $PIDFILE --exec $DAEMON --chuid monotone --chdir $MTN_HOME \
 	-- \
-        --confdir=$MTN_CONFDIR --db=$MTN_DB --norc --pid-file=$PIDFILE \
-        --log=$MAINLOG --dump=$ERRORLOG --timestamps \
+        --confdir=$MTN_CONFDIR --db=$MTN_DB --no-standard-rcfiles \
+	--pid-file=$PIDFILE --log=$MAINLOG --dump=$ERRORLOG --timestamps \
         --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR --quiet \
         --bind=$ADDRESS serve
 
============================================================
--- monotone-server.postinst	fdd39965c94fbeb2c93bf6d599ce2e3b4ddbbbad
+++ monotone-server.postinst	170047d4029f2e1a2d43884380df691d132442c6
@@ -48,7 +48,8 @@ monotone_migrate ()
 	cp $MTN_DB $MTN_DB~
 
 	if $MTN --db=$MTN_DB db migrate --rcfile=$MTN_CONFDIR/hooks.lua \
-	    --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2; then
+	    --no-standard-rcfiles --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR \
+	    >&2; then
 	    echo "Database successfully migrated." >&2
 	    true
 	else
@@ -69,7 +70,8 @@ monotone_rosterify ()
 	echo "Attempting to rosterify monotone database..." >&2
 
 	if $MTN --db=$MTN_DB db rosterify --rcfile=$MTN_CONFDIR/hooks.lua \
-	    --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2; then
+	    --no-standard-rcfiles --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR \
+	    >&2; then
 	    echo "Database successfully rosterified." >&2
 	    true
 	else
@@ -90,7 +92,8 @@ monotone_regenerate_caches ()
 	echo "Attempting to regenerate caches..." >&2
 
 	if $MTN --db=$MTN_DB db regenerate_caches --rcfile=$MTN_CONFDIR/hooks.lua \
-	    --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2; then
+	    --no-standard-rcfiles --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR \
+	    >&2; then
 	    echo "Caches successfully regenerated." >&2
 	    true
 	else
@@ -178,7 +181,8 @@ case "$1" in
               if [ ! -e $MTN_DB ]; then
                   echo "Creating Monotone database..." >&2
                   $MTN --db=$MTN_DB db init \
-                     --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR
+                     --no-standard-rcfiles --keydir=$MTN_KEYDIR \
+                     --confdir=$MTN_CONFDIR
 
                   chmod 0600 $MTN_DB
                   chown monotone:monotone $MTN_DB
@@ -187,7 +191,8 @@ case "$1" in
 
                   yes "$MTN_KEY_PASSWD" |
                      $MTN --db=$MTN_DB genkey $MTN_KEY --quiet \
-                     --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR
+                     --no-standard-rcfiles --keydir=$MTN_KEYDIR \
+                     --confdir=$MTN_CONFDIR
 
                   chown monotone:monotone $MTN_HOME/keys/*