[Gforge-commits] gforge/debian gforge-mta-exim4.templates.dsfh-in, NONE, 1.1.2.1 gforge-mta-exim4.prerm.dsfh-in, NONE, 1.1.2.1 gforge-mta-exim4.postinst.dsfh-in, NONE, 1.1.2.1 gforge-mta-exim4.docs, NONE, 1.1.2.1 gforge-mta-exim4.dirs, NONE, 1.1.2.1 gforge-mta-exim4.config.dsfh-in, NONE, 1.1.2.1 rules, 1.66.2.1, 1.66.2.2 control, 1.49.2.3, 1.49.2.4 changelog, 1.348.2.26, 1.348.2.27

[lo-lan-do]

Update of /cvsroot/gforge/gforge/debian
In directory db.perdue.net:/tmp/cvs-serv12171/debian

Modified Files:
      Tag: Branch_3_1
        rules control changelog 
Added Files:
      Tag: Branch_3_1
        gforge-mta-exim4.templates.dsfh-in 
        gforge-mta-exim4.prerm.dsfh-in 
        gforge-mta-exim4.postinst.dsfh-in gforge-mta-exim4.docs 
        gforge-mta-exim4.dirs gforge-mta-exim4.config.dsfh-in 
Log Message:
Added support for exim4.


--- NEW FILE: gforge-mta-exim4.templates.dsfh-in ---
#DSFHELPER:common-variables#
#DSFHELPER:users-variables#
#DSFHELPER:lists-variables#
#DSFHELPER:ldap-variables#

Template: gforge/shared/noreply_to_bitbucket
Type: boolean
Default: true
_Description: Do you want mail to ${noreply} to be deleted?
 Gforge sends plenty of e-mail from the "${noreply}" address,
 and maybe even some e-mail to that address too.
 .
 It is advised that you let the package direct e-mail to that address to a
 black hole (/dev/null), unless you have another use for that address.
 .
 Accepting this option will perform that redirection.

--- NEW FILE: gforge-mta-exim4.prerm.dsfh-in ---
#! /bin/sh
# prerm script for gforge
#
# see: dh_installdeb(1)

set -e

# summary of how this script can be called:
#        * <prerm> `remove'
#        * <old-prerm> `upgrade' <new-version>
#        * <new-prerm> `failed-upgrade' <old-version>
#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
#        * <deconfigured's-prerm> `deconfigure' `in-favour'
#          <package-being-installed> <version> `removing'
#          <conflicting-package> <version>
# for details, see /usr/share/doc/packaging-manual/

. /usr/share/debconf/confmodule

#DSFHELPER:replace-files#
case "$1" in
    remove)
        db_title "Unconfiguring Gforge"

        # Unpatch Exim configuration files
        /usr/lib/gforge/bin/install-exim4.sh purge-files
        propose_update_remove /etc/aliases
        propose_update_remove /etc/exim4/exim4.conf
        propose_update_remove /etc/exim4/exim4.conf.template
        propose_update_remove 
/etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs

        # Clean debconf after ourselves
        db_stop

        # Exim config removal
        /usr/lib/gforge/bin/install-exim4.sh purge
        ;;
    upgrade|deconfigure|failed-upgrade)
        ;;
    *)
        echo "prerm called with unknown argument \`$1'" >&2
        exit 0
    ;;
esac

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

#DEBHELPER#

exit 0

--- NEW FILE: gforge-mta-exim4.postinst.dsfh-in ---
#! /bin/sh
# postinst script for gforge
#
# see: dh_installdeb(1)

set -e
# set -x                                # Be verbose, be very verbose.

# summary of how this script can be called:
#        * <postinst> `configure' <most-recently-configured-version>
#        * <old-postinst> `abort-upgrade' <new version>
#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
#          <new-version>
#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
#          <failed-install-package> <version> `removing'
#          <conflicting-package> <version>
# for details, see /usr/share/doc/packaging-manual/
#
# quoting from the policy:
#     Any necessary prompting should almost always be confined to the
#     post-installation script, and should be protected with a conditional
#     so that unnecessary prompting doesn't happen if a package's
#     installation fails and the `postinst' is called with `abort-upgrade',
#     `abort-remove' or `abort-deconfigure'.

. /usr/share/debconf/confmodule

#DSFHELPER:replace-files#
case "$1" in
    configure)

        /usr/sbin/gforge-config
        # Patch Exim configuration files
        /usr/lib/gforge/bin/install-exim4.sh configure-files
        propose_update_install /etc/aliases
        propose_update_install /etc/exim4/exim4.conf
        propose_update_install /etc/exim4/exim4.conf.template
        propose_update_install 
/etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs

        # Clean debconf after ourselves
        db_stop
        
    ;;

    abort-upgrade|abort-remove|abort-deconfigure)
    ;;

    *)
        echo "postinst called with unknown argument \`$1'" >&2
        exit 0
    ;;
esac

# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.

#DEBHELPER#

exit 0

--- NEW FILE: gforge-mta-exim4.docs ---
debian/README.Debian

--- NEW FILE: gforge-mta-exim4.dirs ---
bin
etc/gforge
usr/bin
usr/lib/gforge/bin
usr/lib/gforge/lib
usr/sbin
var
var/lib
var/lib/gforge
var/lib/gforge/etc

--- NEW FILE: gforge-mta-exim4.config.dsfh-in ---
#!/bin/sh -e

# Source debconf library.
. /usr/share/debconf/confmodule

#DSFHELPER:handle-mainconffile#

