[Fusionforge-commits] r8735 - in trunk/gforge: debian debian/dsf-in packaging/control

Roland Mas lolando at libremir.placard.fr.eu.org
Sun Feb 7 21:58:02 CET 2010


Author: lolando
Date: 2010-02-07 21:58:02 +0100 (Sun, 07 Feb 2010)
New Revision: 8735

Modified:
   trunk/gforge/debian/control
   trunk/gforge/debian/dsf-in/common.manpages
   trunk/gforge/debian/rules
   trunk/gforge/packaging/control/010meta
   trunk/gforge/packaging/control/020common
   trunk/gforge/packaging/control/030web-apache2
   trunk/gforge/packaging/control/035web-apache2-vhosts
   trunk/gforge/packaging/control/040web-apache
   trunk/gforge/packaging/control/050db-postgresql
   trunk/gforge/packaging/control/060mta-exim4
   trunk/gforge/packaging/control/070mta-postfix
   trunk/gforge/packaging/control/080mta-courier
   trunk/gforge/packaging/control/090shell-postgresql
   trunk/gforge/packaging/control/100ftp-proftpd
   trunk/gforge/packaging/control/110dns-bind9
   trunk/gforge/packaging/control/120lists-mailman
   trunk/gforge/packaging/control/130plugin-scmcvs
   trunk/gforge/packaging/control/131plugin-scmsvn
   trunk/gforge/packaging/control/132plugin-scmbzr
   trunk/gforge/packaging/control/133plugin-scmgit
   trunk/gforge/packaging/control/134plugin-scmhg
   trunk/gforge/packaging/control/135plugin-scmdarcs
   trunk/gforge/packaging/control/136plugin-scmarch
   trunk/gforge/packaging/control/137plugin-scmcpold
   trunk/gforge/packaging/control/160plugin-mediawiki
   trunk/gforge/packaging/control/170plugin-extratabs
   trunk/gforge/packaging/control/180plugin-globalsearch
   trunk/gforge/packaging/control/190plugin-projectlabels
   trunk/gforge/packaging/control/200plugin-contribtracker
Log:
Renamed binary meta-package

Modified: trunk/gforge/debian/control
===================================================================
--- trunk/gforge/debian/control	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/debian/control	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Source: gforge
+Source: fusionforge
 Section: devel
 Priority: optional
 Maintainer: Roland Mas <lolando at debian.org>
@@ -9,12 +9,13 @@
 Homepage: http://fusionforge.org/
 Vcs-Bzr: http://scm.fusionforge.org/bzr/fusionforge/svn-trunk-ro/
 
-Package: gforge
+Package: fusionforge
 Architecture: all
-Conflicts: sourceforge, gforge-cvs, gforge-common (<< ${source:Version})
+Conflicts: sourceforge, gforge-cvs, gforge-common (<< ${source:Version}), gforge
+Replaces: gforge
+Provides: gforge
 Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, gforge-common (=${source:Version}), gforge-web-apache2 | gforge-web, gforge-db-postgresql | gforge-db, gforge-mta-exim4 | gforge-mta, gforge-shell-postgresql | gforge-shell, gforge-lists-mailman | gforge-lists, ${misc:Depends}
 Recommends: gforge-plugin-scm
-Provides: fusionforge
 Description: FusionForge collaborative development tool - metapackage
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

Modified: trunk/gforge/debian/dsf-in/common.manpages
===================================================================
--- trunk/gforge/debian/dsf-in/common.manpages	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/debian/dsf-in/common.manpages	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,2 +1,2 @@
- at PACKAGE@-config.1
+ at OLDPACKAGE@-config.1
 cvssh.1

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/debian/rules	2010-02-07 20:58:02 UTC (rev 8735)
@@ -3,21 +3,24 @@
 # GNU copyright 1997 to 1999 by Joey Hess (sample file)
 # Copyright 2000 to 2002 by Roland Mas and Christian Bayle for the Sourceforge package
 # Copyright 2002 to 2008 by Roland Mas and Christian Bayle for the Gforge package
