[Pkg-ocaml-maint-commits] r3619 - in
/trunk/packages/mldonkey/trunk/debian: changelog
mldonkey-server.config mldonkey-server.init mldonkey-server.postinst
mldonkey-server.postrm mldonkey-server.preinst mldonkey-server.templates
rules
smimram at users.alioth.debian.org
smimram at users.alioth.debian.org
Sun Mar 18 14:32:43 CET 2007
Author: smimram
Date: Sun Mar 18 13:32:42 2007
New Revision: 3619
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3619
Log:
Updated scripts.
Modified:
trunk/packages/mldonkey/trunk/debian/changelog
trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm
trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst
trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates
trunk/packages/mldonkey/trunk/debian/rules
Modified: trunk/packages/mldonkey/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/changelog?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/changelog (original)
+++ trunk/packages/mldonkey/trunk/debian/changelog Sun Mar 18 13:32:42 2007
@@ -1,13 +1,16 @@
mldonkey (2.8.3-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Ask all debconf questions even when the server is not autmatically started
+ since it is useful for force-start.
+ * Do not ask anymore for maximal time alive in debconf.
* Added Duch debconf translation (thanks Bart Cornelis), closes: #413706.
* Added Spanish debconf translation (thanks Manuel Porras Peralta),
closes: #413778.
* Added Portuguese debconf translation (thanks LuÃs Picciochi),
closes: #415065.
- -- Samuel Mimram <smimram at debian.org> Thu, 15 Mar 2007 22:53:48 +0100
+ -- Samuel Mimram <smimram at debian.org> Sun, 18 Mar 2007 14:05:26 +0100
mldonkey (2.8.3-1) unstable; urgency=low
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.config
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.config?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.config (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.config Sun Mar 18 13:32:42 2007
@@ -9,44 +9,39 @@
CONFIGFILE=/etc/default/mldonkey-server
if [ -e $CONFIGFILE ]; then
- MLDONKEY_DIR=
- MLDONKEY_GROUP=mldonkey
- MLDONKEY_USER=mldonkey
- MLDONKEY_UMASK=0022
- MAX_ALIVE=
- LAUNCH_AT_STARTUP=
- MLDONKEY_NICENESS=
- . $CONFIGFILE || true
-
- if [ "$MLDONKEY_DIR" != "" ]; then
- db_set mldonkey-server/mldonkey_dir $MLDONKEY_DIR
- fi
-
- if [ "$MLDONKEY_GROUP" != "" ]; then
- db_set mldonkey-server/mldonkey_group $MLDONKEY_GROUP
- fi
-
- if [ "$MAX_ALIVE" != "" ]; then
- db_set mldonkey-server/max_alive $MAX_ALIVE
- fi
-
- if [ "$MLDONKEY_NICENESS" != "" ]; then
- db_set mldonkey-server/mldonkey_niceness $MLDONKEY_NICENESS
- fi
-
- if [ "$LAUNCH_AT_STARTUP" != "" ]; then
- if [ "$LAUNCH_AT_STARTUP" = "true" ]; then
- db_set mldonkey-server/launch_at_startup true
- else
- db_set mldonkey-server/launch_at_startup false
+ MLDONKEY_DIR=/var/lib/mldonkey
+ MLDONKEY_GROUP=mldonkey
+ MLDONKEY_USER=mldonkey
+ MLDONKEY_UMASK=0022
+ LAUNCH_AT_STARTUP=
+ MLDONKEY_NICENESS=
+ . $CONFIGFILE || true
+
+ if [ "$MLDONKEY_DIR" != "" ]; then
+ db_set mldonkey-server/mldonkey_dir $MLDONKEY_DIR
fi
- fi
+
+ if [ "$MLDONKEY_GROUP" != "" ]; then
+ db_set mldonkey-server/mldonkey_group $MLDONKEY_GROUP
+ fi
+
+ if [ "$MLDONKEY_NICENESS" != "" ]; then
+ db_set mldonkey-server/mldonkey_niceness $MLDONKEY_NICENESS
+ fi
+
+ if [ "$LAUNCH_AT_STARTUP" != "" ]; then
+ if [ "$LAUNCH_AT_STARTUP" = "true" ]; then
+ db_set mldonkey-server/launch_at_startup true
+ else
+ db_set mldonkey-server/launch_at_startup false
+ fi
+ fi
fi
if [ -x /usr/bin/mldonkey_options ] && [ -e $MLDONKEY_DIR/downloads.ini ]; then
- db_set mldonkey-server/max_hard_upload_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_upload_rate`
- db_set mldonkey-server/max_hard_download_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_download_rate`
-# BUG: We should also fetch the default plugin
+ db_set mldonkey-server/max_hard_upload_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_upload_rate`
+ db_set mldonkey-server/max_hard_download_rate `/usr/bin/mldonkey_options -f $MLDONKEY_DIR/downloads.ini -g max_hard_download_rate`
+ # BUG: We should also fetch the default plugin
fi
#db_version 2.0
@@ -54,31 +49,27 @@
db_reset mldonkey-server/reown_file
db_reset mldonkey-server/mldonkey_move
-# If it is the first time we install : set a default hostname
+# If it is the first time we install: set a default hostname
if [ ! -n "$MLDONKEY_DIR" ] || [ ! -d $MLDONKEY_DIR ] || [ ! -f $MLDONKEY_DIR/downloads.ini ]; then
- client_name=`/bin/hostname`
+ client_name=`/bin/hostname`
fi
-# Do we start at startup
+# Do we start at startup?
db_input high mldonkey-server/launch_at_startup || true
db_go
-#If yes, lets begin the conf
db_get mldonkey-server/launch_at_startup
launch_at_startup="$RET"
-if [ "$launch_at_startup" = "true" ]; then
-
- db_input low mldonkey-server/run_as_user || true
- db_go
+# Let's begin the conf
+db_input low mldonkey-server/run_as_user || true
+db_go
- db_input low mldonkey-server/mldonkey_group || true
- db_go
+db_input low mldonkey-server/mldonkey_group || true
+db_go
- # Existence and owner test
-
- if [ -f $MLDONKEY_DIR/downloads.ini ]; then
-
+# Existence and owner test
+if [ -f $MLDONKEY_DIR/downloads.ini ]; then
owner=`/usr/bin/stat --format="%U %G" $MLDONKEY_DIR/downloads.ini`
db_get mldonkey-server/run_as_user
@@ -88,44 +79,34 @@
new_owner="$new_owner $RET"
if [ "$new_owner" != "$owner" ]; then
-
- db_input critical mldonkey-server/reown_file || true
- db_go
-
+ db_input critical mldonkey-server/reown_file || true
+ db_go
fi
+fi
- fi
+db_input medium mldonkey-server/mldonkey_dir || true
+db_go
- db_input medium mldonkey-server/mldonkey_dir || true
- db_go
+db_get mldonkey-server/mldonkey_dir
+NEW_MLDONKEY_DIR="$RET"
- # Existence test
-
- db_get mldonkey-server/mldonkey_dir
- NEW_MLDONKEY_DIR="$RET"
-
- if [ "$NEW_MLDONKEY_DIR" != "$MLDONKEY_DIR" ] && [ -f $MLDONKEY_DIR/downloads.ini ]; then
-
+if [ "$NEW_MLDONKEY_DIR" != "$MLDONKEY_DIR" ] && [ -f $MLDONKEY_DIR/downloads.ini ]; then
db_input medium mldonkey-server/mldonkey_move || true
db_go
-
- fi
+fi
- db_input low mldonkey-server/mldonkey_niceness || true
- db_go
+db_input low mldonkey-server/mldonkey_niceness || true
+db_go
- db_input medium mldonkey-server/max_hard_download_rate || true
- db_go
+db_input medium mldonkey-server/max_hard_download_rate || true
+db_go
- db_input medium mldonkey-server/max_hard_upload_rate || true
- db_go
-
- db_input low mldonkey-server/max_alive || true
- db_go
+db_input medium mldonkey-server/max_hard_upload_rate || true
+db_go
# password="a"
# repassword="b"
-#
+#
# while [ "$password" != "$repassword" ] ; do
#
# db_input critical mldonkey-server/password || true
@@ -149,7 +130,5 @@
# db_reset mldonkey-server/repassword
# fi
# done
-
-fi
-
+
db_stop
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.init
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.init?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.init (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.init Sun Mar 18 13:32:42 2007
@@ -7,7 +7,7 @@
#
# Version: @(#)skeleton 1.9.1 08-Apr-2002 miquels at cistron.nl
#
-#
+#
# This file has been rewritten by Sylvain Le Gall <gildor at debian.org>
# and Samuel Mimram <smimram at debian.org> for the mldonkey package.
#
@@ -95,22 +95,25 @@
USER=`/usr/bin/stat --format="%U" "$MLDONKEY_DIR/downloads.ini"`
WRAPPER_OPTIONS="$WRAPPER_OPTIONS --user $USER"
-
+
start-stop-daemon --start $WRAPPER_OPTIONS \
--pidfile $PIDFILE --background --exec $EXEC \
-- -pid $PIDDIR > $LOGFILE 2>&1
echo "."
;;
+
stop)
echo -n "Stopping $DESC: $NAME"
start-stop-daemon --stop --oknodo --pidfile $PIDFILE
echo "."
;;
+
force-reload|restart)
$0 stop
$0 start
;;
+
*)
echo "Usage: $0 {start|stop|restart|force-reload|force-start}" >&2
exit 1
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postinst Sun Mar 18 13:32:42 2007
@@ -14,156 +14,115 @@
launch_at_startup="$RET"
case "$1" in
- configure)
+ configure)
CONF=/etc/default/mldonkey-server
if [ "$launch_at_startup" = "true" ]; then
- ###########################
- # Handling debconf values #
- ###########################
-
- mldonkey_umask=0022
- umask $mldonkey_umask
-
- db_get mldonkey-server/run_as_user
- run_as_user=$RET
-
- db_get mldonkey-server/mldonkey_group
- mldonkey_group=$RET
-
- db_get mldonkey-server/mldonkey_dir
- new_mldonkey_dir="$RET"
-
- db_get mldonkey-server/mldonkey_niceness
- mldonkey_niceness="$RET"
-
- client_name=`/bin/hostname`
-
- enable_directconnect=false
- enable_opennap=false
- enable_overnet=false
- enable_soulseek=false
- enable_bittorrent=false
- enable_gnutella=false
- enable_fasttrack=false
- OLD_IFS=$IFS
- IFS=", "
- for i in $RET; do
-
- case $i in
- Directconnect*)
- enable_directconnect=true
- ;;
- Opennap*)
- enable_opennap=true
- ;;
- Overnet*)
- enable_overnet=true
- ;;
- Soulseek*)
- enable_soulseek=true
- ;;
- Bittorrent*)
- enable_bittorrent=true
- ;;
- Gnutella*)
- enable_gnutella=true
- ;;
- Fasttrack*)
- enable_fasttrack=true
- ;;
- esac
- done
- IFS=$OLD_IFS
-
- db_get mldonkey-server/max_hard_upload_rate
- max_hard_upload_rate="$RET"
-
- db_get mldonkey-server/max_hard_download_rate
- max_hard_download_rate="$RET"
-
-# db_get mldonkey-server/password
-# password="$RET"
- password=""
-
- db_get mldonkey-server/max_alive
- max_alive="$RET"
-
-
- ###################
- # User management #
- ###################
-
- # Creating MLDonkey group if he isn't already there
- if ! getent group $mldonkey_group > /dev/null ; then
- $DEBUG && echo -n "Creating mldonkey group: "
- addgroup --system --quiet $mldonkey_group
- $DEBUG && echo "done."
- fi
-
- # Creating MLDonkey user if he isn't already there
- if ! getent passwd $run_as_user > /dev/null ; then
- $DEBUG && echo -n "Creating mldonkey user: "
- adduser --quiet --system --ingroup $mldonkey_group \
- --home "$new_mldonkey_dir" --no-create-home $run_as_user
- $DEBUG && echo "done."
- fi
-
- run_as_useruid=`/usr/bin/id -u $run_as_user`
-
- if [ ! -d $new_mldonkey_dir ]; then
- $DEBUG && echo -n "Creating mldonkey home directory: "
- mkdir "$new_mldonkey_dir"
- $DEBUG && echo "done."
- fi
-
- #########################
- # Relocation management #
- #########################
-
- if [ -e "$CONF" ]; then
- . "$CONF"
- if [ -n "$MLDONKEY_DIR" ] && [ -f "$MLDONKEY_DIR/downloads.ini" ]; then
- db_get mldonkey-server/reown_file
- if [ "$RET" = "true" ] && ! dpkg-statoverride --list "$MLDONKEY_DIR" >/dev/null; then
- $DEBUG && echo -n "Reowning file of $MLDONKEY_DIR: "
- # BUG: should not use chown, should use dpkg-statoverride itself, but the owner is not always
- # the same. If i use the method suggested in the Debian Policy 10.9.1, i need to dynamically
- # create a user, but this user should never be changed. The DP method will inject a new rules
- # in dpkg-statoverride which will made the above test always false for any further
- # upgrade/configure. With my method, only the user can set dpkg-statoverride rules to stop the
- # reowning of a file... However i am not sure this is the best method to do so.
- /bin/chown -R $run_as_user:$mldonkey_group "$MLDONKEY_DIR"
- $DEBUG && echo "done."
- fi
-
- db_get mldonkey-server/mldonkey_move
- if [ "$RET" = "true" ] && [ "$new_mldonkey_dir" != "$MLDONKEY_DIR" ]; then
- $DEBUG && echo -n "Moving file of $MLDONKEY_DIR to $new_mldonkey_dir: "
- /bin/mv "--target-directory=$new_mldonkey_dir" "$MLDONKEY_DIR/*"
- $DEBUG && echo "done."
- fi
- fi
- fi
-
- #################
- # Downloads.ini #
- #################
-
- if [ -e "$new_mldonkey_dir/downloads.ini" ]; then
- $DEBUG && echo -n "Creating backup of $new_mldonkey_dir/downloads.ini: "
- /bin/cp -p -f "$new_mldonkey_dir/downloads.ini" "$new_mldonkey_dir/downloads.ini.dpkg"
- $DEBUG && echo "done."
- else
- $DEBUG && echo -n "Creating empty $new_mldonkey_dir/downloads.ini: "
- /bin/touch "$new_mldonkey_dir/downloads.ini"
- $DEBUG && echo "done."
- fi
-
- $DEBUG && echo -n "Writing new values to $new_mldonkey_dir/downloads.ini: "
- /usr/bin/mldonkey_options -f "$new_mldonkey_dir/downloads.ini" <<EOF
+ ###########################
+ # Handling debconf values #
+ ###########################
+
+ mldonkey_umask=0022
+ umask $mldonkey_umask
+
+ db_get mldonkey-server/run_as_user
+ run_as_user=$RET
+
+ db_get mldonkey-server/mldonkey_group
+ mldonkey_group=$RET
+
+ db_get mldonkey-server/mldonkey_dir
+ new_mldonkey_dir="$RET"
+
+ db_get mldonkey-server/mldonkey_niceness
+ mldonkey_niceness="$RET"
+
+ client_name=`/bin/hostname`
+
+ db_get mldonkey-server/max_hard_upload_rate
+ max_hard_upload_rate="$RET"
+
+ db_get mldonkey-server/max_hard_download_rate
+ max_hard_download_rate="$RET"
+
+ # db_get mldonkey-server/password
+ # password="$RET"
+ password=""
+
+ ###################
+ # User management #
+ ###################
+
+ # Creating MLDonkey group if it isn't already there
+ if ! getent group $mldonkey_group > /dev/null ; then
+ $DEBUG && echo -n "Creating mldonkey group: "
+ addgroup --system --quiet $mldonkey_group
+ $DEBUG && echo "done."
+ fi
+
+ # Creating MLDonkey user if it isn't already there
+ if ! getent passwd $run_as_user > /dev/null ; then
+ $DEBUG && echo -n "Creating mldonkey user: "
+ adduser --quiet --system --ingroup $mldonkey_group \
+ --home "$new_mldonkey_dir" --no-create-home $run_as_user
+ $DEBUG && echo "done."
+ fi
+
+ run_as_useruid=`/usr/bin/id -u $run_as_user`
+
+ if [ ! -d $new_mldonkey_dir ]; then
+ $DEBUG && echo -n "Creating mldonkey home directory: "
+ mkdir "$new_mldonkey_dir"
+ $DEBUG && echo "done."
+ fi
+
+ #########################
+ # Relocation management #
+ #########################
+
+ if [ -e "$CONF" ]; then
+ . "$CONF"
+ if [ -n "$MLDONKEY_DIR" ] && [ -f "$MLDONKEY_DIR/downloads.ini" ]; then
+ db_get mldonkey-server/reown_file
+ if [ "$RET" = "true" ] && ! dpkg-statoverride --list "$MLDONKEY_DIR" >/dev/null; then
+ $DEBUG && echo -n "Reowning file of $MLDONKEY_DIR: "
+ # BUG: should not use chown, should use dpkg-statoverride itself, but the owner is not always
+ # the same. If i use the method suggested in the Debian Policy 10.9.1, i need to dynamically
+ # create a user, but this user should never be changed. The DP method will inject a new rules
+ # in dpkg-statoverride which will made the above test always false for any further
+ # upgrade/configure. With my method, only the user can set dpkg-statoverride rules to stop the
+ # reowning of a file... However i am not sure this is the best method to do so.
+ /bin/chown -R $run_as_user:$mldonkey_group "$MLDONKEY_DIR"
+ $DEBUG && echo "done."
+ fi
+
+ db_get mldonkey-server/mldonkey_move
+ if [ "$RET" = "true" ] && [ "$new_mldonkey_dir" != "$MLDONKEY_DIR" ]; then
+ $DEBUG && echo -n "Moving file of $MLDONKEY_DIR to $new_mldonkey_dir: "
+ /bin/mv "--target-directory=$new_mldonkey_dir" "$MLDONKEY_DIR/*"
+ $DEBUG && echo "done."
+ fi
+ fi
+ fi
+
+ #################
+ # Downloads.ini #
+ #################
+
+ if [ -e "$new_mldonkey_dir/downloads.ini" ]; then
+ $DEBUG && echo -n "Creating backup of $new_mldonkey_dir/downloads.ini: "
+ /bin/cp -p -f "$new_mldonkey_dir/downloads.ini" "$new_mldonkey_dir/downloads.ini.dpkg"
+ $DEBUG && echo "done."
+ else
+ $DEBUG && echo -n "Creating empty $new_mldonkey_dir/downloads.ini: "
+ /bin/touch "$new_mldonkey_dir/downloads.ini"
+ $DEBUG && echo "done."
+ fi
+
+ $DEBUG && echo -n "Writing new values to $new_mldonkey_dir/downloads.ini: "
+ /usr/bin/mldonkey_options -f "$new_mldonkey_dir/downloads.ini" <<EOF
run_as_useruid=$run_as_useruid
run_as_user="$run_as_user"
client_name="$client_name"
@@ -177,29 +136,28 @@
max_hard_upload_rate=$max_hard_upload_rate
max_hard_download_rate=$max_hard_download_rate
EOF
- $DEBUG && echo "done."
-
- #############
- # Files.ini #
- #############
-
- # Handling fasttrack file split here, better than in the mldonkey-server.init
-
- if [ -e "$new_mldonkey_dir/files.ini" ] \
- && [ ! -e "$new_mldonkey_dir/files.ini.fasttrack" ] \
- && /usr/bin/mldonkey_files --test Fasttrack -q -f0 "$new_mldonkey_dir/files.ini"; then
- echo "Correction of the Fasttrack problem (see /usr/share/doc/mldonkey-server/README.Debian)"
- echo -n "Splitting $new_mldonkey_dir/files.ini (backup in $new_mldonkey_dir/files.ini.fasttrack): "
- /usr/bin/mldonkey_files --split Fasttrack -f0 "$new_mldonkey_dir/files.ini" \
- -f1 "$new_mldonkey_dir/files.ini.fasttrack" \
- -f2 "$new_mldonkey_dir/files.ini"
- echo "done."
- fi
-
-
- #############
- # Users.ini #
- #############
+ $DEBUG && echo "done."
+
+ #############
+ # Files.ini #
+ #############
+
+ # Handling fasttrack file split here, better than in the mldonkey-server.init
+
+ if [ -e "$new_mldonkey_dir/files.ini" ] \
+ && [ ! -e "$new_mldonkey_dir/files.ini.fasttrack" ] \
+ && /usr/bin/mldonkey_files --test Fasttrack -q -f0 "$new_mldonkey_dir/files.ini"; then
+ echo "Correction of the Fasttrack problem (see /usr/share/doc/mldonkey-server/README.Debian)"
+ echo -n "Splitting $new_mldonkey_dir/files.ini (backup in $new_mldonkey_dir/files.ini.fasttrack): "
+ /usr/bin/mldonkey_files --split Fasttrack -f0 "$new_mldonkey_dir/files.ini" \
+ -f1 "$new_mldonkey_dir/files.ini.fasttrack" \
+ -f2 "$new_mldonkey_dir/files.ini"
+ echo "done."
+ fi
+
+ #############
+ # Users.ini #
+ #############
# if [ -n "$password" ]; then
# $DEBUG && echo -n "Registering admin password in $new_mldonkey_dir/users.ini: "
@@ -207,53 +165,53 @@
# $DEBUG && echo "done."
# fi
- ####################
- # Files permission #
- ####################
-
- for file in \
- "$new_mldonkey_dir" \
- "/var/run/mldonkey" \
- "/var/log/mldonkey" \
- "$new_mldonkey_dir/downloads.ini" \
- "$new_mldonkey_dir/downloads.ini.dpkg" \
- "$new_mldonkey_dir/downloads.ini.old" \
- "$new_mldonkey_dir/downloads.ini.tmp" \
- "$new_mldonkey_dir/files.ini" \
- "$new_mldonkey_dir/files.ini.fasttrack"; do
- $DEBUG && echo -n "Changing owner and file permission of $file: "
- if ! dpkg-statoverride --list "$file" >/dev/null; then
- # BUG: cf dpkg-statoverride above
- if [ -e "$file" ]; then
- /bin/chown $run_as_user:$mldonkey_group $file
- $DEBUG && echo "done."
- else
- $DEBUG && echo "$file doesn't exist."
- fi
- else
- $DEBUG && echo "$file is listed in dpkg-statoverride."
- fi
- done
-
- for file in \
- "$new_mldonkey_dir/users.ini" \
- "$new_mldonkey_dir/users.ini.dpkg" \
- "$new_mldonkey_dir/users.ini.old" \
- "$new_mldonkey_dir/users.ini.tmp"; do
- $DEBUG && echo -n "Changing owner and file permission of $file: "
- if ! dpkg-statoverride --list "$file" >/dev/null; then
- # BUG: cf dpkg-statoverride above
- if [ -e "$file" ]; then
- /bin/chown $run_as_user:$mldonkey_group "$file"
- /bin/chmod 0600 "$file"
- $DEBUG && echo "done."
- else
- $DEBUG && echo "$file doesn't exist."
- fi
- else
- $DEBUG && echo "$file is listed in dpkg-statoverride."
- fi
- done
+ ####################
+ # Files permission #
+ ####################
+
+ for file in \
+ "$new_mldonkey_dir" \
+ "/var/run/mldonkey" \
+ "/var/log/mldonkey" \
+ "$new_mldonkey_dir/downloads.ini" \
+ "$new_mldonkey_dir/downloads.ini.dpkg" \
+ "$new_mldonkey_dir/downloads.ini.old" \
+ "$new_mldonkey_dir/downloads.ini.tmp" \
+ "$new_mldonkey_dir/files.ini" \
+ "$new_mldonkey_dir/files.ini.fasttrack"; do
+ $DEBUG && echo -n "Changing owner and file permission of $file: "
+ if ! dpkg-statoverride --list "$file" >/dev/null; then
+ # BUG: cf dpkg-statoverride above
+ if [ -e "$file" ]; then
+ /bin/chown $run_as_user:$mldonkey_group $file
+ $DEBUG && echo "done."
+ else
+ $DEBUG && echo "$file doesn't exist."
+ fi
+ else
+ $DEBUG && echo "$file is listed in dpkg-statoverride."
+ fi
+ done
+
+ for file in \
+ "$new_mldonkey_dir/users.ini" \
+ "$new_mldonkey_dir/users.ini.dpkg" \
+ "$new_mldonkey_dir/users.ini.old" \
+ "$new_mldonkey_dir/users.ini.tmp"; do
+ $DEBUG && echo -n "Changing owner and file permission of $file: "
+ if ! dpkg-statoverride --list "$file" >/dev/null; then
+ # BUG: cf dpkg-statoverride above
+ if [ -e "$file" ]; then
+ /bin/chown $run_as_user:$mldonkey_group "$file"
+ /bin/chmod 0600 "$file"
+ $DEBUG && echo "done."
+ else
+ $DEBUG && echo "$file doesn't exist."
+ fi
+ else
+ $DEBUG && echo "$file is listed in dpkg-statoverride."
+ fi
+ done
fi
################################
@@ -264,32 +222,31 @@
$DEBUG && echo -n "Writing new values to $CONF_NEW: "
cat > "$CONF_NEW" <<EOF
-# MLDonkey configuration
-# This file is loaded by /etc/init.d/mldonkey-server
-# This file is managed using ucf(1)
+# MLDonkey configuration file
+# This file is loaded by /etc/init.d/mldonkey-server.
+# This file is managed using ucf(1).
MLDONKEY_DIR=$new_mldonkey_dir
MLDONKEY_USER=$run_as_user
MLDONKEY_GROUP=$mldonkey_group
MLDONKEY_UMASK=$mldonkey_umask
-MAX_ALIVE=$max_alive
LAUNCH_AT_STARTUP=$launch_at_startup
MLDONKEY_NICENESS=$mldonkey_niceness
EOF
- ucf "$CONF_NEW" "$CONF"
-
- $DEBUG && echo "done."
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+ ucf "$CONF_NEW" "$CONF"
+
+ $DEBUG && echo "done."
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+ esac
db_stop
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.postrm Sun Mar 18 13:32:42 2007
@@ -5,20 +5,21 @@
# the final step in the removal of this package, after the package's
# conffiles have been removed.
-#set -x
+#set -x
DEBUG=false
CONF=/etc/default/mldonkey-server
case "$1" in
- remove|disappear|upgrade|failed-upgrade|abort-install|abort-upgrade)
+ remove|disappear|upgrade|failed-upgrade|abort-install|abort-upgrade)
;;
- purge)
+
+ purge)
for EXT in '~' '%' .bak .dpkg-tmp .dpkg-new .dpkg-old .dpkg-dist; do
rm -f "$CONF$EXT"
done
-
+
rm -f "$CONF"
if which ucf > /dev/null; then
@@ -31,7 +32,8 @@
echo "Not removing MLDonkey directory (/var/lib/mldonkey, /var/run/mldonkey), user and group." >&2
echo "Remove it manually if needed." >&2
;;
- *)
+
+ *)
echo "$0: didn't understand being called with \`$1'" 1>&2
exit 1
;;
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.preinst Sun Mar 18 13:32:42 2007
@@ -1,14 +1,14 @@
-#!/bin/sh -e
+#!/bin/sh -e
CONFFILE=/etc/default/mldonkey-server
case "$1" in
- install|upgrade)
+ install|upgrade)
if dpkg --compare-versions "$2" lt "2.5.1-5" && [ -e /etc/mldonkey.conf ]; then
- echo "Moving /etc/mldonkey.conf to /etc/default/mldonkey-server"
- mv -f /etc/mldonkey.conf $CONFFILE
+ echo "Moving /etc/mldonkey.conf to /etc/default/mldonkey-server"
+ mv -f /etc/mldonkey.conf $CONFFILE
fi
- ;;
+ ;;
esac
#DEBHELPER#
Modified: trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates (original)
+++ trunk/packages/mldonkey/trunk/debian/mldonkey-server.templates Sun Mar 18 13:32:42 2007
@@ -122,20 +122,6 @@
.
0 means no limit.
-Template: mldonkey-server/max_alive
-Type: string
-Default: 48
-_Description: Maximal time to live for the server:
- MLDonkey needs to be restarted from time to time. This is safer for memory
- consumption and all. You need to set the time between automatic restarts (in
- hours).
- .
- The only problem with this is that you will loose some upload credits. You can
- set this variable to a very high value in order to be sure to have enough time
- to gather a lot of credits.
- .
- For example: 24 for one day, 168 for one week.
-
Template: mldonkey-server/password
Type: password
_Description: Password of admin user:
Modified: trunk/packages/mldonkey/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/mldonkey/trunk/debian/rules?rev=3619&op=diff
==============================================================================
--- trunk/packages/mldonkey/trunk/debian/rules (original)
+++ trunk/packages/mldonkey/trunk/debian/rules Sun Mar 18 13:32:42 2007
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
# These are used for cross-compiling and for saving the configure script
@@ -63,29 +63,29 @@
build-arch-stamp: configure-stamp
dh_testdir
- if ([ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]) && $(MAKE) utils opt; then\
- touch build-arch-opt;\
- else\
- $(MAKE) utils.byte byte;\
- cp mlnet.byte mlnet;\
- cp mlgui.byte mlgui;\
- cp mlguistarter.byte mlguistarter;\
- touch build-arch-byte;\
+ if ([ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]) && $(MAKE) utils opt; then \
+ touch build-arch-opt; \
+ else \
+ $(MAKE) utils.byte byte; \
+ cp mlnet.byte mlnet; \
+ cp mlgui.byte mlgui; \
+ cp mlguistarter.byte mlguistarter; \
+ touch build-arch-byte; \
fi
# Check that the compilation has succeeded
test -x mlnet
test -x mlgui
# Build utilities
- if [ -e build-arch-opt ]; then\
- cd debian/utils && $(MAKE) opt;\
- else\
- cd debian/utils && $(MAKE) byte;\
+ if [ -e build-arch-opt ]; then \
+ cd debian/utils && $(MAKE) opt; \
+ else \
+ cd debian/utils && $(MAKE) byte; \
fi
touch build-arch-stamp
build-indep: build-indep-stamp
-build-indep-stamp:
+build-indep-stamp:
dh_testdir
cd debian/xml-man && $(MAKE) all
touch build-indep-stamp
@@ -142,7 +142,7 @@
dh_installmenu -i
dh_desktop -i
dh_installinit -i
- dh_installman -i
+ dh_installman -i
dh_installchangelogs distrib/ChangeLog -i
dh_link -i
dh_compress -i
@@ -172,13 +172,13 @@
dh_fixperms -a
dh_installdeb -a
dh_shlibdeps -a
- if [ -e build-arch-opt ]; then\
- echo "interpreter:Depends=" >> debian/mldonkey-server.substvars;\
- echo "interpreter:Depends=" >> debian/mldonkey-gui.substvars;\
- dh_strip -a;\
- else\
- echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" >> debian/mldonkey-server.substvars;\
- echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" >> debian/mldonkey-gui.substvars;\
+ if [ -e build-arch-opt ]; then \
+ echo "interpreter:Depends=" >> debian/mldonkey-server.substvars; \
+ echo "interpreter:Depends=" >> debian/mldonkey-gui.substvars; \
+ dh_strip -a; \
+ else \
+ echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" >> debian/mldonkey-server.substvars; \
+ echo "interpreter:Depends=ocaml-base-nox-$(OCAMLABI)" >> debian/mldonkey-gui.substvars; \
fi
dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
dh_md5sums -a
@@ -186,4 +186,4 @@
# For now we have no binary-indep
binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-ocaml-maint-commits
mailing list