[Gforge-commits] gforge/debian rules, 1.86, 1.87 control, 1.66, 1.67 changelog, 1.392, 1.393

[lo-lan-do]

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

Modified Files:
        rules control changelog 
Log Message:
Packages cleanup: removed old Sourceforge packages, fixed package
relationships, etc.


Index: rules
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/rules,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- rules       3 Oct 2004 17:01:37 -0000       1.86
+++ rules       31 Oct 2004 15:12:07 -0000      1.87
@@ -157,7 +157,7 @@
        # gforge-shell-ldap
        cd 
$(CURDIR)/debian/gforge-shell-ldap/var/lib/gforge/chroot/var/lib/gforge/chroot 
&& ln -s ../../../../home .
 
-       # gforge-shellpostgresql
+       # gforge-shell-postgresql
        install -m 755 deb-specific/install-nsspgsql.sh 
$(CURDIR)/debian/gforge-shell-postgresql/usr/lib/gforge/bin/
 
        # gforge-ftp-proftpd
@@ -179,9 +179,6 @@
        install -m 755 deb-specific/create-mailing-lists.pl 
$(CURDIR)/debian/gforge-lists-mailman/usr/lib/gforge/bin/
        install -m 755 deb-specific/fix-mailing-lists.pl 
$(CURDIR)/debian/gforge-lists-mailman/usr/lib/gforge/bin/
 
-       # gforge-sourceforge-transition
-       install -m 755 deb-specific/install-db.sh 
$(CURDIR)/debian/gforge-sourceforge-transition/usr/lib/gforge-sourceforge-transition/bin/
-
 binary-indep: build install
        dh_testdir
        dh_testroot

Index: control
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/control,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- control     31 Oct 2004 14:18:02 -0000      1.66
+++ control     31 Oct 2004 15:12:07 -0000      1.67
@@ -8,7 +8,7 @@
 Package: gforge
 Architecture: all
 Conflicts: sourceforge
-Depends: debconf (>= 1.0.32), gforge-common (= ${Source-Version}), 
gforge-web-apache (= ${Source-Version})| gforge-web (= ${Source-Version}), 
gforge-db-postgresql (= ${Source-Version})| gforge-db (= ${Source-Version}), 
gforge-mta-exim4 (= ${Source-Version}) | gforge-mta-exim (= ${Source-Version}) 
| gforge-mta-postfix (= ${Source-Version}) | gforge-mta (= ${Source-Version}), 
gforge-shell-ldap (= ${Source-Version})| gforge-shell (= ${Source-Version}), 
gforge-ftp-proftpd (= ${Source-Version})| gforge-ftp (= ${Source-Version}), 
gforge-ldap-openldap (= ${Source-Version})| gforge-ldap (= ${Source-Version}), 
gforge-dns-bind9 (= ${Source-Version})| gforge-dns (= ${Source-Version}), 
gforge-lists-mailman (= ${Source-Version})| gforge-lists (= ${Source-Version})
+Depends: debconf (>= 1.0.32), gforge-common (= ${Source-Version}), 
gforge-web-apache (= ${Source-Version}) | gforge-web (= ${Source-Version}), 
gforge-db-postgresql (= ${Source-Version}) | gforge-db (= ${Source-Version}), 
gforge-mta-exim4 (= ${Source-Version}) | gforge-mta-postfix (= 
${Source-Version}) | gforge-mta-exim (= ${Source-Version}) | gforge-mta (= 
${Source-Version}), gforge-shell-postgresql (= ${Source-Version}) | 
gforge-shell (= ${Source-Version}), gforge-ftp-proftpd (= ${Source-Version}) | 
gforge-ftp (= ${Source-Version}), gforge-dns-bind9 (= ${Source-Version}) | 
gforge-dns (= ${Source-Version}), gforge-lists-mailman (= ${Source-Version}) | 
gforge-lists (= ${Source-Version})
 Suggests: gforge-cvs (= ${Source-Version})
 Description: Collaborative development tool - meta-package
  GForge provides many tools to help collaboration in a
@@ -22,8 +22,7 @@
 Package: gforge-common
 Architecture: all
 Depends: debconf (>= 1.0.32), cpio, lockfile-progs
-Replaces: sourceforge-common (>> 2.6-0+11)
-Conflicts: sourceforge, sourceforge-common
+Conflicts: sourceforge
 Description: Collaborative development tool - shared files
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -38,7 +37,6 @@
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, apache2 (>= 2.0.52) 
| apache (>= 1.3.26) | apache-ssl (>= 1.3.26) | apache-perl (>= 1.3.26), 
apache2 (>= 2.0.52) | libapache-mod-ssl | apache-ssl, libapache2-mod-php4 | 
libapache-mod-php4 | php4, php4-cgi, php4-pgsql, php4-gd, perl, perl-suid, 
libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32), cronolog
 Suggests: libphp-jpgraph