-# Copyright 2008 to 2009 by Roland Mas and Christian Bayle for the FusionForge package
+# Copyright 2008 to 2010 by Roland Mas and Christian Bayle for the FusionForge package
 
-PACKAGE=gforge
+OLDPACKAGE=gforge
+PACKAGE=fusionforge
 SRCPACKAGE=fusionforge
 FORGENAME=FusionForge
 
+SED_REPLACE=sed -e 's/@PACKAGE@/$(PACKAGE)/g' -e 's/@SRCPACKAGE@/$(SRCPACKAGE)/g' -e 's/@OLDPACKAGE@/$(OLDPACKAGE)/g' -e 's/@FORGENAME@/$(FORGENAME)/g'
+
 default:
 	@echo $(PACKAGE)
 
 include /usr/share/dpatch/dpatch.make
 
-CRONDFILES=$(patsubst packaging/cron.d/%,debian/$(PACKAGE)-%.cron.d,$(wildcard packaging/cron.d/[a-z]*))
-DIRSFILES=$(patsubst packaging/dirs/%,debian/$(PACKAGE)-%.dirs,$(wildcard packaging/dirs/[a-z]*))
-INSTALLFILES=$(patsubst packaging/install/%,debian/$(PACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
-DOCSFILES=$(patsubst packaging/docs/pkgname%,debian/$(PACKAGE)%.docs,$(wildcard packaging/docs/pkgname*))
+CRONDFILES=$(patsubst packaging/cron.d/%,debian/$(OLDPACKAGE)-%.cron.d,$(wildcard packaging/cron.d/[a-z]*))
+DIRSFILES=$(patsubst packaging/dirs/%,debian/$(OLDPACKAGE)-%.dirs,$(wildcard packaging/dirs/[a-z]*))
+INSTALLFILES=$(patsubst packaging/install/%,debian/$(OLDPACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
+DOCSFILES=$(patsubst packaging/docs/pkgname%,debian/$(OLDPACKAGE)%.docs,$(wildcard packaging/docs/pkgname*))
 POFILES=$(patsubst debian/dsf-po/%,debian/po/%,$(wildcard debian/dsf-po/*) debian/po/POTFILES.in)
 
 remove-binary-files:
@@ -26,26 +29,26 @@
 .PHONY: conffiles
 conffiles: $(CRONDFILES) $(DIRSFILES) $(INSTALLFILES) $(DOCSFILES) debian/control
 
-debian/$(PACKAGE)-%.cron.d:
-	(cat $(CURDIR)/packaging/cron.d/00phpcron ; sed -e 's/\$$FFUSER/$(PACKAGE)/g' $(CURDIR)/packaging/cron.d/$*) > $@
+debian/$(OLDPACKAGE)-%.cron.d:
+	(cat $(CURDIR)/packaging/cron.d/00phpcron ; sed -e 's/\$$FFUSER/$(OLDPACKAGE)/g' $(CURDIR)/packaging/cron.d/$*) > $@
 
-debian/$(PACKAGE)-%.dirs:
+debian/$(OLDPACKAGE)-%.dirs:
 	cp $(CURDIR)/packaging/dirs/$* $@ 
 
-debian/$(PACKAGE)-%.install:
+debian/$(OLDPACKAGE)-%.install:
 	cp $(CURDIR)/packaging/install/$* $@ 
 
 debian/%.docs:
-	cp $(CURDIR)/packaging/docs/$(patsubst $(PACKAGE)%,pkgname%,$*) $@
+	cp $(CURDIR)/packaging/docs/$(patsubst $(OLDPACKAGE)%,pkgname%,$*) $@
 
 debian/control: $(wildcard packaging/control/*)
-	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | grep -v scmcpold | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | sed -e 's/@PACKAGE@/$(PACKAGE)/g' -e 's/@SRCPACKAGE@/$(SRCPACKAGE)/g' > $@
+	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | grep -v scmcpold | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | $(SED_REPLACE) > $@
 
 debian/po/templates.pot: $(wildcard debian/dsf-in/*.templates.dsfh-in) $(wildcard debian/dsf-helper/*.templates)
 	@debconf-updatepo --podir=debian/dsf-po
 
 debian/po/%:
-	cat $(patsubst debian/po/%,debian/dsf-po/%,$@) | sed 's/@PACKAGE@/$(PACKAGE)/g' | sed 's/@FORGENAME@/$(FORGENAME)/g' > $@
+	cat $(patsubst debian/po/%,debian/dsf-po/%,$@) | $(SED_REPLACE) > $@
 
 .PHONY: patch
 
@@ -53,13 +56,13 @@
 	dh $@
 
 # Build man pages from Docbook sources
-	cat debian/dsf-in/config.sgml | sed 's/@PACKAGE@/$(PACKAGE)/g' | sed 's/@FORGENAME@/$(FORGENAME)/g' > debian/$(PACKAGE)-config.sgml
-	cat debian/dsf-in/common.manpages | sed 's/@PACKAGE@/$(PACKAGE)/g' | sed 's/@FORGENAME@/$(FORGENAME)/g' > debian/$(PACKAGE)-common.manpages
+	cat debian/dsf-in/config.sgml | $(SED_REPLACE) > debian/$(OLDPACKAGE)-config.sgml
+	cat debian/dsf-in/common.manpages | $(SED_REPLACE) > debian/$(OLDPACKAGE)-common.manpages
 	/usr/bin/docbook-to-man debian/cvssh.sgml > cvssh.1
-	/usr/bin/docbook-to-man debian/$(PACKAGE)-config.sgml > $(PACKAGE)-config.1
+	/usr/bin/docbook-to-man debian/$(OLDPACKAGE)-config.sgml > $(OLDPACKAGE)-config.1
 
 # Build README.Debian from template
-	cat debian/README.Debian.tmpl | sed 's/@PACKAGE@/$(PACKAGE)/g' | sed 's/@FORGENAME@/$(FORGENAME)/g' > debian/README.Debian
+	cat debian/README.Debian.tmpl | $(SED_REPLACE) > debian/README.Debian
 
 # Uudecode binary files
 	sh $(CURDIR)/deb-specific/manage-uufiles.sh decode
@@ -77,9 +80,9 @@
 	rm -f $(CURDIR)/debian/*.dirs
 	rm -f $(CURDIR)/debian/*.install
 	rm -f $(CURDIR)/debian/*.docs
-	rm -f $(CURDIR)/debian/$(PACKAGE)-config.sgml
-	rm -f $(CURDIR)/debian/$(PACKAGE)-common.manpages
-	rm -f cvssh.1 $(PACKAGE)-config.1
+	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-config.sgml
+	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-common.manpages
+	rm -f cvssh.1 $(OLDPACKAGE)-config.1
 	rm -f $(CURDIR)/debian/README.Debian
 	rm -rf locales
 
@@ -94,22 +97,22 @@
 	chmod 755 $(CURDIR)/debian/*/*/*/*/bin/* $(CURDIR)/debian/*/*/*/*/cronjobs/* \
 		$(CURDIR)/debian/*/bin/*  $(CURDIR)/debian/*/usr/share/*/plugins/*/bin/* \
 		$(CURDIR)/debian/*/usr/share/*/plugins/*/cronjobs/*
-	chmod 644 $(CURDIR)/debian/$(PACKAGE)-db-postgresql/usr/share/$(PACKAGE)/cronjobs/*.inc
+	chmod 644 $(CURDIR)/debian/$(OLDPACKAGE)-db-postgresql/usr/share/$(OLDPACKAGE)/cronjobs/*.inc
 
-	chmod 755 $(CURDIR)/debian/$(PACKAGE)-db-postgresql/usr/share/*/db/*.php
+	chmod 755 $(CURDIR)/debian/$(OLDPACKAGE)-db-postgresql/usr/share/*/db/*.php
 
-	rm $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/bin/cgi/viewvc-strace.sh
+	rm $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/bin/cgi/viewvc-strace.sh
 
-	find $(CURDIR)/debian/$(PACKAGE)-common/usr/share/*/common/docman/engine/ -type f -name \*.php -not -name \*.inc.php -exec chmod 0755 {} \;
-	find $(CURDIR)/debian/$(PACKAGE)-common/usr/share/*/common/docman/engine/ -type f -name \*.sh -exec chmod 0755 {} \;
+	find $(CURDIR)/debian/$(OLDPACKAGE)-common/usr/share/*/common/docman/engine/ -type f -name \*.php -not -name \*.inc.php -exec chmod 0755 {} \;
+	find $(CURDIR)/debian/$(OLDPACKAGE)-common/usr/share/*/common/docman/engine/ -type f -name \*.sh -exec chmod 0755 {} \;
 
-	rm -f $(CURDIR)/debian/$(PACKAGE)-plugin-scm*/usr/share/*/plugins/scm*/*/README
-	chmod 755 $(CURDIR)/debian/$(PACKAGE)-plugin-scmcvs/usr/share/*/plugins/scmcvs/sbin/*
+	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-plugin-scm*/usr/share/*/plugins/scm*/*/README
+	chmod 755 $(CURDIR)/debian/$(OLDPACKAGE)-plugin-scmcvs/usr/share/*/plugins/scmcvs/sbin/*
 
 # Remove Windows files
-	rm -rf $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/windows
+	rm -rf $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/windows
 
-	rm -f $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/themes/$(PACKAGE)/COPYING
+	rm -f $(CURDIR)/debian/$(OLDPACKAGE)-web-apache2/usr/share/*/www/themes/$(OLDPACKAGE)/COPYING
 
 # Remove Snoopy class from binary packages (provided by libphp-snoopy)
 	find $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) -name Snoopy.class.php | xargs -r rm

Modified: trunk/gforge/packaging/control/010meta
===================================================================
--- trunk/gforge/packaging/control/010meta	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/010meta	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,7 +1,8 @@
 Package: @PACKAGE@
 Architecture: all
-Conflicts: sourceforge, gforge-cvs, @PACKAGE at -common (<< ${source:Version})
-Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, @PACKAGE at -common (=${source:Version}), @PACKAGE at -web-apache2 | @PACKAGE at -web, @PACKAGE at -db-postgresql | @PACKAGE at -db, @PACKAGE at -mta-exim4 | @PACKAGE at -mta, @PACKAGE at -shell-postgresql | @PACKAGE at -shell, @PACKAGE at -lists-mailman | @PACKAGE at -lists, ${misc:Depends}
-Recommends: @PACKAGE at -plugin-scm
-Provides: fusionforge
+Conflicts: sourceforge, gforge-cvs, @OLDPACKAGE at -common (<< ${source:Version}), @OLDPACKAGE@
+Replaces: @OLDPACKAGE@
+Provides: @OLDPACKAGE@
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, @OLDPACKAGE at -common (=${source:Version}), @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -mta-exim4 | @OLDPACKAGE at -mta, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, @OLDPACKAGE at -lists-mailman | @OLDPACKAGE at -lists, ${misc:Depends}
+Recommends: @OLDPACKAGE at -plugin-scm
 Description: FusionForge collaborative development tool - metapackage

Modified: trunk/gforge/packaging/control/020common
===================================================================
--- trunk/gforge/packaging/control/020common	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/020common	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -common
+Package: @OLDPACKAGE at -common
 Architecture: all
 Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, cpio, lockfile-progs, adduser, php5-cli, python, ${misc:Depends}
-Conflicts: sourceforge, @PACKAGE at -plugin-scmcvs (<< 4.1), @PACKAGE at -plugin-scmsvn (<< 4.1), @PACKAGE at -plugin-scmccase (<< 4.1), @PACKAGE at -theme-starterpack (<< 4.0)
+Conflicts: sourceforge, @OLDPACKAGE at -plugin-scmcvs (<< 4.1), @OLDPACKAGE at -plugin-scmsvn (<< 4.1), @OLDPACKAGE at -plugin-scmccase (<< 4.1), @OLDPACKAGE at -theme-starterpack (<< 4.0)
 Description: collaborative development tool - shared files

Modified: trunk/gforge/packaging/control/030web-apache2
===================================================================
--- trunk/gforge/packaging/control/030web-apache2	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/030web-apache2	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,7 +1,7 @@
-Package: @PACKAGE at -web-apache2
+Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, perl-suid, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), ${misc:Depends}
 Recommends: libphp-jpgraph, locales | locales-all
-Provides: @PACKAGE at -web
-Conflicts: @PACKAGE at -web
+Provides: @OLDPACKAGE at -web
+Conflicts: @OLDPACKAGE at -web
 Description: collaborative development tool - web part (using Apache)

Modified: trunk/gforge/packaging/control/035web-apache2-vhosts
===================================================================
--- trunk/gforge/packaging/control/035web-apache2-vhosts	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/035web-apache2-vhosts	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -web-apache2-vhosts
+Package: @OLDPACKAGE at -web-apache2-vhosts
 Architecture: all
-Depends: @PACKAGE at -web-apache2, ${misc:Depends}
+Depends: @OLDPACKAGE at -web-apache2, ${misc:Depends}
 Description: collaborative development tool - web vhosts (using Apache)

Modified: trunk/gforge/packaging/control/040web-apache
===================================================================
--- trunk/gforge/packaging/control/040web-apache	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/040web-apache	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -web-apache
+Package: @OLDPACKAGE at -web-apache
 Architecture: all
-Depends: @PACKAGE at -web-apache2, ${misc:Depends}
-Description: transition package to @PACKAGE at -web-apache2
+Depends: @OLDPACKAGE at -web-apache2, ${misc:Depends}
+Description: transition package to @OLDPACKAGE at -web-apache2

Modified: trunk/gforge/packaging/control/050db-postgresql
===================================================================
--- trunk/gforge/packaging/control/050db-postgresql	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/050db-postgresql	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -db-postgresql
+Package: @OLDPACKAGE at -db-postgresql
 Architecture: all
-Depends: @PACKAGE at -common, postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql (>= 8.1), perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -db
-Conflicts: @PACKAGE at -db
+Depends: @OLDPACKAGE at -common, postgresql-8.3 | postgresql-8.2 | postgresql-8.1 | postgresql (>= 8.1), perl, libdbi-perl, libdbd-pg-perl, libmime-base64-perl, libhtml-parser-perl, libtext-autoformat-perl, libmail-sendmail-perl, libsort-versions-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -db
+Conflicts: @OLDPACKAGE at -db
 Description: collaborative development tool - database (using PostgreSQL)

Modified: trunk/gforge/packaging/control/060mta-exim4
===================================================================
--- trunk/gforge/packaging/control/060mta-exim4	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/060mta-exim4	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -mta-exim4
+Package: @OLDPACKAGE at -mta-exim4
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, exim4, exim4-daemon-heavy, ${misc:Depends}
-Provides: @PACKAGE at -mta
-Conflicts: @PACKAGE at -mta
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, exim4, exim4-daemon-heavy, ${misc:Depends}
+Provides: @OLDPACKAGE at -mta
+Conflicts: @OLDPACKAGE at -mta
 Description: collaborative development tool - mail tools (using Exim 4)

Modified: trunk/gforge/packaging/control/070mta-postfix
===================================================================
--- trunk/gforge/packaging/control/070mta-postfix	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/070mta-postfix	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -mta-postfix
+Package: @OLDPACKAGE at -mta-postfix
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, postfix, postfix-pgsql, ${misc:Depends}
-Provides: @PACKAGE at -mta
-Conflicts: @PACKAGE at -mta
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, postfix, postfix-pgsql, ${misc:Depends}
+Provides: @OLDPACKAGE at -mta
+Conflicts: @OLDPACKAGE at -mta
 Description: collaborative development tool - mail tools (using Postfix)

Modified: trunk/gforge/packaging/control/080mta-courier
===================================================================
--- trunk/gforge/packaging/control/080mta-courier	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/080mta-courier	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -mta-courier
+Package: @OLDPACKAGE at -mta-courier
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, courier-mta, ${misc:Depends}
-Provides: @PACKAGE at -mta
-Conflicts: @PACKAGE at -mta
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, courier-mta, ${misc:Depends}
+Provides: @OLDPACKAGE at -mta
+Conflicts: @OLDPACKAGE at -mta
 Description: collaborative development tool - mail tools (using Courier)

Modified: trunk/gforge/packaging/control/090shell-postgresql
===================================================================
--- trunk/gforge/packaging/control/090shell-postgresql	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/090shell-postgresql	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,7 +1,7 @@
-Package: @PACKAGE at -shell-postgresql
+Package: @OLDPACKAGE at -shell-postgresql
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, openssh-server, libnss-pgsql2, ${misc:Depends}
-Provides: @PACKAGE at -shell
-Conflicts: @PACKAGE at -shell
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, openssh-server, libnss-pgsql2, ${misc:Depends}
+Provides: @OLDPACKAGE at -shell
+Conflicts: @OLDPACKAGE at -shell
 Recommends: nscd
 Description: collaborative development tool - shell accounts (using PostgreSQL)

Modified: trunk/gforge/packaging/control/100ftp-proftpd
===================================================================
--- trunk/gforge/packaging/control/100ftp-proftpd	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/100ftp-proftpd	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -ftp-proftpd
+Package: @OLDPACKAGE at -ftp-proftpd
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -shell-postgresql | @PACKAGE at -shell, proftpd, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -ftp
-Conflicts: @PACKAGE at -ftp
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, proftpd, perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -ftp
+Conflicts: @OLDPACKAGE at -ftp
 Description: collaborative development tool - FTP management (using ProFTPd)

Modified: trunk/gforge/packaging/control/110dns-bind9
===================================================================
--- trunk/gforge/packaging/control/110dns-bind9	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/110dns-bind9	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -dns-bind9
+Package: @OLDPACKAGE at -dns-bind9
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, bind9 , ${misc:Depends}
-Provides: @PACKAGE at -dns
-Conflicts: @PACKAGE at -dns
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, bind9 , ${misc:Depends}
+Provides: @OLDPACKAGE at -dns
+Conflicts: @OLDPACKAGE at -dns
 Description: collaborative development tool - DNS management (using Bind9)

Modified: trunk/gforge/packaging/control/120lists-mailman
===================================================================
--- trunk/gforge/packaging/control/120lists-mailman	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/120lists-mailman	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,6 +1,6 @@
-Package: @PACKAGE at -lists-mailman
+Package: @OLDPACKAGE at -lists-mailman
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, @PACKAGE at -mta-exim4 | @PACKAGE at -mta, apache2 (>= 2.0.52), perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, mailman (>= 2.1-3), ${misc:Depends}
-Provides: @PACKAGE at -lists
-Conflicts: @PACKAGE at -lists
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -mta-exim4 | @OLDPACKAGE at -mta, apache2 (>= 2.0.52), perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, mailman (>= 2.1-3), ${misc:Depends}
+Provides: @OLDPACKAGE at -lists
+Conflicts: @OLDPACKAGE at -lists
 Description: collaborative development tool - mailing-lists (using Mailman)

Modified: trunk/gforge/packaging/control/130plugin-scmcvs
===================================================================
--- trunk/gforge/packaging/control/130plugin-scmcvs	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/130plugin-scmcvs	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmcvs
+Package: @OLDPACKAGE at -plugin-scmcvs
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, @PACKAGE at -web-apache2 | @PACKAGE at -web, @PACKAGE at -shell-postgresql | @PACKAGE at -shell, libipc-run-perl, rcs, liburi-perl, cvs, php5-cli, python, libphp-snoopy, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, libipc-run-perl, rcs, liburi-perl, cvs, php5-cli, python, libphp-snoopy, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - CVS plugin

Modified: trunk/gforge/packaging/control/131plugin-scmsvn
===================================================================
--- trunk/gforge/packaging/control/131plugin-scmsvn	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/131plugin-scmsvn	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmsvn
+Package: @OLDPACKAGE at -plugin-scmsvn
 Architecture: all
-Depends: @PACKAGE at -common, @PACKAGE at -db-postgresql | @PACKAGE at -db, @PACKAGE at -web-apache2 | @PACKAGE at -web, @PACKAGE at -shell-postgresql | @PACKAGE at -shell, subversion, subversion-tools, viewvc | viewcvs, python-subversion, python (>= 2.3), php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, subversion, subversion-tools, viewvc | viewcvs, python-subversion, python (>= 2.3), php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - Subversion plugin

Modified: trunk/gforge/packaging/control/132plugin-scmbzr
===================================================================
--- trunk/gforge/packaging/control/132plugin-scmbzr	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/132plugin-scmbzr	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmbzr
+Package: @OLDPACKAGE at -plugin-scmbzr
 Architecture: all
-Depends: @PACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, bzr, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, bzr, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - Bazaar plugin

Modified: trunk/gforge/packaging/control/133plugin-scmgit
===================================================================
--- trunk/gforge/packaging/control/133plugin-scmgit	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/133plugin-scmgit	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmgit
+Package: @OLDPACKAGE at -plugin-scmgit
 Architecture: all
-Depends: @PACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git-core, gitweb, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, git-core, gitweb, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - Git plugin

Modified: trunk/gforge/packaging/control/134plugin-scmhg
===================================================================
--- trunk/gforge/packaging/control/134plugin-scmhg	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/134plugin-scmhg	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmhg
+Package: @OLDPACKAGE at -plugin-scmhg
 Architecture: all
-Depends: @PACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, mercurial, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, mercurial, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - Mercurial (Hg) plugin

Modified: trunk/gforge/packaging/control/135plugin-scmdarcs
===================================================================
--- trunk/gforge/packaging/control/135plugin-scmdarcs	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/135plugin-scmdarcs	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmdarcs
+Package: @OLDPACKAGE at -plugin-scmdarcs
 Architecture: all
-Depends: @PACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, darcs, darcsweb, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, darcs, darcsweb, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - Darcs plugin

Modified: trunk/gforge/packaging/control/136plugin-scmarch
===================================================================
--- trunk/gforge/packaging/control/136plugin-scmarch	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/136plugin-scmarch	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmarch
+Package: @OLDPACKAGE at -plugin-scmarch
 Architecture: all
-Depends: @PACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, php5-cli, tla, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, php5-cli, tla, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - GNU Arch plugin

Modified: trunk/gforge/packaging/control/137plugin-scmcpold
===================================================================
--- trunk/gforge/packaging/control/137plugin-scmcpold	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/137plugin-scmcpold	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,5 +1,5 @@
-Package: @PACKAGE at -plugin-scmcpold
+Package: @OLDPACKAGE at -plugin-scmcpold
 Architecture: all
-Depends: @PACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, php5-cli, ${misc:Depends}
-Provides: @PACKAGE at -plugin-scm
+Depends: @OLDPACKAGE at -common, gforge-db-postgresql | gforge-db, gforge-web-apache2 | gforge-web, gforge-shell-postgresql | gforge-shell, php5-cli, ${misc:Depends}
+Provides: @OLDPACKAGE at -plugin-scm
 Description: collaborative development tool - CPOLD plugin

Modified: trunk/gforge/packaging/control/160plugin-mediawiki
===================================================================
--- trunk/gforge/packaging/control/160plugin-mediawiki	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/160plugin-mediawiki	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -plugin-mediawiki
+Package: @OLDPACKAGE at -plugin-mediawiki
 Architecture: all
-Depends: @PACKAGE at -common (>= 4.8), @PACKAGE at -db-postgresql (>= 4.8) | @PACKAGE at -db, @PACKAGE at -web-apache2 (>= 4.8) | @PACKAGE at -web, mediawiki (>= 1:1.15~), ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>= 4.8), @OLDPACKAGE at -db-postgresql (>= 4.8) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.8) | @OLDPACKAGE at -web, mediawiki (>= 1:1.15~), ${misc:Depends}
 Description: Mediawiki plugin for FusionForge

Modified: trunk/gforge/packaging/control/170plugin-extratabs
===================================================================
--- trunk/gforge/packaging/control/170plugin-extratabs	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/170plugin-extratabs	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -plugin-extratabs
+Package: @OLDPACKAGE at -plugin-extratabs
 Architecture: all
-Depends: @PACKAGE at -common (>= 4.6.99), @PACKAGE at -db-postgresql (>= 4.6.99) | @PACKAGE at -db, @PACKAGE at -web-apache2 (>= 4.6.99) | @PACKAGE at -web, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>= 4.6.99), @OLDPACKAGE at -db-postgresql (>= 4.6.99) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.6.99) | @OLDPACKAGE at -web, ${misc:Depends}
 Description: Extratabs plugin for FusionForge