create_mainconffile
init_debconf_from_mainconffile

#DSFHELPER:common-variables#
#DSFHELPER:get-pw-from-debconf#
#DSFHELPER:users-variables#
#DSFHELPER:lists-variables#
#DSFHELPER:ldap-variables#

Index: rules
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/rules,v
retrieving revision 1.66.2.1
retrieving revision 1.66.2.2
diff -u -d -r1.66.2.1 -r1.66.2.2
--- rules       10 Jan 2004 21:43:14 -0000      1.66.2.1
+++ rules       1 Mar 2004 15:52:13 -0000       1.66.2.2
@@ -152,6 +152,9 @@
        # gforge-mta-exim
        install -m 755 deb-specific/install-exim.sh 
$(CURDIR)/debian/gforge-mta-exim/usr/lib/gforge/bin/
 
+       # gforge-mta-exim4
+       install -m 755 deb-specific/install-exim4.sh 
$(CURDIR)/debian/gforge-mta-exim4/usr/lib/gforge/bin/
+
        # gforge-mta-postfix
        install -m 755 deb-specific/install-postfix.sh 
$(CURDIR)/debian/gforge-mta-postfix/usr/lib/gforge/bin/
 

Index: control
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/control,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.4
diff -u -d -r1.49.2.3 -r1.49.2.4
--- control     17 Dec 2003 20:08:24 -0000      1.49.2.3
+++ control     1 Mar 2004 15:52:13 -0000       1.49.2.4
@@ -8,7 +8,7 @@
 Package: gforge
 Architecture: all
 Conflicts: sourceforge
-Depends: debconf (>= 1.0.32), gforge-common (= ${Source-Version}), 
gforge-web-apache | gforge-web, gforge-db-postgresql | gforge-db, 
gforge-mta-exim | gforge-mta, gforge-shell-ldap | gforge-shell, gforge-cvs, 
gforge-ftp-proftpd | gforge-ftp, gforge-ldap-openldap | gforge-ldap, 
gforge-dns-bind9 | gforge-dns, gforge-lists-mailman | gforge-lists
+Depends: debconf (>= 1.0.32), gforge-common (= ${Source-Version}), 
gforge-web-apache | gforge-web, gforge-db-postgresql | gforge-db, 
gforge-mta-exim4 | gforge-mta, gforge-shell-ldap | gforge-shell, gforge-cvs, 
gforge-ftp-proftpd | gforge-ftp, gforge-ldap-openldap | gforge-ldap, 
gforge-dns-bind9 | gforge-dns, gforge-lists-mailman | gforge-lists
 Description: Collaborative development tool - meta-package
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -66,6 +66,22 @@
  This package installs, configures and maintains the GForge
  database.
 
+Package: gforge-mta-exim4
+Architecture: all
+Depends: gforge-common, gforge-ldap-openldap | gforge-ldap, perl, debianutils 
(>= 1.7), debconf (>= 1.0.32), exim4, exim4-daemon-heavy
+Replaces: sourceforge-mta-exim (>> 2.6-0+11)
+Provides: gforge-mta
+Conflicts: gforge-mta
+Description: Collaborative development tool - mail tools (using Exim 4)
+ GForge provides many tools to help collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, CVS repository, forums, support request helper, web
+ page / FTP hosting, release management, etc.  All these services are
+ integrated into one web site and managed via a nice web interface.
+ .
+ This package configures the Exim 4 mail transfer agent to run
+ GForge.
+
 Package: gforge-mta-exim
 Architecture: all
 Depends: gforge-common, gforge-ldap-openldap | gforge-ldap, perl, debianutils 
(>= 1.7), debconf (>= 1.0.32), exim | exim-tls
@@ -175,7 +191,7 @@
 
 Package: gforge-lists-mailman
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-ldap-openldap 
| gforge-ldap, gforge-mta-exim | gforge-mta, apache (>= 1.3.9) | apache-ssl (>= 
1.3.9) | apache-perl (>= 1.3.9), perl, libdbi-perl, libdbd-pg-perl, debianutils 
(>= 1.7), debconf (>= 1.0.32), mailman (>= 2.1-3)
+Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-ldap-openldap 
| gforge-ldap, gforge-mta-exim4 | gforge-mta, apache (>= 1.3.9) | apache-ssl 
(>= 1.3.9) | apache-perl (>= 1.3.9), perl, libdbi-perl, libdbd-pg-perl, 
debianutils (>= 1.7), debconf (>= 1.0.32), mailman (>= 2.1-3)
 Replaces: sourceforge-lists-mailman (>> 2.6-0+11)
 Provides: gforge-lists
 Conflicts: sourceforge-lists

Index: changelog
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/changelog,v
retrieving revision 1.348.2.26
retrieving revision 1.348.2.27
diff -u -d -r1.348.2.26 -r1.348.2.27
--- changelog   16 Feb 2004 14:28:00 -0000      1.348.2.26
+++ changelog   1 Mar 2004 15:52:13 -0000       1.348.2.27
@@ -1,3 +1,11 @@
+gforge (3.1-10+exim4+10) unstable; urgency=low
+
+  * [Roland] Added exim4 support, patch from Guillem Jover
+    <address@hidden>.  Thanks! (closes: #234684).  Also made it the
+    default, since exim4 is the new default MTA for Sarge.
+
+ -- Roland Mas <address@hidden>  Mon,  1 Mar 2004 16:43:08 +0100
+
 gforge (3.1-10) unstable; urgency=low
 
   * [Roland] This is a brown-paper-bag type of release.  I broke