-Replaces: sourceforge-web-apache (>> 2.6-0+11)
 Provides: gforge-web
 Conflicts: gforge-web
 Description: Collaborative development tool - web part (using Apache)
@@ -54,7 +52,6 @@
 Package: gforge-db-postgresql
 Architecture: all
 Depends: gforge-common, postgresql (>= 7.1.2), perl, libdbi-perl, 
libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, 
libtext-autoformat-perl, libmail-sendmail-perl, debianutils (>= 1.7), debconf 
(>= 1.0.32), php4-cgi, php4-pgsql
-Replaces: sourceforge-db-postgresql (>> 2.6-0+11)
 Provides: gforge-db
 Conflicts: gforge-db
 Description: Collaborative development tool - database (using PostgreSQL)
@@ -70,7 +67,6 @@
 Package: gforge-mta-exim4
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, 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)
@@ -86,7 +82,6 @@
 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
-Replaces: sourceforge-mta-exim (>> 2.6-0+11)
 Provides: gforge-mta
 Conflicts: gforge-mta
 Description: Collaborative development tool - mail tools (using Exim)
@@ -101,10 +96,9 @@
 
 Package: gforge-mta-postfix
 Architecture: all
-Depends: gforge-common, gforge-ldap-openldap | gforge-ldap, perl, debianutils 
(>= 1.7), debconf (>= 1.0.32), postfix, postfix-ldap
-Replaces: sourceforge-mta-postfix (>> 2.6-0+11)
+Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, debianutils 
(>= 1.7), debconf (>= 1.0.32), postfix, postfix-pgsql
 Provides: gforge-mta
-Conflicts: sourceforge-mta
+Conflicts: gforge-mta
 Description: Collaborative development tool - mail tools (using Postfix)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -118,9 +112,8 @@
 Package: gforge-shell-ldap
 Architecture: all
 Depends: gforge-common, gforge-ldap-openldap | gforge-ldap, perl, debianutils 
(>= 1.7), debconf (>= 1.0.32), ssh, libnss-ldap (>=184-1), libpam-ldap
-Replaces: sourceforge-shell-ldap (>> 2.6-0+11)
 Provides: gforge-shell
-Conflicts: sourceforge-shell, gforge-shell
+Conflicts: gforge-shell
 Description: Collaborative development tool - shell accounts (using LDAP)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -134,9 +127,8 @@
 Package: gforge-shell-postgresql
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql, perl, debianutils (>= 1.7), 
debconf (>= 1.0.32), ssh, libnss-pgsql1
-Replaces: sourceforge-shell-ldap (>> 2.6-0+11)
 Provides: gforge-shell
-Conflicts: sourceforge-shell, gforge-shell
+Conflicts: gforge-shell
 Description: Collaborative development tool - shell accounts (using PostgreSQL)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -149,9 +141,7 @@
 
 Package: gforge-cvs
 Architecture: all
-Depends: gforge-common, gforge-ldap-openldap | gforge-ldap, cvs, rcs, apache 
(>= 1.3.9) | apache-ssl (>= 1.3.9) | apache-perl (>= 1.3.9), libapache-mod-ssl 
| apache-ssl, perl, debianutils (>= 1.7), debconf (>= 1.0.32), ssh, libnss-ldap 
(>=184-1), libpam-ldap, gforge-plugin-scmcvs
-Replaces: sourceforge-cvs (>> 2.6-0+11)
-Conflicts: sourceforge-cvs
+Depends: gforge-common, gforge-shell-postgresql | gforge-shell, cvs, rcs, 
apache (>= 1.3.9) | apache-ssl (>= 1.3.9) | apache-perl (>= 1.3.9), 
libapache-mod-ssl | apache-ssl, perl, debianutils (>= 1.7), debconf (>= 
1.0.32), ssh, gforge-plugin-scmcvs
 Description: Collaborative development tool - CVS management
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -163,10 +153,9 @@
 
 Package: gforge-ftp-proftpd
 Architecture: all
-Depends: gforge-common, gforge-ldap-openldap | gforge-ldap, proftpd, perl, 
debianutils (>= 1.7), debconf (>= 1.0.32), libnss-ldap (>=184-1), libpam-ldap
-Replaces: sourceforge-ftp-proftpd (>> 2.6-0+11)
+Depends: gforge-common, gforge-shell-postgresql | gforge-shell, proftpd, perl, 
debianutils (>= 1.7), debconf (>= 1.0.32)
 Provides: gforge-ftp