Modified: trunk/gforge/packaging/control/180plugin-globalsearch
===================================================================
--- trunk/gforge/packaging/control/180plugin-globalsearch	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/180plugin-globalsearch	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -plugin-globalsearch
+Package: @OLDPACKAGE at -plugin-globalsearch
 Architecture: all
-Depends: @PACKAGE at -common (>= 4.6.99), @PACKAGE at -db-postgresql (>= 4.6.99) | @PACKAGE at -db, @PACKAGE at -web-apache2 (>= 4.6.99) | @PACKAGE at -web, libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl, libcrypt-ssleay-perl, libunicode-string-perl, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>= 4.6.99), @OLDPACKAGE at -db-postgresql (>= 4.6.99) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.6.99) | @OLDPACKAGE at -web, libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl, libcrypt-ssleay-perl, libunicode-string-perl, ${misc:Depends}
 Description: Globalsearch plugin for FusionForge

Modified: trunk/gforge/packaging/control/190plugin-projectlabels
===================================================================
--- trunk/gforge/packaging/control/190plugin-projectlabels	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/190plugin-projectlabels	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -plugin-projectlabels
+Package: @OLDPACKAGE at -plugin-projectlabels
 Architecture: all
-Depends: @PACKAGE at -common (>= 4.6.99), @PACKAGE at -db-postgresql (>= 4.6.99) | @PACKAGE at -db, @PACKAGE at -web-apache2 (>= 4.6.99) | @PACKAGE at -web, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>= 4.6.99), @OLDPACKAGE at -db-postgresql (>= 4.6.99) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.6.99) | @OLDPACKAGE at -web, ${misc:Depends}
 Description: Projectlabels plugin for FusionForge

Modified: trunk/gforge/packaging/control/200plugin-contribtracker
===================================================================
--- trunk/gforge/packaging/control/200plugin-contribtracker	2010-02-07 18:06:32 UTC (rev 8734)
+++ trunk/gforge/packaging/control/200plugin-contribtracker	2010-02-07 20:58:02 UTC (rev 8735)
@@ -1,4 +1,4 @@
-Package: @PACKAGE at -plugin-contribtracker
+Package: @OLDPACKAGE at -plugin-contribtracker
 Architecture: all
-Depends: @PACKAGE at -common (>= 4.6.99), @PACKAGE at -db-postgresql (>= 4.6.99) | @PACKAGE at -db, @PACKAGE at -web-apache2 (>= 4.6.99) | @PACKAGE at -web, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>= 4.6.99), @OLDPACKAGE at -db-postgresql (>= 4.6.99) | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 (>= 4.6.99) | @OLDPACKAGE at -web, ${misc:Depends}
 Description: Contribution tracker plugin for FusionForge




More information about the Fusionforge-commits mailing list