[Gforge-commits] gforge/debian gforge-mta-exim4.config.dsfh-in, 1.1, 1.2 gforge-mta-exim4.dirs, 1.1, 1.2 gforge-mta-exim4.docs, 1.1, 1.2 gforge-mta-exim4.postinst.dsfh-in, 1.1, 1.2 gforge-mta-exim4.prerm.dsfh-in, 1.1, 1.2 gforge-mta-exim4.templates.dsfh-in, 1.1, 1.2 changelog, 1.364, 1.365 control, 1.53, 1.54 rules, 1.71, 1.72

[lo-lan-do]

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

Modified Files:
        changelog control rules 
Added Files:
        gforge-mta-exim4.config.dsfh-in gforge-mta-exim4.dirs 
        gforge-mta-exim4.docs gforge-mta-exim4.postinst.dsfh-in 
        gforge-mta-exim4.prerm.dsfh-in 
        gforge-mta-exim4.templates.dsfh-in 
Log Message:
Merging Branch_3_1 back into the trunk (at tag Branch_3_1-merge_6).
That includes the exim4 support, mostly.








Index: changelog
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/changelog,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- changelog   21 Feb 2004 14:59:59 -0000      1.364
+++ changelog   1 Mar 2004 17:02:13 -0000       1.365
@@ -1,4 +1,4 @@
-gforge (3.2.1-0+3) experimental; urgency=low
+gforge (3.2.1-0+4) experimental; urgency=low
 
   * [Roland] New upstream release.  Debian packaging still experimental at
     this stage.
@@ -8,7 +8,15 @@
   * [Roland] Also use 20031126.sql, for the "cron manager" feature.
   * [Roland] Also use 20031205.sql.
 
- -- Roland Mas <address@hidden>  Sun, 15 Feb 2004 17:23:32 +0100
+ -- Roland Mas <address@hidden>  Mon,  1 Mar 2004 17:54:05 +0100
+
+gforge (3.1-11) 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:46:57 +0100
 
 gforge (3.1-10) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/control,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- control     20 Jan 2004 23:50:48 -0000      1.53
+++ control     1 Mar 2004 17:02:13 -0000       1.54
@@ -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: rules
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/rules,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- rules       20 Jan 2004 23:52:52 -0000      1.71
+++ rules       1 Mar 2004 17:02:13 -0000       1.72
@@ -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/