![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Sat, 23 Jan 2010 12:29:41 +0000 (13:29 +0100) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Sat, 23 Jan 2010 12:29:41 +0000 (13:29 +0100) |
30 files changed:
diff --git a/debian/README.Debian b/debian/README.Debian
index cf2ac1bbdf9cd7011eb94068bf5f278b56e5ffab..1f955afab75ff89e03b95134cdb6fc965d749c56 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
local_part_suffix_optional
to the "userforward:" and the "localuser:" router in /etc/exim/exim.conf.
- If you are using another MTA, please refer its manual or
+ If you are using another MTA, please refer to its manual or
http://faqs.org/faqs/mail/addressing/
which has some very useful information.
+ Also, see the MTA specific README files in /use/share/doc/mlmmj/ for more
+ details.
+
This version of mlmmj supports setting the recipient delimiter on a
per list basis. This is done by means of the TUNABLE "delimiter", described
in detail in the TUNABLES document.
-2) Run /usr/bin/mlmmj-make-ml which will guide you through creating
- actual mailing lists.
+2) Run /usr/bin/mlmmj-make-ml which will guide you through creating the
+ actual mailing list.
Details about the exact operations of mlmmj-make-ml are available in
- /usr/share/doc/mlmmj/README
+ /usr/share/doc/mlmmj/README.
3) If you didn't let mlmmj-make-ml modify /etc/aliases, you need to
make the changes to your mailserver aliases that came as output from
/var/spool/mlmmj/<listname>. Symlinks are created to keep functionality
intact, so you should have no problems editing the files via their links
under /var
-* Addtionally, /use/share/doc/mlmmj/README.Debian has information on access
- control, moderation, archiving and lots of other features supported by
- mlmmj. You would do well to read it.
+* Additionally, the files README and README.access in /use/share/doc/mlmmj/
+ include information about access control, moderation, archiving and lots of
+ other features supported by mlmmj. You would do well to read them.
BUGS:
diff --git a/debian/attic/mlmmj-bounce.1 b/debian/attic/mlmmj-bounce.1
+++ /dev/null
@@ -1,35 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-BOUNCE "1" "September 2004" "mlmmj-bounce version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-bounce \- manual page for mlmmj-bounce version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-bounce
-\fI-L /path/to/list -a john=doe.org \fR[\fI-n num | -p\fR]
-.SH DESCRIPTION
-.HP
-\fB\-a\fR: Address string that bounces
-.HP
-\fB\-h\fR: This help
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-n\fR: Message number in the archive
-.HP
-\fB\-p\fR: Send out a probe
-.HP
-\fB\-V\fR: Print version
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-bounce
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-bounce
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-bounce
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-maintd.1 b/debian/attic/mlmmj-maintd.1
+++ /dev/null
@@ -1,30 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-MAINTD "1" "September 2004" "mlmmj-maintd version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-maintd \- manual page for mlmmj-maintd version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-maintd
-\fI-L /path/to/listdir \fR[\fI-F\fR]
-.SH DESCRIPTION
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-F\fR: Don't fork, performing one maintenance run only.
-.IP
-This option should be used when one wants to
-avoid running another daemon, and use e.g. cron to control it instead.
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-maintd
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-maintd
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-maintd
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-make-ml.1 b/debian/attic/mlmmj-make-ml.1
+++ /dev/null
@@ -1,22 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-MAKE-ML "1" "September 2004" "mlmmj-make-ml version 0.1" "User Commands"
-.SH NAME
-mlmmj-make-ml \- manual page for mlmmj-make-ml version 0.1
-.SH SYNOPSIS
-.B mlmmj-make-ml
-\fI[OPTIONS]
-.SH DESCRIPTION
-.HP
-\fB\-h\fR: Display help
-.HP
-\fB\-L\fR: The name of the mailing list
-.HP
-\fB\-s\fR: The spool directory, if different from /var/spool/mlmmj
-.HP
-\fB\-a\fR: Create the needed entries in /etc/aliases
-.HP
-\fB\-z\fR: Do nothing for now.
-.IP
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-process.1 b/debian/attic/mlmmj-process.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-PROCESS "1" "September 2004" "mlmmj-process version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-process \- manual page for mlmmj-process version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-process
-\fI-L /path/to/list -m /path/to/mail \fR[\fI-h\fR] [\fI-P\fR] [\fI-V\fR]
-.SH DESCRIPTION
-.HP
-\fB\-h\fR: This help
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-m\fR: Full path to mail file
-.HP
-\fB\-P\fR: Don't execute mlmmj-send
-.HP
-\fB\-V\fR: Print version
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-process
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-process
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-process
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-recieve.1 b/debian/attic/mlmmj-recieve.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-RECIEVE "1" "September 2004" "mlmmj-recieve version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-recieve \- manual page for mlmmj-recieve version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-recieve
-\fI-L /path/to/listdir \fR[\fI-h\fR] [\fI-V\fR] [\fI-P\fR] [\fI-F\fR]
-.SH DESCRIPTION
-.HP
-\fB\-h\fR: This help
-.HP
-\fB\-F\fR: Don't fork in the background
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-P\fR: Don't execute mlmmj-process
-.HP
-\fB\-V\fR: Print version
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-recieve
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-recieve
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-recieve
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-send.1 b/debian/attic/mlmmj-send.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-SEND "1" "September 2004" "mlmmj-send version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-send \- manual page for mlmmj-send version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-send
-[\fI-L /path/to/list || -l listctrl\fR]
-.SH DESCRIPTION
-.HP
-\fB\-m\fR /path/to/mail [-a] [-D] [-F] [-h] [-r] [-R] [-s] [-T] [-V]
-.HP
-\fB\-a\fR: Don't archive the mail
-.HP
-\fB\-D\fR: Don't delete the mail after it's sent
-.HP
-\fB\-F\fR: What to use as MAIL FROM:
-.HP
-\fB\-h\fR: This help
-.HP
-\fB\-l\fR: List control variable:
-.IP
-\&'1' means 'send a single mail'
-\&'2' means 'mail to moderators'
-\&'3' means 'resend failed list mail'
-\&'4' means 'send to file with recipients'
-\&'5' means 'bounceprobe'
-\&'6' means 'single listmail to single recipient'
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-m\fR: Full path to mail file
-.HP
-\fB\-r\fR: Relayhost IP address (defaults to 127.0.0.1)
-.HP
-\fB\-R\fR: What to use as Reply-To: header
-.HP
-\fB\-s\fR: Subscribers file name
-.HP
-\fB\-T\fR: What to use as RCPT TO:
-.HP
-\fB\-V\fR: Print version
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-send
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-send
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-send
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-sub.1 b/debian/attic/mlmmj-sub.1
--- a/debian/attic/mlmmj-sub.1
+++ /dev/null
@@ -1,41 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-SUB "1" "September 2004" "mlmmj-sub version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-sub \- manual page for mlmmj-sub version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-sub
-\fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR] [\fI-C\fR] [\fI-h\fR]
-.SH DESCRIPTION
-.IP
-[-L] [-U] [-V]
-.HP
-\fB\-a\fR: Email address to subscribe
-.HP
-\fB\-c\fR: Send welcome mail
-.HP
-\fB\-C\fR: Request mail confirmation
-.HP
-\fB\-h\fR: This help
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-U\fR: Don't switch to the user id of the listdir owner
-.HP
-\fB\-V\fR: Print version
-.PP
-When no options are specified, subscription silently happens
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-sub
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-sub
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-sub
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/attic/mlmmj-unsub.1 b/debian/attic/mlmmj-unsub.1
+++ /dev/null
@@ -1,37 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33.
-.TH MLMMJ-UNSUB "1" "September 2004" "mlmmj-unsub version 1.0.0-RC2" "User Commands"
-.SH NAME
-mlmmj-unsub \- manual page for mlmmj-unsub version 1.0.0-RC2
-.SH SYNOPSIS
-.B mlmmj-unsub
-\fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR] [\fI-C\fR] [\fI-h\fR] [\fI-L\fR] [\fI-V\fR]
-.SH DESCRIPTION
-.HP
-\fB\-a\fR: Email address to unsubscribe
-.HP
-\fB\-c\fR: Send goodbye mail
-.HP
-\fB\-C\fR: Request mail confirmation
-.HP
-\fB\-h\fR: This help
-.HP
-\fB\-L\fR: Full path to list directory
-.HP
-\fB\-V\fR: Print version
-.PP
-When no options are specified, unsubscription silently happens
-.SH "SEE ALSO"
-The full documentation for
-.B mlmmj-unsub
-is maintained as a Texinfo manual. If the
-.B info
-and
-.B mlmmj-unsub
-programs are properly installed at your site, the command
-.IP
-.B info mlmmj-unsub
-.PP
-should give you access to the complete manual.
-.SH AUTHOR
-This man page was written by Søren Boll Overgaard <boll@debian.org> on 3. sep
-2004, based on output from help2man
diff --git a/debian/bogus-conffiles b/debian/bogus-conffiles
--- a/debian/bogus-conffiles
+++ /dev/null
@@ -1,12 +0,0 @@
-/etc/mlmmj/listtexts/access
-/etc/mlmmj/listtexts/bounce-probe
-/etc/mlmmj/listtexts/listhelp
-/etc/mlmmj/listtexts/moderation
-/etc/mlmmj/listtexts/notifysub
-/etc/mlmmj/listtexts/notifyunsub
-/etc/mlmmj/listtexts/notintocc
-/etc/mlmmj/listtexts/sub-confirm
-/etc/mlmmj/listtexts/sub-ok
-/etc/mlmmj/listtexts/subonlypost
-/etc/mlmmj/listtexts/unsub-confirm
-/etc/mlmmj/listtexts/unsub-ok
diff --git a/debian/changelog b/debian/changelog
index 37960ba0650306f950c8eb3871e5a168fb2793cc..b308eac44bce02988acd6e77f577d09eaa361fc3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
-mlmmj (1.2.15-1.2) unstable; urgency=low
+mlmmj (1.2.16-0.1) unstable; urgency=low
+ [ Sebastian Harl ]
* Non-maintainer upload.
- * Moved files from /var/www/mlmmj-php-web to /usr/share/mlmmj-php-web
- and same for mlmmj-php-web-admin (Closes: #553550).
- * Added dependency to mlmmj for the mlmmj-php-web package.
- * Added ${misc:Depends} dependency for both mlmmj-php-web and
- mlmmj-php-web-admin packages.
- * Bumped Standard-Version: to 3.8.3.
- * Added descriptions in all dpatch patches.
+ * New upstream release.
+ * Fixed .diff.gz - do not include the reverse diff to some previous version
+ (Closes: #516948).
+ * debian/po/:
+ - Added sv.po, thanks to Martin Bagge (Closes: #503607).
+ - Added ja.po, thanks to Hideki Yamane (Closes: #512988).
+ * debian/control:
+ - Moved "Homepage" field from package description to the source stanza.
+ * debian/attic/:
+ - Removed. It's the job of a VCS to keep track of old versions.
+ * debian/mlmmj.templates.old:
+ - Removed. It's the job of a VCS to keep track of old versions.
+ * debian/dirs:
+ - Removed. This file is not needed.
+ * debian/rules:
+ - Cleanup: There is no need to have build-arch and build-indep -
+ especially if the latter is empty. Removed configure from .PHONY to
+ prevent configure being called twice. Removed unnecessary occurrences of
+ $(CURDIR).
+ - Actually pass CFLAGS to configure.
+ - Rename mlmmj-make-ml.sh.1 to mlmmj-make-ml.1, since we rename the binary
+ as well.
+ - Do not manually install listtexts - the upstream build system takes care
+ of that itself.
+ - Do not include the AUTHORS and VERSION files in the binary packages -
+ they do not contribute any further information.
+ - Include all upstream README files in the binary packages - the MTA
+ specific files have been left out so far.
+ - Install the web-interfaces to /usr/share/PACKAGE/www - /var/www is for
+ the user of the local admin only (Closes: #553548, #553550).
+ * debian/patches/:
+ - Added short descriptions to all patches.
+ - Cleaned up patches: Don't use a custom /bin/sh script to execute the
+ patches but use dpatch instead. Use prefix "a" and "b" for path names.
+ - Removed 01_debian_make_mlmmj-ml - instead added mlmmj-make-ml to debian/
+ directly.
+ - Removed unused 05_fix_call_to_free.
+ - Added 01_fix_manpages to fix the what-is entry of the mlmmj-sub and
+ mlmmj-unsub manpages.
+ - Added 01_fix_hyphen_used_as_minus_sign to fix the use of '-' in
+ manpages.
+ * debian/bogus-conffiles:
+ - Removed. This file is not used.
+ * debian/docs:
+ - Removed. This file is not needed.
+ * debian/mlmmj-php-web-admin.apache.conf, debian/mlmmj-php-web.apache.conf:
+ - Added example configurations for the Apache webserver.
+
+ [ Thomas Goirand ]
+ * debian/control:
+ - Added dependency to mlmmj for the mlmmj-php-web package.
+ - Added ${misc:Depends} dependency for both mlmmj-php-web and
+ mlmmj-php-web-admin packages.
+ - Bumped Standard-Version to 3.8.3.
+ - Wrote a more comprehensive long description.
+ - Updated homepage field.
* Added a README.source
- * Wrote a more comprehensive long description.
- * Removed useless /usr/sbin dir in the mlmmj package.
- * Removed homepage from long description, added a homepage field, and used
- the correct new URL (mlmmj.org).
+ * debian/rules:
+ - Removed useless /usr/sbin dir in the mlmmj package.
- -- Thomas Goirand <thomas@goirand.fr> Sat, 02 Jan 2010 07:44:06 +0800
+ -- Sebastian Harl <sh@tokkee.org> Thu, 05 Mar 2009 13:25:24 +0100
mlmmj (1.2.15-1.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 89af9b1d4a51e54bb0cedb121280cfa44ebc78d5..5306a187e39d18417ccf30391b936a0cfa5bcd6a 100644 (file)
--- a/debian/control
+++ b/debian/control
* Functionality to retrieve old posts
* Various web interfaces
* VERP support
- .
Package: mlmmj-php-web
Architecture: all
diff --git a/debian/dirs b/debian/dirs
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
--- a/debian/docs
+++ /dev/null
@@ -1,5 +0,0 @@
-FAQ
-README
-README.access
-TODO
-debian/README.source
\ No newline at end of file
diff --git a/debian/mlmmj-make-ml b/debian/mlmmj-make-ml
--- /dev/null
+++ b/debian/mlmmj-make-ml
@@ -0,0 +1,201 @@
+#!/bin/sh
+#
+# mlmmj-make-ml.sh - henne@hennevogel.de
+#
+# modified for Debian GNU/Linux by boll@debian.org
+
+VERSION="0.1-debian (Modified for Debian GNU/Linux)"
+DEFAULTDIR="/var/spool/mlmmj"
+ETCDEFAULTDIR="/etc/mlmmj/lists"
+TEXTPATH="/usr/share/mlmmj/text.skel"
+SENDMAILPKG=`grep-dctrl -FProvides mail-transport-agent -a -FStatus installed -sPackage -n /var/lib/dpkg/status`
+NEWALIASES=`which newaliases`
+
+USAGE="
+mlmmj-make-ml $VERSION
+$0 [OPTIONS]
+-h display this help text
+-L the name of the mailinglist
+-s your spool directory if not $DEFAULTDIR
+-z nuffn for now
+"
+
+echo
+echo "+------------------------------------------------------------+"
+echo "| Information: |"
+echo "| Please report bugs against mlmmj-make-ml to the Debian BTS |"
+echo "| at http://bugs.debian.org/ |"
+echo "+------------------------------------------------------------+"
+echo
+
+
+while getopts ":hL:s:az:" Option
+do
+case "$Option" in
+ h )
+ echo "$USAGE"
+ exit 0
+ ;;
+ z )
+ echo -n "nothing"
+ exit 0
+ ;;
+ L )
+ LISTNAME="$OPTARG"
+ ;;
+ s )
+ SPOOLDIR="$OPTARG"
+ ;;
+ * )
+ printf "$0: invalid option\nTry $0 -h for more information.\n"
+ exit 1
+ ;;
+esac
+done
+SHIFTVAL=$(( $OPTIND - 1 ))
+shift $SHIFTVAL
+
+if [ -z "$SPOOLDIR" ]; then
+ SPOOLDIR="$DEFAULTDIR"
+fi
+
+echo "Creating Directorys below $SPOOLDIR. Use '-s spooldir' to change"
+
+if [ -z "$LISTNAME" ]; then
+ echo -n "What should the name of the Mailinglist be? [mlmmj-test] : "
+ read LISTNAME
+ if [ -z "$LISTNAME" ]; then
+ LISTNAME="mlmmj-test"
+ fi
+fi
+
+LISTDIR="$SPOOLDIR/$LISTNAME"
+ETCLISTDIR="$ETCDEFAULTDIR/$LISTNAME"
+
+mkdir -p $LISTDIR
+mkdir -p $ETCLISTDIR
+
+for DIR in incoming queue queue/discarded archive subconf unsubconf \
+ bounce moderation subscribers.d digesters.d requeue \
+ nomailsubs.d
+do
+ mkdir "$LISTDIR"/"$DIR"
+done
+
+for DIR in text control
+do
+ mkdir "$ETCLISTDIR"/"$DIR"
+ ln -s "$ETCLISTDIR"/"$DIR" "$LISTDIR"/"$DIR"
+done
+
+test -f "$LISTDIR"/index || touch "$LISTDIR"/index
+
+echo -n "The Domain for the List? [] : "
+read FQDN
+if [ -z "$FQDN" ]; then
+ FQDN="localhost.localdomain"
+fi
+
+echo -n "The emailaddress of the list owner? [postmaster] : "
+read OWNER
+if [ -z "$OWNER" ]; then
+ OWNER="postmaster"
+fi
+echo "$OWNER" > "$ETCLISTDIR"/"control/owner"
+
+if [ -z "$TEXTPATH" -o ! -d "$TEXTPATH" ]; then
+ echo "**NOTE** Could not copy the texts for the list"
+ echo "Please manually copy the files from $TEXTPATH"
+else
+ cp "$TEXTPATH"/* "$ETCLISTDIR"/"text"
+fi
+
+LISTADDRESS="$LISTNAME@$FQDN"
+echo "$LISTADDRESS" > "$ETCLISTDIR"/control/"listaddress"
+
+MLMMJRECIEVE=`which mlmmj-recieve 2>/dev/null`
+if [ -z "$MLMMJRECIEVE" ]; then
+ MLMMJRECIEVE="/usr/bin/mlmmj-recieve"
+fi
+
+MLMMJMAINTD=`which mlmmj-maintd 2>/dev/null`
+if [ -z "$MLMMJMAINTD" ]; then
+ MLMMJMAINTD="/usr/bin/mlmmj-maintd"
+fi
+
+ALIAS="$LISTNAME: \"|$MLMMJRECIEVE -L $SPOOLDIR/$LISTNAME/\""
+
+echo "I am adding the following to your /etc/aliases file:"
+echo "$ALIAS"
+echo -n "is this ok (if not, you need to do so yourself)? [y/N] : "
+read OKIDOKI
+case $OKIDOKI in
+ y|Y)
+ echo "$ALIAS" >> /etc/aliases
+ ;;
+ n|N)
+ exit 0
+ ;;
+ *)
+ echo "Options were: y, Y, n or N"
+esac
+
+echo "Detecting the installed MTA and changing ownership as needed..."
+
+if [ "$SENDMAILPKG" = "postfix" ]; then
+ USER="nobody"
+ GROUP="nogroup"
+ echo "Postfix appears to be handling your mail, using ownership $USER:$GROUP..."
+elif [ "$SENDMAILPKG" = "exim4-daemon-light" ]; then
+ USER="Debian-exim"
+ GROUP="Debian-exim"
+ echo "Exim appears to be handling your mail, using ownership $USER:$GROUP..."
+else
+ USER="nobody"
+ GROUP="nogroup"
+ echo "Unable to detect MTA, using default ownership: $USER:$GROUP..."
+fi
+
+chown -R $USER:$GROUP $LISTDIR $LISTDIR/*
+chmod -R 755 $LISTDIR
+chmod -R 755 $ETCLISTDIR
+
+# Check if all lists are owned by the right user, if not, ask if we should fix
+# it.
+
+ANOMALIES=0
+
+for ENTRY in `ls $SPOOLDIR`
+do
+ SOWNER=`stat -c %U $SPOOLDIR/$ENTRY`
+ SGROUP=`stat -c %G $SPOOLDIR/$ENTRY`
+
+ if [ $SOWNER != $USER -o $SGROUP != $GROUP ]
+ then
+ ANOMALIES=1
+ fi
+done
+
+if [ $ANOMALIES -eq 1 ]
+ then
+ echo -n "It appears that not all lists have proper ownership, do you want me to fix this? [y/N] : "
+ read FIXOWNERSHIP
+ case $FIXOWNERSHIP in
+ y|Y)
+ chown -R $USER:$GROUP $SPOOLDIR/*
+
+ ;;
+ n|N)
+ echo "Not fixing ownership"
+ ;;
+ *)
+ echo "Options were: y, Y, n or N"
+ esac
+
+
+fi
+
+echo "Running $NEWALIASES"
+$NEWALIASES
+
+echo "Done."
index 70e9085ec4b09b6729e6073855e1d59c5c9467a0..1f84d79c2b3ff6fee3e2fea86af1b4366d572338 100644 (file)
the web based interface. For each list you wish to administer, do
chown -R www-data /var/spool/mlmmj/<list>/control/
-By default, you can log into the administration interface by hitting
+By default, you can log into the administration interface by visiting
http://<host>/mlmmj-php-web-admin/ and logging in with mlmmj/mlmmj.
-- Søren Boll Overgaard <boll@debian.org>, Tue, 31 Aug 2004 17:47:15 +0000
diff --git a/debian/mlmmj-php-web-admin.apache.conf b/debian/mlmmj-php-web-admin.apache.conf
--- /dev/null
@@ -0,0 +1,17 @@
+Alias /mlmmj-admin /usr/share/mlmmj-php-web-admin/www
+
+<Directory /usr/share/mlmmj-php-web-admin/www>
+ AllowOverride AuthConfig
+ Order allow,deny
+ Allow from all
+ php_value include_path "/usr/share/mlmmj-php-web-admin"
+</Directory>
+
+# some people prefer a simple URL, like http://mlmmj-admin.example.com
+#<VirtualHost 1.2.3.4>
+# ServerName mlmmj-admin.example.com
+# DocumentRoot /usr/share/mlmmj-php-web-admin/www
+#
+# # add the above <Directory> directive
+#</VirtualHost>
+
diff --git a/debian/mlmmj-php-web.apache.conf b/debian/mlmmj-php-web.apache.conf
--- /dev/null
@@ -0,0 +1,16 @@
+Alias /mlmmj /usr/share/mlmmj-php-web/www
+
+<Directory /usr/share/mlmmj-php-web/www>
+ AllowOverride AuthConfig
+ Order allow,deny
+ Allow from all
+</Directory>
+
+# some people prefer a simple URL, like http://mlmmj.example.com
+#<VirtualHost 1.2.3.4>
+# ServerName mlmmj.example.com
+# DocumentRoot /usr/share/mlmmj-php-web/www
+#
+# # add the above <Directory> directive
+#</VirtualHost>
+
diff --git a/debian/mlmmj.templates.old b/debian/mlmmj.templates.old
+++ /dev/null
@@ -1,14 +0,0 @@
-Template: mlmmj/remove-on-purge
-Type: boolean
-Default: false
-Description: Remove mlmmj lists on purge
- Do you want to remove all mlmmj lists when purging this package?.
- .
- Please note that this includes removing all subscriber lists, archives and
- configuration options for all lists currently stored.
- .
- Answering yes here basically means that everything under /var/spool/mlmmj
- and /etc/mlmmj/lists will be removed when this package is purged.
- Also please note that any changes you might have made to /etc/aliases will
- not be unmade automatically when this package is removed.
- (A notice will be displayed however, to remind you to clean up your aliases)
diff --git a/debian/patches/00list b/debian/patches/00list
index 37a5da4f6b6468f3d44c8d7df1a5af9d8d4fc995..67f00d4b3b84092c815240a0e67702890d7869c0 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
-01_debian_make_mlmmj-ml
+01_fix_manpages
+01_fix_hyphen_used_as_minus_sign
05_fix_displayed_full_paths
02_fix_mlmmj_php
diff --git a/debian/patches/01_debian_make_mlmmj-ml.dpatch b/debian/patches/01_debian_make_mlmmj-ml.dpatch
+++ /dev/null
@@ -1,212 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_debian_make_mlmmj-ml.dpatch by <boll@andariel>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch adds a new mlmmj-make-ml
-
-@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./debian/mlmmj-make-ml.sh /tmp/dpep-work.l7evJe/mlmmj-1.2.8/debian/mlmmj-make-ml.sh
---- ./debian/mlmmj-make-ml.sh 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep-work.l7evJe/mlmmj-1.2.8/debian/mlmmj-make-ml.sh 2005-09-10 21:33:20.000000000 +0200
-@@ -0,0 +1,201 @@
-+#!/bin/sh
-+#
-+# mlmmj-make-ml.sh - henne@hennevogel.de
-+#
-+# modified for Debian GNU/Linux by boll@debian.org
-+
-+VERSION="0.1-debian (Modified for Debian GNU/Linux)"
-+DEFAULTDIR="/var/spool/mlmmj"
-+ETCDEFAULTDIR="/etc/mlmmj/lists"
-+TEXTPATH="/usr/share/mlmmj/text.skel"
-+SENDMAILPKG=`grep-dctrl -FProvides mail-transport-agent -a -FStatus installed -sPackage -n /var/lib/dpkg/status`
-+NEWALIASES=`which newaliases`
-+
-+USAGE="
-+mlmmj-make-ml $VERSION
-+$0 [OPTIONS]
-+-h display this help text
-+-L the name of the mailinglist
-+-s your spool directory if not $DEFAULTDIR
-+-z nuffn for now
-+"
-+
-+echo
-+echo "+------------------------------------------------------------+"
-+echo "| Information: |"
-+echo "| Please report bugs against mlmmj-make-ml to the Debian BTS |"
-+echo "| at http://bugs.debian.org/ |"
-+echo "+------------------------------------------------------------+"
-+echo
-+
-+
-+while getopts ":hL:s:az:" Option
-+do
-+case "$Option" in
-+ h )
-+ echo "$USAGE"
-+ exit 0
-+ ;;
-+ z )
-+ echo -n "nothing"
-+ exit 0
-+ ;;
-+ L )
-+ LISTNAME="$OPTARG"
-+ ;;
-+ s )
-+ SPOOLDIR="$OPTARG"
-+ ;;
-+ * )
-+ printf "$0: invalid option\nTry $0 -h for more information.\n"
-+ exit 1
-+ ;;
-+esac
-+done
-+SHIFTVAL=$(( $OPTIND - 1 ))
-+shift $SHIFTVAL
-+
-+if [ -z "$SPOOLDIR" ]; then
-+ SPOOLDIR="$DEFAULTDIR"
-+fi
-+
-+echo "Creating Directorys below $SPOOLDIR. Use '-s spooldir' to change"
-+
-+if [ -z "$LISTNAME" ]; then
-+ echo -n "What should the name of the Mailinglist be? [mlmmj-test] : "
-+ read LISTNAME
-+ if [ -z "$LISTNAME" ]; then
-+ LISTNAME="mlmmj-test"
-+ fi
-+fi
-+
-+LISTDIR="$SPOOLDIR/$LISTNAME"
-+ETCLISTDIR="$ETCDEFAULTDIR/$LISTNAME"
-+
-+mkdir -p $LISTDIR
-+mkdir -p $ETCLISTDIR
-+
-+for DIR in incoming queue queue/discarded archive subconf unsubconf \
-+ bounce moderation subscribers.d digesters.d requeue \
-+ nomailsubs.d
-+do
-+ mkdir "$LISTDIR"/"$DIR"
-+done
-+
-+for DIR in text control
-+do
-+ mkdir "$ETCLISTDIR"/"$DIR"
-+ ln -s "$ETCLISTDIR"/"$DIR" "$LISTDIR"/"$DIR"
-+done
-+
-+test -f "$LISTDIR"/index || touch "$LISTDIR"/index
-+
-+echo -n "The Domain for the List? [] : "
-+read FQDN
-+if [ -z "$FQDN" ]; then
-+ FQDN="localhost.localdomain"
-+fi
-+
-+echo -n "The emailaddress of the list owner? [postmaster] : "
-+read OWNER
-+if [ -z "$OWNER" ]; then
-+ OWNER="postmaster"
-+fi
-+echo "$OWNER" > "$ETCLISTDIR"/"control/owner"
-+
-+if [ -z "$TEXTPATH" -o ! -d "$TEXTPATH" ]; then
-+ echo "**NOTE** Could not copy the texts for the list"
-+ echo "Please manually copy the files from $TEXTPATH"
-+else
-+ cp "$TEXTPATH"/* "$ETCLISTDIR"/"text"
-+fi
-+
-+LISTADDRESS="$LISTNAME@$FQDN"
-+echo "$LISTADDRESS" > "$ETCLISTDIR"/control/"listaddress"
-+
-+MLMMJRECIEVE=`which mlmmj-recieve 2>/dev/null`
-+if [ -z "$MLMMJRECIEVE" ]; then
-+ MLMMJRECIEVE="/usr/bin/mlmmj-recieve"
-+fi
-+
-+MLMMJMAINTD=`which mlmmj-maintd 2>/dev/null`
-+if [ -z "$MLMMJMAINTD" ]; then
-+ MLMMJMAINTD="/usr/bin/mlmmj-maintd"
-+fi
-+
-+ALIAS="$LISTNAME: \"|$MLMMJRECIEVE -L $SPOOLDIR/$LISTNAME/\""
-+
-+echo "I am adding the following to your /etc/aliases file:"
-+echo "$ALIAS"
-+echo -n "is this ok (if not, you need to do so yourself)? [y/N] : "
-+read OKIDOKI
-+case $OKIDOKI in
-+ y|Y)
-+ echo "$ALIAS" >> /etc/aliases
-+ ;;
-+ n|N)
-+ exit 0
-+ ;;
-+ *)
-+ echo "Options were: y, Y, n or N"
-+esac
-+
-+echo "Detecting the installed MTA and changing ownership as needed..."
-+
-+if [ "$SENDMAILPKG" = "postfix" ]; then
-+ USER="nobody"
-+ GROUP="nogroup"
-+ echo "Postfix appears to be handling your mail, using ownership $USER:$GROUP..."
-+elif [ "$SENDMAILPKG" = "exim4-daemon-light" ]; then
-+ USER="Debian-exim"
-+ GROUP="Debian-exim"
-+ echo "Exim appears to be handling your mail, using ownership $USER:$GROUP..."
-+else
-+ USER="nobody"
-+ GROUP="nogroup"
-+ echo "Unable to detect MTA, using default ownership: $USER:$GROUP..."
-+fi
-+
-+chown -R $USER:$GROUP $LISTDIR $LISTDIR/*
-+chmod -R 755 $LISTDIR
-+chmod -R 755 $ETCLISTDIR
-+
-+# Check if all lists are owned by the right user, if not, ask if we should fix
-+# it.
-+
-+ANOMALIES=0
-+
-+for ENTRY in `ls $SPOOLDIR`
-+do
-+ SOWNER=`stat -c %U $SPOOLDIR/$ENTRY`
-+ SGROUP=`stat -c %G $SPOOLDIR/$ENTRY`
-+
-+ if [ $SOWNER != $USER -o $SGROUP != $GROUP ]
-+ then
-+ ANOMALIES=1
-+ fi
-+done
-+
-+if [ $ANOMALIES -eq 1 ]
-+ then
-+ echo -n "It appears that not all lists have proper ownership, do you want me to fix this? [y/N] : "
-+ read FIXOWNERSHIP
-+ case $FIXOWNERSHIP in
-+ y|Y)
-+ chown -R $USER:$GROUP $SPOOLDIR/*
-+
-+ ;;
-+ n|N)
-+ echo "Not fixing ownership"
-+ ;;
-+ *)
-+ echo "Options were: y, Y, n or N"
-+ esac
-+
-+
-+fi
-+
-+echo "Running $NEWALIASES"
-+$NEWALIASES
-+
-+echo "Done."
diff --git a/debian/patches/01_fix_hyphen_used_as_minus_sign.dpatch b/debian/patches/01_fix_hyphen_used_as_minus_sign.dpatch
--- /dev/null
@@ -0,0 +1,311 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_hyphen_used_as_minus_sign.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Don't use '-' as a minus sign in manpages.
+
+@DPATCH@
+
+diff a/mlmmj-bounce.1 b/mlmmj-bounce.1
+--- a/man/mlmmj-bounce.1
++++ b/man/mlmmj-bounce.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-bounce "1" "September 2004" mlmmj-bounce
++.TH mlmmj\-bounce "1" "September 2004" mlmmj\-bounce
+ .SH NAME
+-mlmmj-bounce \- bounce handling utility for mlmmj
++mlmmj\-bounce \- bounce handling utility for mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-bounce
+-\fI-L /path/to/list \fR[\fI-a john=doe.org | -d\fR]\fI \fR[\fI-n num | -p\fR]
++.B mlmmj\-bounce
++\fI\-L /path/to/list \fR[\fI\-a john=doe.org | \-d\fR]\fI \fR[\fI\-n num | \-p\fR]
+ .HP
+ \fB\-a\fR: Address string that bounces
+ .HP
+@@ -19,8 +19,8 @@
+ .HP
+ \fB\-V\fR: Print version
+ .SH DESCRIPTION
+-mlmmj-bounce is used to handle mails that are bouncing. When a mail arrives to
+-the system, mlmmj-bounce will register in <listdir>/bounce/<addrstring> info
++mlmmj\-bounce is used to handle mails that are bouncing. When a mail arrives to
++the system, mlmmj\-bounce will register in <listdir>/bounce/<addrstring> info
+ about which number that bounced at what time. An example of such a line could
+ be:
+ .LP
+diff a/mlmmj-list.1 b/mlmmj-list.1
+--- a/man/mlmmj-list.1
++++ b/man/mlmmj-list.1
+@@ -1,9 +1,10 @@
+-.TH mlmmj-list "1" "November 2004" mlmmj-recieve
++.TH mlmmj\-list "1" "November 2004" mlmmj\-recieve
+ .SH NAME
+-mlmmj-list \- list people / subscribers associated with a list
++mlmmj\-list \- list people / subscribers associated with a list
+ .SH SYNOPSIS
+-.B mlmmj-list
+-\fI-L /path/to/listdir \fR[\fI-c\fR] \fR[\fI-d\fR] \fR[\fI-h\fR] [\fI-m\fR] [\fI-n\fR] [\fI-o\fR] \fR[\fI-s\fR] \fR[\fI-V\fR]
++.B mlmmj\-list
++\fI\-L /path/to/listdir \fR[\fI\-c\fR] \fR[\fI\-d\fR] \fR[\fI\-h\fR]
++[\fI\-m\fR] [\fI\-n\fR] [\fI\-o\fR] \fR[\fI\-s\fR] \fR[\fI\-V\fR]
+ .HP
+ \fB\-c\fR: Count the emailaddresses
+ .HP
+diff a/mlmmj-maintd.1 b/mlmmj-maintd.1
+--- a/man/mlmmj-maintd.1
++++ b/man/mlmmj-maintd.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-maintd "1" "September 2004" mlmmj-maintd
++.TH mlmmj\-maintd "1" "September 2004" mlmmj\-maintd
+ .SH NAME
+-mlmmj-maintd \- maintenance for mlmmj maintained lists
++mlmmj\-maintd \- maintenance for mlmmj maintained lists
+ .SH SYNOPSIS
+-.B mlmmj-maintd
+-[\fI-F\fR] \fI[-d\fR | \fI-L\fR] /path/to/dir
++.B mlmmj\-maintd
++[\fI\-F\fR] \fI[\-d\fR | \fI\-L\fR] /path/to/dir
+ .HP
+ \fB\-d\fR: Full path to directory with lists
+ .HP
+@@ -18,7 +18,7 @@
+ etc.
+
+ If a directory containing several lists exists, the \fB\-d\fR can be used to
+-specify this, making mlmmj-maintd perform a maintenance run in every listdir
++specify this, making mlmmj\-maintd perform a maintenance run in every listdir
+ below the specified one.
+
+ Only either \fB\-d\fR or \fB\-L\fR can be specified at the same time.
+@@ -26,11 +26,11 @@
+ It will run as a daemon, unless the \fB\-F\fR switch is specified, in which
+ case it just runs once. The \fB\-F\fR option should be used when one wants to
+ avoid running another daemon, and use e.g. cron to control it instead. In case
+-cron is used, mlmmj-maintd should be run every 2 hours or so. An example
++cron is used, mlmmj\-maintd should be run every 2 hours or so. An example
+ crontab entry:
+
+ .LP
+-0 */2 * * * /usr/bin/mlmmj-maintd -F -L /path/to/list
++0 */2 * * * /usr/bin/mlmmj\-maintd \-F \-L /path/to/list
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
+diff a/mlmmj-make-ml.sh.1 b/mlmmj-make-ml.sh.1
+--- a/man/mlmmj-make-ml.sh.1
++++ b/man/mlmmj-make-ml.sh.1
+@@ -1,8 +1,8 @@
+-.TH mlmmj-make-ml "1" "September 2004" mlmmj-make-ml
++.TH mlmmj\-make\-ml "1" "September 2004" mlmmj\-make\-ml
+ .SH NAME
+-mlmmj-make-ml \- create a mailing list for mlmmj
++mlmmj\-make\-ml \- create a mailing list for mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-make-ml
++.B mlmmj\-make\-ml
+ \fI[OPTIONS]
+ .HP
+ \fB\-h\fR: Display help
+diff a/mlmmj-process.1 b/mlmmj-process.1
+--- a/man/mlmmj-process.1
++++ b/man/mlmmj-process.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-process "1" "September 2004" mlmmj-process
++.TH mlmmj\-process "1" "September 2004" mlmmj\-process
+ .SH NAME
+-mlmmj-process \- process mail for an mlmmj managed mailinglist
++mlmmj\-process \- process mail for an mlmmj managed mailinglist
+ .SH SYNOPSIS
+-.B mlmmj-process
+-\fI-L /path/to/list -m /path/to/mail \fR[\fI-h\fR] [\fI-P\fR] [\fI-V\fR]
++.B mlmmj\-process
++\fI\-L /path/to/list \-m /path/to/mail \fR[\fI\-h\fR] [\fI\-P\fR] [\fI\-V\fR]
+ .HP
+ \fB\-h\fR: This help
+ .HP
+@@ -11,7 +11,7 @@
+ .HP
+ \fB\-m\fR: Full path to mail file
+ .HP
+-\fB\-P\fR: Don't execute mlmmj-send (debugging only)
++\fB\-P\fR: Don't execute mlmmj\-send (debugging only)
+ .HP
+ \fB\-V\fR: Print version
+ .SH DESCRIPTION
+@@ -35,26 +35,26 @@
+ Header addition
+
+ Headers specified in <listdir>/control/customheaders are added to the mail.
+-This could be headers like List-ID: or Reply-To:
++This could be headers like List\-ID: or Reply\-To:
+ .IP \(bu 4
+ .B
+ List control
+
+ In case there's a mail with a recipient delimiter it's not a regular list mail.
+-Processing of these happens in mlmmj-recieve as well. Examples of such are
++Processing of these happens in mlmmj\-recieve as well. Examples of such are
+ subscription requests, mails to owner etc.
+-It will base it's recipient delimiter detection on the Delivered-To: header if
++It will base it's recipient delimiter detection on the Delivered\-To: header if
+ present. If not, the To: header is used.
+ .IP \(bu 4
+ .B
+ Moderation
+
+-If the list is moderated, it will happen in mlmmj-process.
++If the list is moderated, it will happen in mlmmj\-process.
+ .RE
+
+ When processing is done, it will invoke the needed binary according to whatever
+-mail it is. If it's a subscription request it will invoke mlmmj-sub, if it's a
+-regular list mail it will invoke mlmmj-send.
++mail it is. If it's a subscription request it will invoke mlmmj\-sub, if it's a
++regular list mail it will invoke mlmmj\-send.
+ .SH "SEE ALSO"
+ The file TUNABLES from the mlmmj source distribution or in the documentation
+ directory of the operating system distribution.
+diff a/mlmmj-recieve.1 b/mlmmj-recieve.1
+--- a/man/mlmmj-recieve.1
++++ b/man/mlmmj-recieve.1
+@@ -1,9 +1,9 @@
+-.TH mlmmj-recieve "1" "September 2004" mlmmj-recieve
++.TH mlmmj\-recieve "1" "September 2004" mlmmj\-recieve
+ .SH NAME
+-mlmmj-recieve \- recieve mails for an mlmmj managed mailinglist
++mlmmj\-recieve \- recieve mails for an mlmmj managed mailinglist
+ .SH SYNOPSIS
+-.B mlmmj-recieve
+-\fI-L /path/to/listdir \fR[\fI-h\fR] [\fI-V\fR] [\fI-P\fR] [\fI-F\fR]
++.B mlmmj\-recieve
++\fI\-L /path/to/listdir \fR[\fI\-h\fR] [\fI\-V\fR] [\fI\-P\fR] [\fI\-F\fR]
+ .HP
+ \fB\-h\fR: This help
+ .HP
+@@ -11,17 +11,17 @@
+ .HP
+ \fB\-L\fR: Full path to list directory
+ .HP
+-\fB\-P\fR: Don't execute mlmmj-process (debugging only)
++\fB\-P\fR: Don't execute mlmmj\-process (debugging only)
+ .HP
+ \fB\-V\fR: Print version
+ .SH DESCRIPTION
+-The mlmmj-recieve binary is the one specified in the mailserver configuration
++The mlmmj\-recieve binary is the one specified in the mailserver configuration
+ file (aliases file), which writes the mail to the <listdir>/incoming directory
+-and invokes mlmmj-process unless the \fB\-P\fR option is specified. On systems
++and invokes mlmmj\-process unless the \fB\-P\fR option is specified. On systems
+ using mailservers supporting the \fB/etc/aliases\fR file, a line to activate
+ an mlmmj managed mailinglist would look like this:
+ .LP
+-list: "|/usr/bin/mlmmj-recieve -L /var/spool/mlmmj/list/"
++list: "|/usr/bin/mlmmj\-recieve \-L /var/spool/mlmmj/list/"
+
+ It's very important to specify the full path to the binary, or the mailinglist
+ will not function.
+@@ -32,7 +32,7 @@
+ would kill it.
+
+ .SH "SEE ALSO"
+-mlmmj-process(1)
++mlmmj\-process(1)
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
+diff a/mlmmj-send.1 b/mlmmj-send.1
+--- a/man/mlmmj-send.1
++++ b/man/mlmmj-send.1
+@@ -1,11 +1,11 @@
+-.TH mlmmj-send "1" "September 2004" mlmmj-send
++.TH mlmmj\-send "1" "September 2004" mlmmj\-send
+ .SH NAME
+-mlmmj-send \- send mail to a mailinglist or similar
++mlmmj\-send \- send mail to a mailinglist or similar
+ .SH SYNOPSIS
+-.B mlmmj-send
+-[\fI-L\fR /path/to/list | \fI-l\fR listctrl] \fI\-m\fR /path/to/mail
+-[\fI-a\fR] [\fI-D\fR] [\fI-F\fR] [\fI-h\fR] [\fI-r\fR] [\fI-R\fR] [\fI-s\fR]
+-[\fI-T\fR] [\fI-V\fR]
++.B mlmmj\-send
++[\fI\-L\fR /path/to/list | \fI\-l\fR listctrl] \fI\-m\fR /path/to/mail
++[\fI\-a\fR] [\fI\-D\fR] [\fI\-F\fR] [\fI\-h\fR] [\fI\-r\fR] [\fI\-R\fR] [\fI\-s\fR]
++[\fI\-T\fR] [\fI\-V\fR]
+ .HP
+ \fB\-a\fR: Don't archive the mail
+ .HP
+@@ -23,7 +23,7 @@
+ .HP
+ \fB\-r\fR: Relayhost IP address (defaults to 127.0.0.1)
+ .HP
+-\fB\-R\fR: What to use as Reply-To: header
++\fB\-R\fR: What to use as Reply\-To: header
+ .HP
+ \fB\-s\fR: Subscribers file name
+ .HP
+@@ -55,7 +55,7 @@
+ \&'6' means 'single listmail to single recipient'
+
+ .SH BUGS
+-This manual page is very scarce documentation of the mlmmj-send binary. The
++This manual page is very scarce documentation of the mlmmj\-send binary. The
+ reason for this is that it's really not supposed to be used by any human, but
+ only supposed to be invoked from other mlmmj binaries. So in case more
+ documentation is needed, please read the source.
+diff a/mlmmj-sub.1 b/mlmmj-sub.1
+--- a/man/mlmmj-sub.1
++++ b/man/mlmmj-sub.1
+@@ -1,10 +1,11 @@
+-.TH mlmmj-sub "1" "September 2004" mlmmj-sub
++.TH mlmmj\-sub "1" "September 2004" mlmmj\-sub
+ .SH NAME
+-mlmmj-sub \- subscribe an address to a mailinglist run by mlmmj
++mlmmj\-sub \- subscribe an address to a mailinglist run by mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-sub
+-\fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR | \fI-C\fR] \fR[\fI-d\fR | \fI-n\fR]
+-[\fI-h\fR] [\fI-U\fR] [\fI-V\fR]
++.B mlmmj\-sub
++\fI\-L /path/to/list \-a john@doe.org \fR[\fI\-c\fR | \fI\-C\fR] \fR[\fI\-d\fR
++| \fI\-n\fR]
++[\fI\-h\fR] [\fI\-U\fR] [\fI\-V\fR]
+ .HP
+ \fB\-a\fR: Email address to subscribe
+ .HP
+@@ -47,7 +48,7 @@
+ When neither \fB\-c\fR nor \fB\-C\fR are specified, subscription silently
+ happens.
+ .SH "SEE ALSO"
+-mlmmj-unsub(1), setuid(2)
++mlmmj\-unsub(1), setuid(2)
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
+diff a/mlmmj-unsub.1 b/mlmmj-unsub.1
+--- a/man/mlmmj-unsub.1
++++ b/man/mlmmj-unsub.1
+@@ -1,10 +1,10 @@
+-.TH mlmmj-unsub "1" "September 2004" mlmmj-unsub
++.TH mlmmj\-unsub "1" "September 2004" mlmmj\-unsub
+ .SH NAME
+-mlmmj-unsub \- unsubscribe an address from a mailinglist run by mlmmj
++mlmmj\-unsub \- unsubscribe an address from a mailinglist run by mlmmj
+ .SH SYNOPSIS
+-.B mlmmj-sub
+-\fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR | \fI-C\fR] [\fI-h\fR]
+-\fR[\fI-d\fR | \fI-n\fR] [\fI-V\fR]
++.B mlmmj\-sub
++\fI\-L /path/to/list \-a john@doe.org \fR[\fI\-c\fR | \fI\-C\fR] [\fI\-h\fR]
++\fR[\fI\-d\fR | \fI\-n\fR] [\fI\-V\fR]
+ .HP
+ \fB\-a\fR: Email address to unsubscribe
+ .HP
+@@ -41,7 +41,7 @@
+ When neither \fB\-c\fR nor \fB\-C\fR are specified, unsubscription silently
+ happens.
+ .SH "SEE ALSO"
+-mlmmj-sub(1)
++mlmmj\-sub(1)
+ .SH AUTHORS
+ This manual page was written by the following persons:
+ .HP
diff --git a/debian/patches/01_fix_manpages.dpatch b/debian/patches/01_fix_manpages.dpatch
--- /dev/null
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_fix_mlmmj_php.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Fix the what-is entry of the mlmmj-sub and mlmmj-unsub manpages.
+
+@DPATCH@
+
+diff a/man/mlmmj-sub.1 b/man/mlmmj-sub.1
+--- a/man/mlmmj-sub.1
++++ b/man/mlmmj-sub.1
+@@ -1,6 +1,6 @@
+ .TH mlmmj-sub "1" "September 2004" mlmmj-sub
+ .SH NAME
+-mlmmj-sub \- subscribe address to a mailinglist run by mlmmj
++mlmmj-sub \- subscribe an address to a mailinglist run by mlmmj
+ .SH SYNOPSIS
+ .B mlmmj-sub
+ \fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR | \fI-C\fR] \fR[\fI-d\fR | \fI-n\fR]
+diff a/man/mlmmj-unsub.1 b/man/mlmmj-unsub.1
+--- a/man/mlmmj-unsub.1
++++ b/man/mlmmj-unsub.1
+@@ -1,6 +1,6 @@
+ .TH mlmmj-unsub "1" "September 2004" mlmmj-unsub
+ .SH NAME
+-mlmmj-unsub \- manual page for mlmmj-unsub
++mlmmj-unsub \- unsubscribe an address from a mailinglist run by mlmmj
+ .SH SYNOPSIS
+ .B mlmmj-sub
+ \fI-L /path/to/list -a john@doe.org \fR[\fI-c\fR | \fI-C\fR] [\fI-h\fR]
index 97c8e1f2241ea9d944ca9dabecf483ec6c747944..2df52a22ef9dc44ad15b6c9d70bce32a05c2b5fe 100644 (file)
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix_mlmmj_php.dpatch by <boll@tristram.fork.dk>
+## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard <boll@tristram.fork.dk>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makes it so that mlmmj-php-web-admin uses the FHS of Debian with correct dirs.
+## DP: Adapt pathes and settings used in the web interface to match the
+## DP: (FHS compliant) installation paths.
@DPATCH@
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php
---- mlmmj-1.2.7/contrib/web/php-admin/conf/config.php 2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/conf/config.php 2005-05-12 18:52:05.000000000 +0200
+
+diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php
+--- a/contrib/web/php-admin/conf/config.php
++++ b/contrib/web/php-admin/conf/config.php
@@ -1,6 +1,6 @@
<?php
@@ -16,20 +17,19 @@ diff -urNad mlmmj-1.2.7/contrib/web/php-admin/conf/config.php /tmp/dpep.1ZV6mc/m
+$templatedir = "/usr/share/mlmmj-php-web-admin/templates/";
?>
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess 2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/dot.htaccess 2005-05-12 18:52:05.000000000 +0200
-@@ -1,4 +1,5 @@
+diff a/contrib/web/php-admin/htdocs/dot.htaccess b/contrib/web/php-admin/htdocs/dot.htaccess
+--- a/contrib/web/php-admin/htdocs/dot.htaccess
++++ b/contrib/web/php-admin/htdocs/dot.htaccess
+@@ -1,4 +1,4 @@
Require valid-user
AuthType Basic
-AuthName "mlmmj web-interface"
-AuthUserFile /home/mlmmj/htpasswd
+AuthName "mlmmj web-interface on Debian GNU/Linux"
+AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
-+php_value include_path "/usr/share/mlmmj-php-web-admin"
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php 2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/edit.php 2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
+--- a/contrib/web/php-admin/htdocs/edit.php
++++ b/contrib/web/php-admin/htdocs/edit.php
@@ -26,7 +26,7 @@
* IN THE SOFTWARE.
*/
require("class.FastTemplate.php");
function mlmmj_boolean($name, $nicename, $text)
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php 2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/index.php 2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/index.php b/contrib/web/php-admin/htdocs/index.php
+--- a/contrib/web/php-admin/htdocs/index.php
++++ b/contrib/web/php-admin/htdocs/index.php
@@ -27,7 +27,7 @@
*/
$tpl = new FastTemplate($templatedir);
-diff -urNad mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php
---- mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php 2005-05-12 18:36:37.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-admin/htdocs/save.php 2005-05-12 18:52:05.000000000 +0200
+diff a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php
+--- a/contrib/web/php-admin/htdocs/save.php
++++ b/contrib/web/php-admin/htdocs/save.php
@@ -26,7 +26,7 @@
* IN THE SOFTWARE.
*/
require("class.FastTemplate.php");
function mlmmj_boolean($name, $nicename, $text)
-diff -urNad mlmmj-1.2.7/contrib/web/php-user/example.html /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html
---- mlmmj-1.2.7/contrib/web/php-user/example.html 2004-07-09 22:28:16.000000000 +0200
-+++ /tmp/dpep.1ZV6mc/mlmmj-1.2.7/contrib/web/php-user/example.html 2005-05-12 18:53:51.000000000 +0200
+diff a/contrib/web/php-user/example.html b/contrib/web/php-user/example.html
+--- a/contrib/web/php-user/example.html
++++ b/contrib/web/php-user/example.html
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
diff --git a/debian/patches/05_fix_call_to_free.dpatch b/debian/patches/05_fix_call_to_free.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_fix_call_to_free.dpatch by <boll@tristram.fork.dk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./src/prepstdreply.c /tmp/dpep-work.Lj9E7s/mlmmj-1.2.8/src/prepstdreply.c
---- ./src/prepstdreply.c 2005-01-15 11:46:24.000000000 +0100
-+++ /tmp/dpep-work.Lj9E7s/mlmmj-1.2.8/src/prepstdreply.c 2005-09-12 20:05:45.000000000 +0200
-@@ -181,7 +181,7 @@
- if(replyto) {
- myreplyto = substitute(replyto, listaddr, tokencount, data);
- tmp = concatstr(3, "Reply-To: ", myreplyto, "\n");
-- free(myreplyto);
-+ myfree(myreplyto);
- myreplyto = tmp;
- } else
- myreplyto = NULL;
diff --git a/debian/patches/05_fix_displayed_full_paths.dpatch b/debian/patches/05_fix_displayed_full_paths.dpatch
index 26ec945d7d70a2fd2fb368f46481b361ee14372c..6a1345c92c3f817a7cdb522de60374d35289384e 100644 (file)
-#! /bin/sh -e
-## 05_fix_displayed_full_paths.dpatch by <boll@andariel>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_displayed_full_paths.dpatch by Søren Boll Overgaard <boll@andariel>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes path of a printf in mlmmj.h to be /usr/bin and
-## DP: not /usr/local/bin when printing usages.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
+## DP: Adapt the path name of binaries in an error message to the paths as
+## DP: used in the Debian package.
@DPATCH@
-diff -urNad /home/boll/mlmmj/mlmmj-1.0.0-RELEASE/include/mlmmj.h mlmmj-1.0.0-RELEASE/include/mlmmj.h
---- /home/boll/mlmmj/mlmmj-1.0.0-RELEASE/include/mlmmj.h 2004-09-07 11:49:10.000000000 +0000
-+++ mlmmj-1.0.0-RELEASE/include/mlmmj.h 2004-10-03 08:29:27.000000000 +0000
+
+diff a/include/mlmmj.h b/include/mlmmj.h
+--- a/include/mlmmj.h
++++ b/include/mlmmj.h
@@ -70,7 +70,7 @@
#define CHECKFULLPATH(name) if(strchr(name, '/') == NULL) { \
fprintf(stderr, "All mlmmj binaries have to " \
diff --git a/debian/po/ja.po b/debian/po/ja.po
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,48 @@
+# Copyright (C) 2009 Daniel Walrond <debian@djw.org.uk>\r
+# This file is distributed under the same license as the mlmmj package.\r
+# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009.\r
+#\r
+msgid ""\r
+msgstr ""\r
+"Project-Id-Version: mlmmj 1.2.15-1.1\n"\r
+"Report-Msgid-Bugs-To: Daniel Walrond <debian@djw.org.uk>\n"\r
+"POT-Creation-Date: 2008-03-17 04:42+0100\n"\r
+"PO-Revision-Date: 2009-01-06 06:26+0900\n"\r
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"\r
+"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"\r
+"MIME-Version: 1.0\n"\r
+"Content-Type: text/plain; charset=UTF-8\n"\r
+"Content-Transfer-Encoding: 8bit\n"\r
+\r
+#. Type: boolean\r
+#. Description\r
+#: ../mlmmj.templates:1001\r
+msgid "Remove mlmmj lists on purge?"\r
+msgstr "完全に削除する (purge する) 際に mlmmj のリストを削除しますか?"\r
+\r
+#. Type: boolean\r
+#. Description\r
+#: ../mlmmj.templates:1001\r
+msgid ""\r
+"Removing mlmmj on purge includes the removal of all subscriber lists, "\r
+"archives and configuration options for all lists currently stored."\r
+msgstr ""\r
+"mlmmj を削除する際に完全に削除する (purge する) と、全ての購読者リストと"\r
+"アーカイブと現在保存している全てのリストの設定オプションも削除されます。"\r
+\r
+#. Type: boolean\r
+#. Description\r
+#: ../mlmmj.templates:1001\r
+msgid ""\r
+"Accepting here basically means that everything under /var/spool/mlmmj and /"\r
+"etc/mlmmj/lists will be removed when this package is purged. Also please "\r
+"note that any changes you might have made to /etc/aliases will not be unmade "\r
+"automatically when this package is removed. (A notice will be displayed "\r
+"however, to remind you to clean up your aliases.)"\r
+msgstr ""\r
+"ここで「はい」と答えると、おおよそこのパッケージが完全に削除 (purge) される際に "\r
+"/var/spool/mlmmj および /etc/mlmmj/lists 以下の全てが削除されることになります。"\r
+"一点注意してほしいのは、/etc/aliases に行ったあらゆる変更はこのパッケージが削除"\r
+"される際に自動的には元には戻されないということです (注意は表示されますが、エイリ"\r
+"アスを整理するのを忘れないでください)。"\r
+\r
diff --git a/debian/po/sv.po b/debian/po/sv.po
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,47 @@
+# translation of mlmmj.po to swedish\r
+# Copyright (C) 2008 Martin Bagge <brother@bsnet.se>\r
+# This file is distributed under the same license as the mlmmj package.\r
+msgid ""\r
+msgstr ""\r
+"Project-Id-Version: mlmmj\n"\r
+"Report-Msgid-Bugs-To: \n"\r
+"POT-Creation-Date: 2008-03-17 04:42+0100\n"\r
+"PO-Revision-Date: 2008-10-26 23:44+0100\n"\r
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"\r
+"Language-Team: swedish <debian-l10n-swedish@lists.debian.org>\n"\r
+"MIME-Version: 1.0\n"\r
+"Content-Type: text/plain; charset=UTF-8\n"\r
+"Content-Transfer-Encoding: 8bit\n"\r
+"X-Generator: KBabel 1.11.4\n"\r
+\r
+#. Type: boolean\r
+#. Description\r
+#: ../mlmmj.templates:1001\r
+msgid "Remove mlmmj lists on purge?"\r
+msgstr "Ta bort mlmmj-listor när paketet tas bort?"\r
+\r
+#. Type: boolean\r
+#. Description\r
+#: ../mlmmj.templates:1001\r
+msgid ""\r
+"Removing mlmmj on purge includes the removal of all subscriber lists, "\r
+"archives and configuration options for all lists currently stored."\r
+msgstr ""\r
+"Att ta bort mlmmj helt och hållet innebär att alla deltagarlistor, listarkiv "\r
+"och inställningar för samtliga listor raderas."\r
+\r
+#. Type: boolean\r
+#. Description\r
+#: ../mlmmj.templates:1001\r
+msgid ""\r
+"Accepting here basically means that everything under /var/spool/mlmmj and /"\r
+"etc/mlmmj/lists will be removed when this package is purged. Also please "\r
+"note that any changes you might have made to /etc/aliases will not be unmade "\r
+"automatically when this package is removed. (A notice will be displayed "\r
+"however, to remind you to clean up your aliases.)"\r
+msgstr ""\r
+"Väljer du att rensa helt betyder det mer eller mindre att alla filer på "\r
+"sökvägarna /var/spool/mlmmj och /etc/mlmmj/lists kommer att tas bort när "\r
+"paketet tas bort. Eventuella ändringar i /etc/aliases kommer dock inte att "\r
+"raderas automatiskt (du kommer dock att få en påminnelse om den detaljen vid "\r
+"raderingsprocessen)."\r
diff --git a/debian/rules b/debian/rules
index 69e269c808bdbf91d6d09e9b613b7357ff3b1915..ec2b7a98a5ec04173073157231935550cc5caf1a 100644 (file)
--- a/debian/rules
+++ b/debian/rules
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# debian/rules for mlmmj
+# (based on the sample debian/rules by Joey Hess
+# and Craig Small as shipped with dh-make).
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export PACKAGE=mlmmj
-export DH_OPTIONS
-export TEXTDIR = $(CURDIR)/debian/mlmmj/usr/share/mlmmj/text.skel
-CONFIGURERUN=no
+WEB_DIR = debian/mlmmj-php-web/usr/share/mlmmj-php-web/www
+WEB_ADMIN_DIR = debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/www
include /usr/share/dpatch/dpatch.make
endif
-export CFLAGS = -Wall -g
+CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
endif
-config.status: patch-stamp configure
- ./configure $(confflags)
+config.status: configure patch-stamp
+ dh_testdir
+ ./configure $(confflags) CFLAGS="$(CFLAGS)"
+
+build: build-stamp
-build-arch: build-arch-stamp config.status
+build-stamp: config.status
dh_testdir
- # Add here commands to compile the package.
$(MAKE)
- #/usr/bin/docbook-to-man debian/mlmmj.sgml > mlmmj.1
-
-build-arch-stamp:
- touch build-arch-stamp
-build-indep-stamp:
- touch build-indep-stamp
-build-indep: build-indep-stamp config.status
+ touch build-stamp
clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f build-stamp build-indep-stamp build-arch-stamp config.log configure-stamp
- rm -rf $(CURDIR)/debian/DEBIAN
dh_clean
-install-arch: build-arch
+install-arch: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ dh_installdirs -a
- # Add here commands to install the package into debian/mlmmj.
$(MAKE) install DESTDIR=$(CURDIR)/debian/mlmmj
- # Install translated list texts
-
- install -d \
- $(TEXTDIR)/da/ \
- $(TEXTDIR)/cz/ \
- $(TEXTDIR)/it/ \
- $(TEXTDIR)/de/ \
- $(TEXTDIR)/es/
- install -m 644 listtexts/da/* $(TEXTDIR)/da/
- install -m 644 listtexts/cz/* $(TEXTDIR)/cz/
- install -m 644 listtexts/it/* $(TEXTDIR)/it/
- install -m 644 listtexts/de/* $(TEXTDIR)/de/
- install -m 644 listtexts/es/* $(TEXTDIR)/es/
-
# Don't advertise that mlmmj-make-ml is a shell script
# And install our own version of mlmmj-make-ml, until upstream
# has stabilised somewhat
- rm -f $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml.sh
- install -m 755 -D $(CURDIR)/debian/mlmmj-make-ml.sh \
- $(CURDIR)/debian/mlmmj/usr/bin/mlmmj-make-ml
+ rm -f debian/mlmmj/usr/bin/mlmmj-make-ml.sh
+ install -m 755 -D debian/mlmmj-make-ml \
+ debian/mlmmj/usr/bin/mlmmj-make-ml
+ mv debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.sh.1 \
+ debian/mlmmj/usr/share/man/man1/mlmmj-make-ml.1
rmdir $(CURDIR)/debian/mlmmj/usr/sbin
dh_install -s
-install-indep: build-indep
- # mlmmj-php-web
- install -m 644 -D $(CURDIR)/contrib/web/php-user/mlmmj.php \
- $(CURDIR)/debian/mlmmj-php-web/usr/share/mlmmj-php-web/mlmmj.php
- install -m 644 -D $(CURDIR)/contrib/web/php-user/README \
- $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README
- install -m 644 -D $(CURDIR)/contrib/web/php-user/example.html \
- $(CURDIR)/debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs -i
+
+ # mlmmj-php-web
+ install -m 644 -D contrib/web/php-user/mlmmj.php \
+ $(WEB_DIR)/mlmmj.php
+ install -m 644 -D contrib/web/php-user/README \
+ debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/README
+ install -m 644 -D contrib/web/php-user/example.html \
+ debian/mlmmj-php-web/usr/share/doc/mlmmj-php-web/examples/examples.html
+ install -m 644 -D debian/mlmmj-php-web.apache.conf \
+ debian/mlmmj-php-web/etc/mlmmj-php-web/apache.conf
+
# mlmmj-php-web-admin
- install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin
- install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/*.php \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/
- install -m 644 $(CURDIR)/contrib/web/php-admin/htdocs/dot.htaccess \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/.htaccess
- install -m 644 -D $(CURDIR)/contrib/web/php-admin/README \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README
- install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf
- install -d $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates
- install -m 644 $(CURDIR)/contrib/web/php-admin/conf/* \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf/
- install -m 644 $(CURDIR)/contrib/web/php-admin/templates/* \
- $(CURDIR)/debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates/
- install -m 644 -D $(CURDIR)/debian/htpasswd \
- $(CURDIR)/debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/htpasswd
+ install -m 755 -d $(WEB_ADMIN_DIR)
+ install -m 644 contrib/web/php-admin/htdocs/*.php \
+ $(WEB_ADMIN_DIR)/
+ install -m 644 contrib/web/php-admin/htdocs/dot.htaccess \
+ $(WEB_ADMIN_DIR)/.htaccess
+ install -m 644 -D contrib/web/php-admin/README \
+ debian/mlmmj-php-web-admin/usr/share/doc/mlmmj-php-web-admin/README
+ install -d debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf
+ install -d debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates
+ install -m 644 contrib/web/php-admin/conf/* \
+ debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/conf/
+ install -m 644 contrib/web/php-admin/templates/* \
+ debian/mlmmj-php-web-admin/usr/share/mlmmj-php-web-admin/templates/
+ install -m 644 -D debian/htpasswd \
+ debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/htpasswd
+ install -m 644 -D debian/mlmmj-php-web-admin.apache.conf \
+ debian/mlmmj-php-web-admin/etc/mlmmj-php-web-admin/apache.conf
binary-common:
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
- dh_installdocs -A FAQ TUNABLES TODO UPGRADE AUTHORS README README.access VERSION README.exim4 README.sendmail
+ dh_installdocs -A FAQ TUNABLES TODO UPGRADE README*
dh_installdebconf
dh_installexamples
-# dh_install
-# dh_installmenu
dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
dh_installcron
-# dh_installinfo
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
dh_installdeb
dh_shlibdeps
dh_gencontrol
build: build-arch build-indep
-.PHONY: build-arch build-indep clean binary-indep binary-arch binary-common install-indep install-arch build configure
+.PHONY: build-arch build-indep clean binary-indep binary-arch binary-common install-indep install-arch build
diff --git a/debian/watch b/debian/watch
index 997a8284b4140bf34cecddeee9a0f6aa663857c4..660d367d4181c4d1a1a18a538d158511a0904370 100644 (file)
--- a/debian/watch
+++ b/debian/watch
-version=2
+version=3
-http://mlmmj.mmj.dk/files/ \
-.*/?mlmmj-(.*).tar.bz2.*
+opts="uversionmangle=s/-RC/~rc/" \
+http://mlmmj.mmj.dk/files/ mlmmj-(.*).tar.gz