-Conflicts: sourceforge-ftp
+Conflicts: gforge-ftp
 Description: Collaborative development tool - FTP management (using ProFTPd)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -178,10 +167,9 @@
 
 Package: gforge-ldap-openldap
 Architecture: all
-Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, libdbi-perl, 
libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32), slapd (>= 2.0.23-3), 
libnss-ldap (>=184-1), ldap-utils
-Replaces: sourceforge-ldap-openldap (>> 2.6-0+11)
-Provides: gforge-ldap,sourceforge-ldap
-Conflicts: gforge-ldap,sourceforge-ldap
+Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, libdbi-perl, 
libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32), slapd (>= 2.0.23-3), 
ldap-utils
+Provides: gforge-ldap
+Conflicts: gforge-ldap
 Description: Collaborative development tool - LDAP directory (using OpenLDAP)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -194,9 +182,8 @@
 Package: gforge-dns-bind9
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, perl, libdbi-perl, 
libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32), bind9 
-Replaces: sourceforge-dns-bind9 (>> 2.6-0+11)
 Provides: gforge-dns
-Conflicts: sourceforge-dns
+Conflicts: gforge-dns
 Description: Collaborative development tool - DNS management (using Bind9)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -209,9 +196,8 @@
 Package: gforge-lists-mailman
 Architecture: all
 Depends: gforge-common, gforge-db-postgresql | gforge-db, gforge-ldap-openldap 
| gforge-ldap, gforge-mta-exim4 | gforge-mta, apache2 (>= 2.0.52) | 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
+Conflicts: gforge-lists
 Description: Collaborative development tool - mailing-lists (using Mailman)
  GForge provides many tools to help collaboration in a
  development project, such as bug-tracking, task management,
@@ -220,21 +206,3 @@
  integrated into one web site and managed via a nice web interface.
  .
  This package controls the interaction of GForge and Mailman.
-
-Package: gforge-sourceforge-transition
-Architecture: all
-Depends: sourceforge | sourceforge-db-postgresql
-Description: Sourceforge to Gforge data transition
- This package will move data from your sourceforge package
- to your gforge package
-
-Package: sourceforge
-Architecture: all
-Depends: gforge-sourceforge-transition
-Description: Sourceforge to Gforge transition
- Sourceforge has been renamed Gforge, and is no longer maintained.
- This package is only here to help you upgrade to Gforge.  Once you
- have installed this package and the one it depends on
- (gforge-sourceforge-transition), your data have been saved, and you
- can safely uninstall the "sourceforge" package and proceed to install
- Gforge.  Your data will be migrated.

Index: changelog
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/changelog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -d -r1.392 -r1.393
--- changelog   31 Oct 2004 14:18:02 -0000      1.392
+++ changelog   31 Oct 2004 15:12:07 -0000      1.393
@@ -1,4 +1,4 @@
-gforge (3.3.0-50) unstable; urgency=low
+gforge (3.3.0-51) unstable; urgency=low
 
   * [Christian] Added a call to migrateform.php and migraterbac.php in
     db-upgrade
@@ -12,17 +12,14 @@
   * [Roland] Added views for NSS-PGSQL (form Wichert Akkerman).
   * [Christian] Added 20040914.sql, 20041005.sql, 20041006.sql.
   * [Hal] Maded changes to support apache2
-  * [Roland] Added pgsql.class for nss-pgsql interaction (rather than
-    LDAP).
   * [Roland] Removing LDAP dependency, to be replaced with direct
-    PostgreSQL lookups, is partially done.
-  * [Roland] LDAP -> PGSQL: Database views in place.
-  * [Roland] LDAP -> PGSQL: NSS done.
-  * [Roland] LDAP -> PGSQL: Exim4 for email forwarding done.
-  * [Roland] LDAP -> PGSQL: Exim4 for mailing-lists done.
-  * [Roland] LDAP -> PGSQL: TODO Postfix.
+    PostgreSQL lookups: new database views, new pgsql.class, new NSS
+    configuration, new configuration for Exim4 and Postfix.
+  * [Roland] Cleaned up the generated packages a bit: no more sourceforge
+    packages, fixed dependencies to take into account the LDAP->PGSQL
+    migration.
 
- -- Roland Mas <address@hidden>  Sun, 31 Oct 2004 13:39:23 +0100
+ -- Roland Mas <address@hidden>  Sun, 31 Oct 2004 15:45:47 +0100
 
 gforge (3.3.0-12) unstable; urgency=low