[Fusionforge-commits] r7237 - in trunk/gforge: . backend contrib contrib/autoconf cron.d deb-specific deb-specific/scmcvs/cronjobs deb-specific/scmsvn/cronjobs debian debian/po docs docs/docbook/docbook/installation_guide etc etc/httpd.d etc/templates plugins/cvstracker plugins/cvstracker/rpm-specific/cron.d plugins/eirc/bin plugins/externalsearch/bin plugins/fckeditor plugins/ldapextauth plugins/ldapextauth/bin plugins/mediawiki/bin plugins/quota_management/cronjobs plugins/scmccase plugins/svntracker plugins/svntracker/rpm-specific/cron.d rpm-specific/conf utils utils/ldap utils/underworld-dummy

Christian Bayle cbayle at libremir.placard.fr.eu.org
Tue Mar 24 19:28:49 CET 2009


Author: cbayle
Date: 2009-03-24 19:28:48 +0100 (Tue, 24 Mar 2009)
New Revision: 7237

Removed:
   trunk/gforge/debian/gforge-web-apache2.dirs
Modified:
   trunk/gforge/INSTALL.restricted
   trunk/gforge/backend/DatabaseDump.pl
   trunk/gforge/contrib/autoconf/configure
   trunk/gforge/contrib/autoconf/configure.ac
   trunk/gforge/contrib/incremental_backup.patch
   trunk/gforge/cron.d/dns-bind9
   trunk/gforge/cron.d/ftp-proftpd
   trunk/gforge/cron.d/lists-mailman
   trunk/gforge/cron.d/shell-postgresql
   trunk/gforge/cron.d/web-apache2
   trunk/gforge/deb-specific/create-mailing-lists.pl
   trunk/gforge/deb-specific/create-vhosts.sh
   trunk/gforge/deb-specific/db-convert-to-unicode.pl
   trunk/gforge/deb-specific/db-upgrade.pl
   trunk/gforge/deb-specific/dns_conf.pl
   trunk/gforge/deb-specific/fileforge.pl
   trunk/gforge/deb-specific/fix-mailing-lists.pl
   trunk/gforge/deb-specific/get_news_notapproved.pl
   trunk/gforge/deb-specific/gforge-config
   trunk/gforge/deb-specific/gforge-inject.pl
   trunk/gforge/deb-specific/group_dump_update.pl
   trunk/gforge/deb-specific/install-db.sh
   trunk/gforge/deb-specific/install-dns.sh
   trunk/gforge/deb-specific/install-ldap.sh
   trunk/gforge/deb-specific/prepare-vhosts-file.pl
   trunk/gforge/deb-specific/register-plugin
   trunk/gforge/deb-specific/register-theme
   trunk/gforge/deb-specific/scmcvs/cronjobs/cvs-stats.pl
   trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_dump.pl
   trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_update.pl
   trunk/gforge/deb-specific/scmsvn/cronjobs/svn_dump.pl
   trunk/gforge/deb-specific/scmsvn/cronjobs/svn_update.pl
   trunk/gforge/deb-specific/sf-add-skill
   trunk/gforge/deb-specific/ssh_dump_update.pl
   trunk/gforge/deb-specific/stats_cvs.pl
   trunk/gforge/deb-specific/stats_projects_logparse.pl
   trunk/gforge/deb-specific/unregister-plugin
   trunk/gforge/deb-specific/unregister-theme
   trunk/gforge/deb-specific/update-user-group-ssh.sh
   trunk/gforge/deb-specific/user_dump_update.pl
   trunk/gforge/debian/README.Debian
   trunk/gforge/debian/changelog
   trunk/gforge/debian/gforge-config.sgml
   trunk/gforge/debian/gforge-db-postgresql.postinst.dsfh-in
   trunk/gforge/debian/gforge-db-postgresql.prerm
   trunk/gforge/debian/gforge-dns-bind9.postinst
   trunk/gforge/debian/gforge-dns-bind9.prerm
   trunk/gforge/debian/gforge-ftp-proftpd.postinst
   trunk/gforge/debian/gforge-ftp-proftpd.prerm
   trunk/gforge/debian/gforge-lists-mailman.postinst
   trunk/gforge/debian/gforge-mta-exim4.postinst
   trunk/gforge/debian/gforge-mta-exim4.prerm
   trunk/gforge/debian/gforge-mta-postfix.postinst
   trunk/gforge/debian/gforge-mta-postfix.prerm
   trunk/gforge/debian/gforge-plugin-mediawiki.postinst
   trunk/gforge/debian/gforge-plugin-mediawiki.prerm
   trunk/gforge/debian/gforge-plugin-scmcvs.postinst
   trunk/gforge/debian/gforge-plugin-scmcvs.prerm
   trunk/gforge/debian/gforge-plugin-scmsvn.postinst
   trunk/gforge/debian/gforge-plugin-scmsvn.prerm
   trunk/gforge/debian/gforge-shell-postgresql.postinst
   trunk/gforge/debian/gforge-shell-postgresql.prerm
   trunk/gforge/debian/gforge-web-apache2.postinst.dsfh-in
   trunk/gforge/debian/po/cs.po
   trunk/gforge/debian/po/fi.po
   trunk/gforge/debian/po/gl.po
   trunk/gforge/debian/po/nl.po
   trunk/gforge/debian/po/pt.po
   trunk/gforge/debian/po/ru.po
   trunk/gforge/debian/po/vi.po
   trunk/gforge/debian/rules
   trunk/gforge/docs/README.KnownBugs
   trunk/gforge/docs/README.Plugins
   trunk/gforge/docs/docbook/docbook/installation_guide/installation_guide.xml
   trunk/gforge/docs/migrating-to-gforge-REPORT.txt
   trunk/gforge/etc/gforge.conf.example
   trunk/gforge/etc/httpd.conf.example
   trunk/gforge/etc/httpd.d/06maindirhttp
   trunk/gforge/etc/httpd.d/07maindirhttp.ssl
   trunk/gforge/etc/local.pl.example
   trunk/gforge/etc/templates/local.pl
   trunk/gforge/plugins/cvstracker/Makefile
   trunk/gforge/plugins/cvstracker/rpm-specific/cron.d/gforge-plugin-cvstracker
   trunk/gforge/plugins/eirc/bin/db-delete.pl
   trunk/gforge/plugins/externalsearch/bin/db-delete.pl
   trunk/gforge/plugins/externalsearch/bin/db-upgrade.pl
   trunk/gforge/plugins/fckeditor/README
   trunk/gforge/plugins/ldapextauth/README
   trunk/gforge/plugins/ldapextauth/bin/db-delete.pl
   trunk/gforge/plugins/ldapextauth/bin/db-upgrade.pl
   trunk/gforge/plugins/mediawiki/bin/db-delete.pl
   trunk/gforge/plugins/mediawiki/bin/db-upgrade.pl
   trunk/gforge/plugins/quota_management/cronjobs/quota_update.pl
   trunk/gforge/plugins/scmccase/README
   trunk/gforge/plugins/svntracker/README
   trunk/gforge/plugins/svntracker/rpm-specific/cron.d/gforge-plugin-svntracker
   trunk/gforge/rpm-specific/conf/gforge.conf
   trunk/gforge/setup
   trunk/gforge/utils/install-apache.sh
   trunk/gforge/utils/ldap/sql2ldif.pl
   trunk/gforge/utils/underworld-dummy/dns_conf.pl
   trunk/gforge/utils/underworld-dummy/dump_database.pl
   trunk/gforge/utils/underworld-dummy/ssh_dump.pl
Log:
Massive renaming of /usr/lib files to /usr/share


Modified: trunk/gforge/INSTALL.restricted
===================================================================
--- trunk/gforge/INSTALL.restricted	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/INSTALL.restricted	2009-03-24 18:28:48 UTC (rev 7237)
@@ -120,11 +120,11 @@
 and viewcvs.cgi must be in the same location. gforge-install.sh takes care 
 of this step if you have viewvc installed in /opt/viewvc
 
-  Finally, the /usr/lib/gforge/www/plugins/scmsvn/viewcvs/ directory should 
+  Finally, the /usr/share/gforge/www/plugins/scmsvn/viewcvs/ directory should 
 be symlinked to the same location that you installed your viewvc/templates/docroot
 gforge-install.sh takes care of this step if you have viewvc installed in /opt/viewvc
 
-	cd /usr/lib/gforge/www/plugins/scmsvn/
+	cd /usr/share/gforge/www/plugins/scmsvn/
 	ln -s /opt/viewvc/templates/docroot viewcvs
 
 

Modified: trunk/gforge/backend/DatabaseDump.pl
===================================================================
--- trunk/gforge/backend/DatabaseDump.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/backend/DatabaseDump.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -9,7 +9,7 @@
 use Sys::Hostname;
 use POSIX qw(strftime);
 
-require ("/usr/lib/gforge/lib/include.pl") ; 
+require ("/usr/share/gforge/lib/include.pl") ; 
 
 &open_log_file;
 

Modified: trunk/gforge/contrib/autoconf/configure
===================================================================
--- trunk/gforge/contrib/autoconf/configure	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/contrib/autoconf/configure	2009-03-24 18:28:48 UTC (rev 7237)
@@ -1065,7 +1065,7 @@
 			sys_upload_dir=/var/lib/gforge/download/
 
 			TOP_DIR=/usr/share/gforge
-			CGIBIN_DIR=/usr/lib/gforge/cgi-bin
+			CGIBIN_DIR=/usr/share/gforge/cgi-bin
 
 			sys_urlroot=/usr/share/gforge/www/
 			sys_ldap_admin_dn="admin,$LDAP_BASE_DN"

Modified: trunk/gforge/contrib/autoconf/configure.ac
===================================================================
--- trunk/gforge/contrib/autoconf/configure.ac	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/contrib/autoconf/configure.ac	2009-03-24 18:28:48 UTC (rev 7237)
@@ -50,7 +50,7 @@
 			sys_upload_dir=/var/lib/gforge/download/
 
 			TOP_DIR=/usr/share/gforge
-			CGIBIN_DIR=/usr/lib/gforge/cgi-bin
+			CGIBIN_DIR=/usr/share/gforge/cgi-bin
 
 			sys_urlroot=/usr/share/gforge/www/
 			sys_ldap_admin_dn="admin,$LDAP_BASE_DN"

Modified: trunk/gforge/contrib/incremental_backup.patch
===================================================================
--- trunk/gforge/contrib/incremental_backup.patch	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/contrib/incremental_backup.patch	2009-03-24 18:28:48 UTC (rev 7237)
@@ -55,18 +55,18 @@
 @@ -46,3 +46,6 @@
  
  # Hourly update of quotas
- 0 * * * * root [ -x /usr/lib/gforge/bin/quota_update.pl ] && /usr/lib/gforge/bin/quota_update.pl > /dev/null 2>&1
+ 0 * * * * root [ -x /usr/share/gforge/bin/quota_update.pl ] && /usr/share/gforge/bin/quota_update.pl > /dev/null 2>&1
 +
 +# Daily incremental backup to /backup
-+15 23 * * * root [ -x /usr/lib/gforge/bin/gforge-db-backup.sh ] && /usr/lib/gforge/bin/gforge-db-backup.sh > /dev/null 2>&1
++15 23 * * * root [ -x /usr/share/gforge/bin/gforge-db-backup.sh ] && /usr/share/gforge/bin/gforge-db-backup.sh > /dev/null 2>&1
 diff -Naur gforge-4.5.3n7/debian/rules gforge-4.5.3n7-backups/debian/rules
 --- gforge-4.5.3n7/debian/rules	2005-11-21 09:57:21.789406200 +0100
 +++ gforge-4.5.3n7-backups/debian/rules	2005-11-21 10:08:29.533893608 +0100
 @@ -150,6 +150,7 @@
- 	install -m 755 cronjobs/massmail.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
- 	install -m 755 cronjobs/vacuum.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
- 	install -m 755 cronjobs/quota_update.pl $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-+	install -m 755 cronjobs/gforge-db-backup.sh $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
- 	install -m 755 deb-specific/stats_projects_logparse.pl $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
- 	install -m 755 deb-specific/get_news_notapproved.pl $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
- 	install -m 755 deb-specific/install-db.sh $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
+ 	install -m 755 cronjobs/massmail.php $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/
+ 	install -m 755 cronjobs/vacuum.php $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/
+ 	install -m 755 cronjobs/quota_update.pl $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/
++	install -m 755 cronjobs/gforge-db-backup.sh $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/
+ 	install -m 755 deb-specific/stats_projects_logparse.pl $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/
+ 	install -m 755 deb-specific/get_news_notapproved.pl $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/
+ 	install -m 755 deb-specific/install-db.sh $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/bin/

Modified: trunk/gforge/cron.d/dns-bind9
===================================================================
--- trunk/gforge/cron.d/dns-bind9	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/cron.d/dns-bind9	2009-03-24 18:28:48 UTC (rev 7237)
@@ -3,4 +3,4 @@
 #
 
 # DNS Update
-0 * * * * root [ -f /var/lib/gforge/bind/dns.head ] && [ -x /usr/lib/gforge/bin/dns_conf.pl ] && /usr/lib/gforge/bin/dns_conf.pl &&  /usr/sbin/invoke-rc.d --quiet bind9 reload 
+0 * * * * root [ -f /var/lib/gforge/bind/dns.head ] && [ -x /usr/share/gforge/bin/dns_conf.pl ] && /usr/share/gforge/bin/dns_conf.pl &&  /usr/sbin/invoke-rc.d --quiet bind9 reload 

Modified: trunk/gforge/cron.d/ftp-proftpd
===================================================================
--- trunk/gforge/cron.d/ftp-proftpd	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/cron.d/ftp-proftpd	2009-03-24 18:28:48 UTC (rev 7237)
@@ -5,7 +5,7 @@
 INCLUDE_PATH=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www:/usr/share/gforge/common
 
 # FTP update
-0 * * * * root [ -x /usr/lib/gforge/bin/install-ftp.sh ] && /usr/lib/gforge/bin/install-ftp.sh update > /dev/null 2>&1
+0 * * * * root [ -x /usr/share/gforge/bin/install-ftp.sh ] && /usr/share/gforge/bin/install-ftp.sh update > /dev/null 2>&1
 
 # create and mount project directory in user's home directory
-0 * * * * root [ -x /usr/lib/gforge/bin/ftp_create_group_access.php ] && /usr/bin/php5 -d include_path=$INCLUDE_PATH /usr/lib/gforge/bin/ftp_create_group_access.php > /dev/null 2>&1
+0 * * * * root [ -x /usr/share/gforge/bin/ftp_create_group_access.php ] && /usr/bin/php5 -d include_path=$INCLUDE_PATH /usr/share/gforge/bin/ftp_create_group_access.php > /dev/null 2>&1

Modified: trunk/gforge/cron.d/lists-mailman
===================================================================
--- trunk/gforge/cron.d/lists-mailman	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/cron.d/lists-mailman	2009-03-24 18:28:48 UTC (rev 7237)
@@ -3,4 +3,4 @@
 #
 
 # Mailing-list creation
-55 * * * * root [ -x /usr/lib/gforge/bin/create-mailing-lists.pl ] && /usr/lib/gforge/bin/create-mailing-lists.pl > /dev/null 2>&1
+55 * * * * root [ -x /usr/share/gforge/bin/create-mailing-lists.pl ] && /usr/share/gforge/bin/create-mailing-lists.pl > /dev/null 2>&1

Modified: trunk/gforge/cron.d/shell-postgresql
===================================================================
--- trunk/gforge/cron.d/shell-postgresql	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/cron.d/shell-postgresql	2009-03-24 18:28:48 UTC (rev 7237)
@@ -3,4 +3,4 @@
 #
 
 # SCM/user/group update
-0 * * * * root [ -x /usr/lib/gforge/bin/update-user-group-ssh.sh ] && /usr/lib/gforge/bin/update-user-group-ssh.sh > /dev/null 2>&1
+0 * * * * root [ -x /usr/share/gforge/bin/update-user-group-ssh.sh ] && /usr/share/gforge/bin/update-user-group-ssh.sh > /dev/null 2>&1

Modified: trunk/gforge/cron.d/web-apache2
===================================================================
--- trunk/gforge/cron.d/web-apache2	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/cron.d/web-apache2	2009-03-24 18:28:48 UTC (rev 7237)
@@ -6,4 +6,4 @@
 25 * * * * root [ -d /var/cache/gforge ] && find /var/cache/gforge/ -type f -and -cmin +60 -exec /bin/rm -f "{}" \; > /dev/null 2>&1
 
 # Enable the virtual hosts
-37 7,19 * * * root [ -x /usr/lib/gforge/bin/create-vhosts.sh ] && /usr/lib/gforge/bin/create-vhosts.sh > /dev/null 2>&1
+37 7,19 * * * root [ -x /usr/share/gforge/bin/create-vhosts.sh ] && /usr/share/gforge/bin/create-vhosts.sh > /dev/null 2>&1

Modified: trunk/gforge/deb-specific/create-mailing-lists.pl
===================================================================
--- trunk/gforge/deb-specific/create-mailing-lists.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/create-mailing-lists.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -16,7 +16,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined functions 
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions 
 require ("/etc/gforge/local.pl") ;
 
 &db_connect ;

Modified: trunk/gforge/deb-specific/create-vhosts.sh
===================================================================
--- trunk/gforge/deb-specific/create-vhosts.sh	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/create-vhosts.sh	2009-03-24 18:28:48 UTC (rev 7237)
@@ -2,9 +2,9 @@
 
 set -e
 
-su -s /bin/sh gforge -c /usr/lib/gforge/bin/prepare-vhosts-file.pl
+su -s /bin/sh gforge -c /usr/share/gforge/bin/prepare-vhosts-file.pl
 [ -f /var/lib/gforge/etc/templates/httpd.vhosts ] && \
-	/usr/lib/gforge/bin/fill-in-the-blanks.pl \
+	/usr/share/gforge/bin/fill-in-the-blanks.pl \
 		/var/lib/gforge/etc/templates/httpd.vhosts \
 		/var/lib/gforge/etc/httpd.vhosts \
 		/etc/gforge/gforge.conf

Modified: trunk/gforge/deb-specific/db-convert-to-unicode.pl
===================================================================
--- trunk/gforge/deb-specific/db-convert-to-unicode.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/db-convert-to-unicode.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -23,8 +23,8 @@
 sub debug ( $ ) ;
 sub convert_column_to_charset ( $$$$$ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;

Modified: trunk/gforge/deb-specific/db-upgrade.pl
===================================================================
--- trunk/gforge/deb-specific/db-upgrade.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/db-upgrade.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -24,8 +24,8 @@
     $skill_list $libdir $sqldir/ ;
 
 require ("/etc/gforge/local.pl") ; 
-$libdir="/usr/lib/gforge/lib";
-$sqldir="/usr/lib/gforge/db";
+$libdir="/usr/share/gforge/lib";
+$sqldir="/usr/share/gforge/db";
 require ("$libdir/sqlparser.pm") ; # Our magic SQL parser
 require ("$libdir/sqlhelper.pm") ; # Our SQL functions
 require ("$libdir/include.pl");  # Some other functions
@@ -2059,9 +2059,9 @@
 #
 # We got this at upgrade
 #
-#DBD::Pg::st execute failed: ERREUR:  la relation avec l'OID 387345 n'existe pas at /usr/lib/gforge/bin/db-upgrade.pl line 1970.
-#Transaction aborted because DBD::Pg::st execute failed: ERREUR:  la relation avec l'OID 387345 n'existe pas at /usr/lib/gforge/bin/db-upgrade.pl line 1970.
-#Transaction aborted because DBD::Pg::st execute failed: ERREUR:  la relation avec l'OID 387345 n'existe pas at /usr/lib/gforge/bin/db-upgrade.pl line 1970.
+#DBD::Pg::st execute failed: ERREUR:  la relation avec l'OID 387345 n'existe pas at /usr/share/gforge/bin/db-upgrade.pl line 1970.
+#Transaction aborted because DBD::Pg::st execute failed: ERREUR:  la relation avec l'OID 387345 n'existe pas at /usr/share/gforge/bin/db-upgrade.pl line 1970.
+#Transaction aborted because DBD::Pg::st execute failed: ERREUR:  la relation avec l'OID 387345 n'existe pas at /usr/share/gforge/bin/db-upgrade.pl line 1970.
 #Last SQL query was:
 #update project_task SET last_modified_date=EXTRACT(EPOCH FROM now())::integer;
 #(end of query)

Modified: trunk/gforge/deb-specific/dns_conf.pl
===================================================================
--- trunk/gforge/deb-specific/dns_conf.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/dns_conf.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -3,7 +3,7 @@
 use DBI;
 use POSIX qw(strftime);
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 &db_connect;
 

Modified: trunk/gforge/deb-specific/fileforge.pl
===================================================================
--- trunk/gforge/deb-specific/fileforge.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/fileforge.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -23,19 +23,19 @@
 
 # Check which mode we're in
 # Normal fileforge
-if ($0 eq "/usr/lib/gforge/bin/fileforge.pl") {
+if ($0 eq "/usr/share/gforge/bin/fileforge.pl") {
     &fileforge ;
     exit 0 ;
 }
 # Temporary moving of files (for quick release system)
-if ($0 eq "/usr/lib/gforge/bin/tmpfilemove.pl") {
+if ($0 eq "/usr/share/gforge/bin/tmpfilemove.pl") {
     &tmpfilemove ;
     exit 0 ;
 }
 # If we're not in one of these two modes, then fail
 print STDERR "You must call this script as one of:
-* /usr/lib/gforge/bin/fileforge.pl (normal execution)
-* /usr/lib/gforge/bin/tmpfilemove.pl (for QRS)" ;
+* /usr/share/gforge/bin/fileforge.pl (normal execution)
+* /usr/share/gforge/bin/tmpfilemove.pl (for QRS)" ;
 die "Unauthorized invocation '$0'" ;
 
 sub fileforge {

Modified: trunk/gforge/deb-specific/fix-mailing-lists.pl
===================================================================
--- trunk/gforge/deb-specific/fix-mailing-lists.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/fix-mailing-lists.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -15,7 +15,7 @@
 sub debug ( $ ) ;
 
 require ("/etc/gforge/local.pl") ;
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 &db_connect ;
 

Modified: trunk/gforge/deb-specific/get_news_notapproved.pl
===================================================================
--- trunk/gforge/deb-specific/get_news_notapproved.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/get_news_notapproved.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -14,7 +14,7 @@
 
 use strict;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all predefined functions
 
 use vars qw/ $server_admin $sys_name $sys_default_domain /;
 

Modified: trunk/gforge/deb-specific/gforge-config
===================================================================
--- trunk/gforge/deb-specific/gforge-config	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/gforge-config	2009-03-24 18:28:48 UTC (rev 7237)
@@ -9,9 +9,9 @@
 [ -f /etc/default/apache2 ] && . /etc/default/apache2
 if [ "x$NO_START" = "x0" ]
 then
-	/usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system pgsql -nolisten80
+	/usr/share/gforge/bin/setup -fhs -noapache -dovhost -system pgsql -nolisten80
 else
-	/usr/lib/gforge/bin/setup -fhs -noapache -dovhost -system pgsql -listen80
+	/usr/share/gforge/bin/setup -fhs -noapache -dovhost -system pgsql -listen80
 fi	
 
 [ -f /etc/gforge/local.inc ] && chmod 644 /etc/gforge/local.inc

Modified: trunk/gforge/deb-specific/gforge-inject.pl
===================================================================
--- trunk/gforge/deb-specific/gforge-inject.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/gforge-inject.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,7 +26,7 @@
     $skill_list/ ;
 
 sub debug ( $ ) ;
-require ("/usr/lib/gforge/lib/include.pl") ;
+require ("/usr/share/gforge/lib/include.pl") ;
 
 ###
 # Local customisation

Modified: trunk/gforge/deb-specific/group_dump_update.pl
===================================================================
--- trunk/gforge/deb-specific/group_dump_update.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/group_dump_update.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,7 +8,7 @@
 my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwnam("gforge");
 $> = $uid;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 my $verbose = 0;
 my $user_array = ();
@@ -100,11 +100,11 @@
         if ($is_public) {
             $default_perms = 2775 ;
             $file_default_perms = 664;
-	    $default_page = "/usr/lib/gforge/lib/default_page.php" ;
+	    $default_page = "/usr/share/gforge/lib/default_page.php" ;
         } else {
             $default_perms = 2770 ;
             $file_default_perms = 660;
-	    $default_page = "/usr/lib/gforge/lib/private_default_page.php" ;
+	    $default_page = "/usr/share/gforge/lib/private_default_page.php" ;
         }
 	
 	if ($verbose) {print("Making a Group for : $gname\n")};

Modified: trunk/gforge/deb-specific/install-db.sh
===================================================================
--- trunk/gforge/deb-specific/install-db.sh	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/install-db.sh	2009-03-24 18:28:48 UTC (rev 7237)
@@ -188,7 +188,7 @@
 	fi
 
 	# Install/upgrade the database contents (tables and data)
-	su -s /bin/sh gforge -c /usr/lib/gforge/bin/db-upgrade.pl 2>&1  | grep -v ^NOTICE:
+	su -s /bin/sh gforge -c /usr/share/gforge/bin/db-upgrade.pl 2>&1  | grep -v ^NOTICE:
 	p=${PIPESTATUS[0]}
 	if [ $p != 0 ] ; then
 	    exit $p

Modified: trunk/gforge/deb-specific/install-dns.sh
===================================================================
--- trunk/gforge/deb-specific/install-dns.sh	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/install-dns.sh	2009-03-24 18:28:48 UTC (rev 7237)
@@ -41,7 +41,7 @@
 	    cp /var/lib/gforge/bind/dns.head /var/lib/gforge/bind/dns.zone
 	    chown -R gforge:gforge /var/lib/gforge/bind
 
-	    /usr/lib/gforge/bin/dns_conf.pl
+	    /usr/share/gforge/bin/dns_conf.pl
 	else
             [ -f /var/lib/gforge/bind/dns.head ] && echo "Removing /var/lib/gforge/bind/dns.head" && \
 	    rm /var/lib/gforge/bind/dns.head

Modified: trunk/gforge/deb-specific/install-ldap.sh
===================================================================
--- trunk/gforge/deb-specific/install-ldap.sh	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/install-ldap.sh	2009-03-24 18:28:48 UTC (rev 7237)
@@ -358,7 +358,7 @@
     tmpldifadd=$(mktemp $tmpfile_pattern)
     tmpldifmod=$(mktemp $tmpfile_pattern)
     dc=$(echo $gforge_base_dn | cut -d, -f1 | cut -d= -f2)
-    su -s /bin/sh gforge -c /usr/lib/gforge/bin/sql2ldif.pl >> $tmpldif
+    su -s /bin/sh gforge -c /usr/share/gforge/bin/sql2ldif.pl >> $tmpldif
     # echo "Filling LDAP with database"
     if ! eval "ldapadd -r -c -D '$robot_dn' -x -w'$robot_passwd' -f $tmpldif > $tmpldifadd 2>&1" ; then
         # Some entries could not be added (already there)
@@ -590,13 +590,13 @@
 	admin_regexp="^cn=admin, *$admin_regexp"
 	get_our_entries () {
 	    {		# List candidates...
-		/usr/lib/gforge/bin/sql2ldif.pl \
+		/usr/share/gforge/bin/sql2ldif.pl \
 		    | grep "^dn:" \
 		    | sed 's/^dn: *//' \
 		    | grep -v "^dc=" \
 		    | grep -v "^ou=" \
 		    | grep -v "$admin_regexp"
-		/usr/lib/gforge/bin/sql2ldif.pl \
+		/usr/share/gforge/bin/sql2ldif.pl \
 		    | grep "^dn:" \
 		    | sed 's/^dn: *//' \
 		    | grep -v "^dc=" \

Modified: trunk/gforge/deb-specific/prepare-vhosts-file.pl
===================================================================
--- trunk/gforge/deb-specific/prepare-vhosts-file.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/prepare-vhosts-file.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -6,7 +6,7 @@
 use vars qw/$dbh $ifile $ofile @ilist %hash $key $val $cur $line $dbh $sys_dbname $sys_dbuser $sys_dbpasswd $token/ ;
 
 require("/etc/gforge/local.pl"); 
-require ("/usr/lib/gforge/lib/include.pl") ; 
+require ("/usr/share/gforge/lib/include.pl") ; 
 
 %hash = () ;
 

Modified: trunk/gforge/deb-specific/register-plugin
===================================================================
--- trunk/gforge/deb-specific/register-plugin	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/register-plugin	2009-03-24 18:28:48 UTC (rev 7237)
@@ -10,7 +10,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined functions
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions
 
 &db_connect ;
 

Modified: trunk/gforge/deb-specific/register-theme
===================================================================
--- trunk/gforge/deb-specific/register-theme	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/register-theme	2009-03-24 18:28:48 UTC (rev 7237)
@@ -10,7 +10,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined functions 
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions 
 
 &db_connect ;
 

Modified: trunk/gforge/deb-specific/scmcvs/cronjobs/cvs-stats.pl
===================================================================
--- trunk/gforge/deb-specific/scmcvs/cronjobs/cvs-stats.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/scmcvs/cronjobs/cvs-stats.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -14,7 +14,7 @@
 
 # For the database
 use DBI;
-require("/usr/lib/gforge/lib/include.pl");
+require("/usr/share/gforge/lib/include.pl");
 my $cvsroot = "/var/lib/gforge/chroot/cvsroot";
 my $verbose = 1;
 $|=0 if $verbose;

Modified: trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_dump.pl
===================================================================
--- trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_dump.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_dump.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,7 +8,7 @@
 use Sys::Hostname;
 
 my $scm = 'scmcvs';
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 require("/etc/gforge/plugins/$scm/config.pl"); # Include plugin config vars
 
 my $group_array = ();

Modified: trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_update.pl
===================================================================
--- trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_update.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/scmcvs/cronjobs/cvs_update.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -7,7 +7,7 @@
 use DBI;
 use Sys::Hostname;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 my $group_array = ();
 my $verbose = 0;

Modified: trunk/gforge/deb-specific/scmsvn/cronjobs/svn_dump.pl
===================================================================
--- trunk/gforge/deb-specific/scmsvn/cronjobs/svn_dump.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/scmsvn/cronjobs/svn_dump.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,7 +8,7 @@
 use Sys::Hostname;
 
 my $scm = 'scmsvn';
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 require("/etc/gforge/plugins/$scm/config.pl"); # Include plugin config vars
 
 my $group_array = ();

Modified: trunk/gforge/deb-specific/scmsvn/cronjobs/svn_update.pl
===================================================================
--- trunk/gforge/deb-specific/scmsvn/cronjobs/svn_update.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/scmsvn/cronjobs/svn_update.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,7 +8,7 @@
 use DBI;
 use Sys::Hostname;
 
-require("/usr/lib/gforge/lib/include.pl"); # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl"); # Include all the predefined functions
 
 my $group_array = ();
 my $verbose = 0;

Modified: trunk/gforge/deb-specific/sf-add-skill
===================================================================
--- trunk/gforge/deb-specific/sf-add-skill	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/sf-add-skill	2009-03-24 18:28:48 UTC (rev 7237)
@@ -12,7 +12,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined functions 
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions 
 
 &db_connect ;
 

Modified: trunk/gforge/deb-specific/ssh_dump_update.pl
===================================================================
--- trunk/gforge/deb-specific/ssh_dump_update.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/ssh_dump_update.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,7 +8,7 @@
 my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwnam("gforge");
 $> = $uid;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 my $verbose=0;
 my $ssh_array = ();

Modified: trunk/gforge/deb-specific/stats_cvs.pl
===================================================================
--- trunk/gforge/deb-specific/stats_cvs.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/stats_cvs.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -13,7 +13,7 @@
 
 # For the database
 use DBI;
-require("/usr/lib/gforge/lib/include.pl");
+require("/usr/share/gforge/lib/include.pl");
 my $cvsroot = "/var/lib/gforge/chroot/cvsroot";
 my $verbose = 1;
 $|=0 if $verbose;

Modified: trunk/gforge/deb-specific/stats_projects_logparse.pl
===================================================================
--- trunk/gforge/deb-specific/stats_projects_logparse.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/stats_projects_logparse.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -7,7 +7,7 @@
 use DBI;
 use Time::Local;
 use POSIX qw( strftime );
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 #######################
 ##  CONF VARS

Modified: trunk/gforge/deb-specific/unregister-plugin
===================================================================
--- trunk/gforge/deb-specific/unregister-plugin	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/unregister-plugin	2009-03-24 18:28:48 UTC (rev 7237)
@@ -10,7 +10,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined functions
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions
 
 &db_connect ;
 

Modified: trunk/gforge/deb-specific/unregister-theme
===================================================================
--- trunk/gforge/deb-specific/unregister-theme	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/unregister-theme	2009-03-24 18:28:48 UTC (rev 7237)
@@ -10,7 +10,7 @@
 
 sub debug ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include all the predefined functions 
+require ("/usr/share/gforge/lib/include.pl") ; # Include all the predefined functions 
 
 &db_connect ;
 

Modified: trunk/gforge/deb-specific/update-user-group-ssh.sh
===================================================================
--- trunk/gforge/deb-specific/update-user-group-ssh.sh	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/update-user-group-ssh.sh	2009-03-24 18:28:48 UTC (rev 7237)
@@ -17,25 +17,25 @@
 	# Should be safe to comment this soon
 	# Be sure the system user are created before creating homes
 	# when using nss-ldap
-#	[ -x /usr/lib/gforge/bin/install-ldap.sh ] && \
-#		/usr/lib/gforge/bin/install-ldap.sh update > /dev/null 2>&1
+#	[ -x /usr/share/gforge/bin/install-ldap.sh ] && \
+#		/usr/share/gforge/bin/install-ldap.sh update > /dev/null 2>&1
 
 	[ -d /var/lib/gforge/dumps ] || \
 	mkdir /var/lib/gforge/dumps && \
 	chown gforge:gforge /var/lib/gforge/dumps
 
-	/usr/lib/gforge/bin/user_dump_update.pl
-	/usr/lib/gforge/bin/group_dump_update.pl
-	/usr/lib/gforge/bin/ssh_dump_update.pl
-	#[ -f /usr/lib/gforge/bin/cvs_dump.pl ] && su -s /bin/sh gforge -c /usr/lib/gforge/bin/cvs_dump.pl || true
-	#[ -f /usr/lib/gforge/bin/cvs_update.pl ] && /usr/lib/gforge/bin/cvs_update.pl || true
+	/usr/share/gforge/bin/user_dump_update.pl
+	/usr/share/gforge/bin/group_dump_update.pl
+	/usr/share/gforge/bin/ssh_dump_update.pl
+	#[ -f /usr/share/gforge/bin/cvs_dump.pl ] && su -s /bin/sh gforge -c /usr/share/gforge/bin/cvs_dump.pl || true
+	#[ -f /usr/share/gforge/bin/cvs_update.pl ] && /usr/share/gforge/bin/cvs_update.pl || true
 
-	#CB#su gforge -c /usr/lib/gforge/bin/dump_database.pl -s /bin/sh
-	#CB#su gforge -c /usr/lib/gforge/bin/ssh_dump.pl -s /bin/sh
+	#CB#su gforge -c /usr/share/gforge/bin/dump_database.pl -s /bin/sh
+	#CB#su gforge -c /usr/share/gforge/bin/ssh_dump.pl -s /bin/sh
 
 	# Create user, groups and cvs archives
-	#CB#/usr/lib/gforge/bin/new_parse.pl
+	#CB#/usr/share/gforge/bin/new_parse.pl
 
 	# Fill ssh authorized_keys
-	#CB#/usr/lib/gforge/bin/ssh_create.pl
+	#CB#/usr/share/gforge/bin/ssh_create.pl
 fi

Modified: trunk/gforge/deb-specific/user_dump_update.pl
===================================================================
--- trunk/gforge/deb-specific/user_dump_update.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/deb-specific/user_dump_update.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,7 +8,7 @@
 my($name,$passwd,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwnam("gforge");
 $> = $uid;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 my $verbose = 0;
 my $user_array = ();

Modified: trunk/gforge/debian/README.Debian
===================================================================
--- trunk/gforge/debian/README.Debian	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/README.Debian	2009-03-24 18:28:48 UTC (rev 7237)
@@ -88,7 +88,7 @@
   If you need to add skills to the database after installation, you
 can use the sf-add-skill script.  Give it a skill (or a list of
 skills) and it'll insert it into the databse.  This script is located
-in /usr/lib/gforge/bin/.
+in /usr/share/gforge/bin/.
 
   For cvs to work you have to add a symlink doing
 ln -s /var/lib/gforge/chroot/cvsroot /cvsroot.

Modified: trunk/gforge/debian/changelog
===================================================================
--- trunk/gforge/debian/changelog	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/changelog	2009-03-24 18:28:48 UTC (rev 7237)
@@ -1,5 +1,14 @@
-gforge (4.7.2.99.1-1) experimental; urgency=low
+gforge (4.7.2.50-2) experimental; urgency=low
 
+  * Removed all files from /usr/lib/gforge and put them in /usr/share/gforge
+  * cron scripts ar now in /usr/share/gforge/cronjobs
+  * Now generate *.cron.d *.dirs *.install from cron.d/dirs/install dirs
+  * Use dh_install instead of copy in rules
+
+ -- Christian Bayle <bayle at debian.org>  Tue, 24 Mar 2009 00:38:26 +0100
+
+gforge (4.7.1.99.2-1) experimental; urgency=low
+
   * New package: gforge-plugin-scmbzr (not complete yet!).
 
  -- Roland Mas <lolando at debian.org>  Thu, 05 Feb 2009 22:14:45 +0100

Modified: trunk/gforge/debian/gforge-config.sgml
===================================================================
--- trunk/gforge/debian/gforge-config.sgml	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-config.sgml	2009-03-24 18:28:48 UTC (rev 7237)
@@ -63,7 +63,7 @@
     <para><command>&dhpackage;</command> replaces (or creates) the
       configuration files found in /etc/gforge with appropriate
       files derived from standard fill-in-the-blank templates (found
-      in /usr/lib/gforge/templates).  The values used to fill in
+      in /usr/share/gforge/templates).  The values used to fill in
       the blanks are taken from /etc/gforge.conf.
     </para>
 

Modified: trunk/gforge/debian/gforge-db-postgresql.postinst.dsfh-in
===================================================================
--- trunk/gforge/debian/gforge-db-postgresql.postinst.dsfh-in	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-db-postgresql.postinst.dsfh-in	2009-03-24 18:28:48 UTC (rev 7237)
@@ -59,7 +59,7 @@
 	gforge-config
 
         # Patch DB configuration files
-	/usr/lib/gforge/bin/install-db.sh configure-files
+	/usr/share/gforge/bin/install-db.sh configure-files
 	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf.gforge-new ${pg_hba_dir}/pg_hba.conf
 	rm ${pg_hba_dir}/pg_hba.conf.gforge-new
 
@@ -68,7 +68,7 @@
 	invoke-rc.d ${pg_name} reload
 
         # Setup our DB
-	/usr/lib/gforge/bin/install-db.sh configure
+	/usr/share/gforge/bin/install-db.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/gforge-db-postgresql.prerm
===================================================================
--- trunk/gforge/debian/gforge-db-postgresql.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-db-postgresql.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -46,10 +46,10 @@
 case "$1" in
     remove)
         # Remove our database
-	/usr/lib/gforge/bin/install-db.sh purge
+	/usr/share/gforge/bin/install-db.sh purge
 
         # Unpatch DB configuration files
-	/usr/lib/gforge/bin/install-db.sh purge-files
+	/usr/share/gforge/bin/install-db.sh purge-files
 	ucf --debconf-ok ${pg_hba_dir}/pg_hba.conf.gforge-new ${pg_hba_dir}/pg_hba.conf
 	rm ${pg_hba_dir}/pg_hba.conf.gforge-new
 	ucf --purge ${pg_hba_dir}/pg_hba.conf

Modified: trunk/gforge/debian/gforge-dns-bind9.postinst
===================================================================
--- trunk/gforge/debian/gforge-dns-bind9.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-dns-bind9.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -30,12 +30,12 @@
 	gforge-config
 
 	# Patch Bind configuration files
-	/usr/lib/gforge/bin/install-dns.sh configure-files
+	/usr/share/gforge/bin/install-dns.sh configure-files
 	ucf --debconf-ok /etc/bind/named.conf.gforge-new /etc/bind/named.conf
 	rm /etc/bind/named.conf.gforge-new
 
 	# Create the DNS zone
-	/usr/lib/gforge/bin/install-dns.sh configure
+	/usr/share/gforge/bin/install-dns.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/gforge-dns-bind9.prerm
===================================================================
--- trunk/gforge/debian/gforge-dns-bind9.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-dns-bind9.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -23,7 +23,7 @@
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Bind configuration files
-	/usr/lib/gforge/bin/install-dns.sh purge-files
+	/usr/share/gforge/bin/install-dns.sh purge-files
 	ucf --debconf-ok /etc/bind/named.conf.gforge-new /etc/bind/named.conf
 	rm /etc/bind/named.conf.gforge-new
 	ucf --purge /etc/bind/named.conf
@@ -32,7 +32,7 @@
 	db_stop
 
         # DNS config removal
-	/usr/lib/gforge/bin/install-dns.sh purge
+	/usr/share/gforge/bin/install-dns.sh purge
 
 	;;
     upgrade|deconfigure|failed-upgrade)

Modified: trunk/gforge/debian/gforge-ftp-proftpd.postinst
===================================================================
--- trunk/gforge/debian/gforge-ftp-proftpd.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-ftp-proftpd.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -30,7 +30,7 @@
 	gforge-config
 
         # Patch Proftpd configuration files
-	/usr/lib/gforge/bin/install-ftp.sh configure-files
+	/usr/share/gforge/bin/install-ftp.sh configure-files
 	if [ -f /etc/proftpd/proftpd.conf.gforge-new ]
 	then
 		ucf --debconf-ok /etc/proftpd/proftpd.conf.gforge-new /etc/proftpd/proftpd.conf
@@ -38,7 +38,7 @@
 	fi
 
         # Setup our FTP
-	/usr/lib/gforge/bin/install-ftp.sh configure 
+	/usr/share/gforge/bin/install-ftp.sh configure 
 
         # Setup our FRS
 	chown www-data:www-data /var/lib/gforge/download

Modified: trunk/gforge/debian/gforge-ftp-proftpd.prerm
===================================================================
--- trunk/gforge/debian/gforge-ftp-proftpd.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-ftp-proftpd.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,7 @@
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Proftpd configuration files
-	/usr/lib/gforge/bin/install-ftp.sh purge-files
+	/usr/share/gforge/bin/install-ftp.sh purge-files
 	ucf --debconf-ok /etc/proftpd/proftpd.conf.gforge-new /etc/proftpd/proftpd.conf
 	rm /etc/proftpd/proftpd.conf.gforge-new
 	ucf --purge /etc/proftpd/proftpd.conf
@@ -31,7 +31,7 @@
 	db_stop
 
         # FTP config removal
-	/usr/lib/gforge/bin/install-ftp.sh purge
+	/usr/share/gforge/bin/install-ftp.sh purge
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/gforge-lists-mailman.postinst
===================================================================
--- trunk/gforge/debian/gforge-lists-mailman.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-lists-mailman.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -31,7 +31,7 @@
 	
 	echo "Fixing past damage in mailing-lists..."
 	if [ -z "$2" ] || dpkg --compare-versions $2 le 3rc2-4 ; then
-	    su -s /bin/sh gforge -c /usr/lib/gforge/bin/fix-mailing-lists.pl
+	    su -s /bin/sh gforge -c /usr/share/gforge/bin/fix-mailing-lists.pl
 	fi
     ;;
 

Modified: trunk/gforge/debian/gforge-mta-exim4.postinst
===================================================================
--- trunk/gforge/debian/gforge-mta-exim4.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-mta-exim4.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -30,7 +30,7 @@
 
 	gforge-config
         # Patch Exim configuration files
-	/usr/lib/gforge/bin/install-exim4.sh configure-files
+	/usr/share/gforge/bin/install-exim4.sh configure-files
 	if [ -f /etc/aliases.gforge-new ]
 	then
 		ucf --debconf-ok /etc/aliases.gforge-new /etc/aliases

Modified: trunk/gforge/debian/gforge-mta-exim4.prerm
===================================================================
--- trunk/gforge/debian/gforge-mta-exim4.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-mta-exim4.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,7 @@
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Exim configuration files
-	/usr/lib/gforge/bin/install-exim4.sh purge-files
+	/usr/share/gforge/bin/install-exim4.sh purge-files
 	ucf --debconf-ok /etc/aliases.gforge-new /etc/aliases
 	if [ -f /etc/exim4/exim4.conf.gforge-new ]
 	then
@@ -43,7 +43,7 @@
 	db_stop
 
         # Exim config removal
-	/usr/lib/gforge/bin/install-exim4.sh purge
+	/usr/share/gforge/bin/install-exim4.sh purge
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/gforge-mta-postfix.postinst
===================================================================
--- trunk/gforge/debian/gforge-mta-postfix.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-mta-postfix.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -30,12 +30,12 @@
 	gforge-config
 
         # Patch Postfix configuration files
-	/usr/lib/gforge/bin/install-postfix.sh configure-files
+	/usr/share/gforge/bin/install-postfix.sh configure-files
 	ucf --debconf-ok /etc/aliases.gforge-new /etc/aliases
 	ucf --debconf-ok /etc/postfix/main.cf.gforge-new /etc/postfix/main.cf
 	rm /etc/aliases.gforge-new
 	rm /etc/postfix/main.cf.gforge-new
-	/usr/lib/gforge/bin/install-postfix.sh configure
+	/usr/share/gforge/bin/install-postfix.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/gforge-mta-postfix.prerm
===================================================================
--- trunk/gforge/debian/gforge-mta-postfix.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-mta-postfix.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,7 @@
 	db_title "Unconfiguring Gforge"
 
 	# Unpatch Postfix configuration files
-	/usr/lib/gforge/bin/install-postfix.sh purge-files
+	/usr/share/gforge/bin/install-postfix.sh purge-files
 	ucf --debconf-ok /etc/aliases.gforge-new /etc/aliases
 	ucf --debconf-ok /etc/postfix/main.cf.gforge-new /etc/postfix/main.cf
 	rm /etc/aliases.gforge-new
@@ -34,7 +34,7 @@
 	db_stop
 
         # Exim config removal
-	/usr/lib/gforge/bin/install-postfix.sh purge
+	/usr/share/gforge/bin/install-postfix.sh purge
 	;;
     upgrade|deconfigure|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/gforge-plugin-mediawiki.postinst
===================================================================
--- trunk/gforge/debian/gforge-plugin-mediawiki.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-plugin-mediawiki.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -25,8 +25,8 @@
 
 case "$1" in
     configure)
-	# /usr/lib/gforge/plugins/mediawiki/bin/db-upgrade.pl
-	/usr/lib/gforge/bin/register-plugin mediawiki "Mediawiki"
+	# /usr/share/gforge/plugins/mediawiki/bin/db-upgrade.pl
+	/usr/share/gforge/bin/register-plugin mediawiki "Mediawiki"
 	gforge-config
 	for flavour in apache apache-perl apache-ssl apache2 ; do
 	    if [ -x /usr/sbin/$flavour ]; then

Modified: trunk/gforge/debian/gforge-plugin-mediawiki.prerm
===================================================================
--- trunk/gforge/debian/gforge-plugin-mediawiki.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-plugin-mediawiki.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -19,9 +19,9 @@
 
 case "$1" in
     remove|deconfigure)
-	/usr/lib/gforge/bin/unregister-plugin mediawiki
+	/usr/share/gforge/bin/unregister-plugin mediawiki
 	invoke-rc.d apache reload
-	# /usr/lib/gforge/plugins/mediawiki/bin/db-delete.pl
+	# /usr/share/gforge/plugins/mediawiki/bin/db-delete.pl
         ;;
     upgrade|failed-upgrade)
         ;;

Modified: trunk/gforge/debian/gforge-plugin-scmcvs.postinst
===================================================================
--- trunk/gforge/debian/gforge-plugin-scmcvs.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-plugin-scmcvs.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -28,7 +28,7 @@
 	gforge-config
 
 	# Prepare database
-	su -s /bin/sh gforge -c '/usr/lib/gforge/bin/register-plugin scmcvs "CVS"'
+	su -s /bin/sh gforge -c '/usr/share/gforge/bin/register-plugin scmcvs "CVS"'
 	test -f /etc/default/apache2 && . /etc/default/apache2
 	if [ "$NO_START" != "0" ]; then
 		if [ -x /usr/sbin/apache ]; then
@@ -40,10 +40,10 @@
 		fi
 	fi
         # Setup our CVS
-	/usr/lib/gforge/plugins/scmcvs/bin/install-cvs.sh configure
+	/usr/share/gforge/plugins/scmcvs/bin/install-cvs.sh configure
 
 	# Making user group and cvs update from database 
-	/usr/lib/gforge/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
+	/usr/share/gforge/plugins/scmcvs/bin/update-user-group-ssh.sh > /dev/null 2>&1
 	rm -f /var/lib/gforge/dumps/*cvs*dump
 	su -s /bin/sh gforge -c /usr/share/gforge/plugins/scmcvs/cronjobs/cvs_dump.pl
 	/usr/share/gforge/plugins/scmcvs/cronjobs/cvs_update.pl

Modified: trunk/gforge/debian/gforge-plugin-scmcvs.prerm
===================================================================
--- trunk/gforge/debian/gforge-plugin-scmcvs.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-plugin-scmcvs.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,7 @@
     remove|deconfigure)
     	if [ -f /var/run/postgresql/.s.PGSQL.5432 ]
 	then
-		/usr/lib/gforge/bin/unregister-plugin scmcvs
+		/usr/share/gforge/bin/unregister-plugin scmcvs
 	else
 		echo "WARNING: GForge database not available to unregister scmcvs plugin"
 	fi

Modified: trunk/gforge/debian/gforge-plugin-scmsvn.postinst
===================================================================
--- trunk/gforge/debian/gforge-plugin-scmsvn.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-plugin-scmsvn.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -28,7 +28,7 @@
 	gforge-config
 
 	# Prepare database
-	su -s /bin/sh gforge -c '/usr/lib/gforge/bin/register-plugin scmsvn "Subversion"'
+	su -s /bin/sh gforge -c '/usr/share/gforge/bin/register-plugin scmsvn "Subversion"'
 	test -f /etc/default/apache2 && . /etc/default/apache2
 	if [ "$NO_START" != "0" ]; then
 		if [ -x /usr/sbin/apache ]; then

Modified: trunk/gforge/debian/gforge-plugin-scmsvn.prerm
===================================================================
--- trunk/gforge/debian/gforge-plugin-scmsvn.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-plugin-scmsvn.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,7 @@
     remove|deconfigure)
 	if [ -f /var/run/postgresql/.s.PGSQL.5432 ]
 	then
-		/usr/lib/gforge/bin/unregister-plugin scmsvn
+		/usr/share/gforge/bin/unregister-plugin scmsvn
 	else
 		echo "WARNING: GForge database not available to unregister scmsvn plugin"
 	fi

Modified: trunk/gforge/debian/gforge-shell-postgresql.postinst
===================================================================
--- trunk/gforge/debian/gforge-shell-postgresql.postinst	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-shell-postgresql.postinst	2009-03-24 18:28:48 UTC (rev 7237)
@@ -30,7 +30,7 @@
 	gforge-config
 
         # Patch NSS configuration files
-	/usr/lib/gforge/bin/install-nsspgsql.sh configure-files
+	/usr/share/gforge/bin/install-nsspgsql.sh configure-files
 	ucf --debconf-ok /etc/nss-pgsql.conf.gforge-new /etc/nss-pgsql.conf
 	ucf --debconf-ok /etc/nss-pgsql-root.conf.gforge-new /etc/nss-pgsql-root.conf
 	ucf --debconf-ok /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf
@@ -39,7 +39,7 @@
 	rm /etc/nsswitch.conf.gforge-new
 
 	# Install the chroot environment
-	/usr/lib/gforge/bin/install-chroot.sh configure
+	/usr/share/gforge/bin/install-chroot.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Modified: trunk/gforge/debian/gforge-shell-postgresql.prerm
===================================================================
--- trunk/gforge/debian/gforge-shell-postgresql.prerm	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-shell-postgresql.prerm	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,7 @@
 	db_title "Unconfiguring Gforge"
 
         # Unpatch Slapd configuration files
-	/usr/lib/gforge/bin/install-nsspgsql.sh purge-files
+	/usr/share/gforge/bin/install-nsspgsql.sh purge-files
 	ucf --debconf-ok /etc/nss-pgsql.conf.gforge-new /etc/nss-pgsql.conf
 	ucf --debconf-ok /etc/nss-pgsql-root.conf.gforge-new /etc/nss-pgsql-root.conf
 	ucf --debconf-ok /etc/nsswitch.conf.gforge-new /etc/nsswitch.conf

Deleted: trunk/gforge/debian/gforge-web-apache2.dirs
===================================================================
--- trunk/gforge/debian/gforge-web-apache2.dirs	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-web-apache2.dirs	2009-03-24 18:28:48 UTC (rev 7237)
@@ -1,10 +0,0 @@
-etc/gforge/custom
-etc/gforge/languages-local
-etc/gforge/templates
-usr/lib/gforge/bin
-usr/share/gforge/www
-var/lib/gforge/scmtarballs
-var/lib/gforge/scmsnapshots
-var/lib/gforge/download
-var/lib/gforge/etc
-var/cache/gforge

Modified: trunk/gforge/debian/gforge-web-apache2.postinst.dsfh-in
===================================================================
--- trunk/gforge/debian/gforge-web-apache2.postinst.dsfh-in	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/gforge-web-apache2.postinst.dsfh-in	2009-03-24 18:28:48 UTC (rev 7237)
@@ -75,7 +75,7 @@
         # Setup our Apache
 	touch /var/lib/gforge/etc/templates/httpd.vhosts  && \
 		chown gforge:gforge /var/lib/gforge/etc/templates/httpd.vhosts && \
-		/usr/lib/gforge/bin/create-vhosts.sh --norestart
+		/usr/share/gforge/bin/create-vhosts.sh --norestart
 
 	# Enable required modules
 	DEBIAN_FRONTEND=noninteractive /usr/sbin/a2enmod php5 || true

Modified: trunk/gforge/debian/po/cs.po
===================================================================
--- trunk/gforge/debian/po/cs.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/cs.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -557,7 +557,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "English"
 

Modified: trunk/gforge/debian/po/fi.po
===================================================================
--- trunk/gforge/debian/po/fi.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/fi.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -22,7 +22,9 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:3001
-msgid "Please enter the hostname of the server that will host the GForge shell accounts."
+msgid ""
+"Please enter the hostname of the server that will host the GForge shell "
+"accounts."
 msgstr "Anna GForgen komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
 #. Type: string
@@ -35,7 +37,8 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:6001
-msgid "Please enter the hostname of the server that will host the GForge packages."
+msgid ""
+"Please enter the hostname of the server that will host the GForge packages."
 msgstr "Anna GForge-paketteja isännöivän palvelimen verkkonimi."
 
 #. Type: string
@@ -59,8 +62,12 @@
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
-msgid "The GForge administrator account will have full privileges on the system. It will be used to approve the creation of new projects."
-msgstr "GForgen ylläpitotunnuksella tulee olemaan täydet oikeudet järjestelmään. Sitä käytetään hyväksyttäessä uusien projektien luominen."
+msgid ""
+"The GForge administrator account will have full privileges on the system. It "
+"will be used to approve the creation of new projects."
+msgstr ""
+"GForgen ylläpitotunnuksella tulee olemaan täydet oikeudet järjestelmään. "
+"Sitä käytetään hyväksyttäessä uusien projektien luominen."
 
 #. Type: string
 #. Description
@@ -79,7 +86,9 @@
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
-msgid "Please enter the IP address of the server that will host the GForge installation."
+msgid ""
+"Please enter the IP address of the server that will host the GForge "
+"installation."
 msgstr "Anna GForge-asennusta isännöivän palvelimen IP-osoite."
 
 #. Type: string
@@ -124,8 +133,14 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:12001
-msgid "GForge allows users to define a list of their skills, to be chosen from those present in the database. This list is the initial list of skills that will enter the database."
-msgstr "GForge antaa käyttäjien määrittää listan taidoistaan. Ne valitaan tietokannassa tällä hetkellä olevista. Tämä alkuperäinen taitolista tallennetaan tietokantaan."
+msgid ""
+"GForge allows users to define a list of their skills, to be chosen from "
+"those present in the database. This list is the initial list of skills that "
+"will enter the database."
+msgstr ""
+"GForge antaa käyttäjien määrittää listan taidoistaan. Ne valitaan "
+"tietokannassa tällä hetkellä olevista. Tämä alkuperäinen taitolista "
+"tallennetaan tietokantaan."
 
 #. Type: string
 #. Description
@@ -146,34 +161,59 @@
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
 #: ../gforge-dns-bind9.templates.dsfh-in:3001
-msgid "You can use a simple DNS setup with wildcards to map all project web-hosts to a single IP address, and direct all the scm-hosts to a single SCM server, or a complex setup which allows many servers as project web servers or SCM servers."
-msgstr "Kaikki projektin verkkoasemat voidaan kuvata yhteen IP-osoitteeseen yksinkertaisella, korvausmerkkejä sisältävällä DNS-asetuksella ja ohjata kaikki versionhallintakoneet yhdelle versionhallintapalvelimelle. Vaihtoehtoisesti voidaan käyttää monipuolisempia asetuksia, jotka sallivat useampia palvelimia projektin verkko- tai versionhallintapalvelimina."
+msgid ""
+"You can use a simple DNS setup with wildcards to map all project web-hosts "
+"to a single IP address, and direct all the scm-hosts to a single SCM server, "
+"or a complex setup which allows many servers as project web servers or SCM "
+"servers."
+msgstr ""
+"Kaikki projektin verkkoasemat voidaan kuvata yhteen IP-osoitteeseen "
+"yksinkertaisella, korvausmerkkejä sisältävällä DNS-asetuksella ja ohjata "
+"kaikki versionhallintakoneet yhdelle versionhallintapalvelimelle. "
+"Vaihtoehtoisesti voidaan käyttää monipuolisempia asetuksia, jotka sallivat "
+"useampia palvelimia projektin verkko- tai versionhallintapalvelimina."
 
 #. Type: boolean
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
 #: ../gforge-dns-bind9.templates.dsfh-in:3001
-msgid "Even if you use a simple DNS setup, you can still use separate machines as project servers; it just assumes that all the project web directories are on the same server with a single SCM server."
-msgstr "Vaikka käytettäisiin yksinkertaista DNS-asetusta, voidaan erillisiä koneita silti käyttää projektipalvelimina. Tällöin vain oletetaan, että kaikki projektien verkkohakemistot ovat samalla palvelimella yhden versionhallintapalvelimen kanssa."
+msgid ""
+"Even if you use a simple DNS setup, you can still use separate machines as "
+"project servers; it just assumes that all the project web directories are on "
+"the same server with a single SCM server."
+msgstr ""
+"Vaikka käytettäisiin yksinkertaista DNS-asetusta, voidaan erillisiä koneita "
+"silti käyttää projektipalvelimina. Tällöin vain oletetaan, että kaikki "
+"projektien verkkohakemistot ovat samalla palvelimella yhden "
+"versionhallintapalvelimen kanssa."
 
 #. Type: boolean
 #. Description
 #: ../gforge-mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"
+msgstr ""
+"Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"
 
 #. Type: boolean
 #. Description
 #: ../gforge-mta-postfix.templates.dsfh-in:3001
-msgid "GForge sends and receives plenty of e-mail to and from the \"${noreply}\" address."
-msgstr "GForge lähettää ja vastaanottaa paljon sähköpostia osoitteen ”${noreply}” kautta."
+msgid ""
+"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
+"address."
+msgstr ""
+"GForge lähettää ja vastaanottaa paljon sähköpostia osoitteen ”${noreply}” "
+"kautta."
 
 #. Type: boolean
 #. Description
 #: ../gforge-mta-postfix.templates.dsfh-in:3001
-msgid "E-mail to that address should be directed to a black hole (/dev/null), unless you have another use for that address."
-msgstr "Tuohon osoitteeseen tuleva sähköposti tulisi ohjata mustaan aukkoon (/dev/null), jos osoitteelle ei ole muuta käyttöä."
+msgid ""
+"E-mail to that address should be directed to a black hole (/dev/null), "
+"unless you have another use for that address."
+msgstr ""
+"Tuohon osoitteeseen tuleva sähköposti tulisi ohjata mustaan aukkoon (/dev/"
+"null), jos osoitteelle ei ole muuta käyttöä."
 
 #. Type: string
 #. Description
@@ -184,8 +224,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "Please enter the domain that will host the GForge installation. Some services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr "Anna GForge-asennuksen verkkotunnus. Joillekin palveluille (versionhallinta, listat, jne.) annetaan oma aliverkkotunnus tämän verkkotunnuksen alta."
+msgid ""
+"Please enter the domain that will host the GForge installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Anna GForge-asennuksen verkkotunnus. Joillekin palveluille (versionhallinta, "
+"listat, jne.) annetaan oma aliverkkotunnus tämän verkkotunnuksen alta."
 
 #. Type: string
 #. Description
@@ -196,8 +240,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "Please enter the e-mail address of the GForge administrator of this site. It will be used when problems occur."
-msgstr "Anna GForgen ylläpidon sähköpostiosoite. Tätä käytetään, kun ongelmia ilmaantuu."
+msgid ""
+"Please enter the e-mail address of the GForge administrator of this site. It "
+"will be used when problems occur."
+msgstr ""
+"Anna GForgen ylläpidon sähköpostiosoite. Tätä käytetään, kun ongelmia "
+"ilmaantuu."
 
 #. Type: string
 #. Description
@@ -208,8 +256,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "Please enter the name of the GForge system. It is used in various places throughout the system."
-msgstr "Anna GForge-järjestelmän nimi. Tätä käytetään eri paikoissa ympäri järjestelmää."
+msgid ""
+"Please enter the name of the GForge system. It is used in various places "
+"throughout the system."
+msgstr ""
+"Anna GForge-järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
+"järjestelmää."
 
 #. Type: string
 #. Description
@@ -220,8 +272,11 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Please enter the IP address (or hostname) of the server that will host the GForge database."
-msgstr "Anna GForgen tietokantaa isännöivän palvelimen IP-osoite (tai verkkonimi)."
+msgid ""
+"Please enter the IP address (or hostname) of the server that will host the "
+"GForge database."
+msgstr ""
+"Anna GForgen tietokantaa isännöivän palvelimen IP-osoite (tai verkkonimi)."
 
 #. Type: string
 #. Description
@@ -232,7 +287,8 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Please enter the name of the database that will host the GForge database."
+msgid ""
+"Please enter the name of the database that will host the GForge database."
 msgstr "Anna GForgen tietokantaa isännöivän tietokannan nimi."
 
 #. Type: string
@@ -244,8 +300,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Please enter the username of the database administrator for the server that will host the GForge database."
-msgstr "Anna GForgen tietokantaa isännöivän palvelimen tietokannan ylläpitokäyttäjätunnus."
+msgid ""
+"Please enter the username of the database administrator for the server that "
+"will host the GForge database."
+msgstr ""
+"Anna GForgen tietokantaa isännöivän palvelimen tietokannan "
+"ylläpitokäyttäjätunnus."
 
 #. Type: password
 #. Description
@@ -268,7 +328,8 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge packages."
+msgid ""
+"Please enter the host name of the server that will host the GForge packages."
 msgstr "Anna GForgen paketteja isännöivän palvelimen verkkonimi."
 
 #. Type: string
@@ -280,8 +341,14 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
-msgid "The members of the news admin group can approve news for the GForge main page. This group's ID must not be 1. This should be changed only if you upgrade from a previous version and want to keep the data."
-msgstr "Uutisten ylläpitäjäryhmän jäsenet voivat hyväksyä uutisia GForgen pääsivulle. Tämän ryhmän ID:n ei tule olla 1. Tätä tulisi muuttaa vain, jos päivität aikaisemmasta versiosta ja haluat säilyttää tiedot."
+msgid ""
+"The members of the news admin group can approve news for the GForge main "
+"page. This group's ID must not be 1. This should be changed only if you "
+"upgrade from a previous version and want to keep the data."
+msgstr ""
+"Uutisten ylläpitäjäryhmän jäsenet voivat hyväksyä uutisia GForgen "
+"pääsivulle. Tämän ryhmän ID:n ei tule olla 1. Tätä tulisi muuttaa vain, jos "
+"päivität aikaisemmasta versiosta ja haluat säilyttää tiedot."
 
 #. Type: string
 #. Description
@@ -304,13 +371,17 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge mailing lists."
+msgid ""
+"Please enter the host name of the server that will host the GForge mailing "
+"lists."
 msgstr "Anna GForgen postituslistoja isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge shell accounts."
+msgid ""
+"Please enter the host name of the server that will host the GForge shell "
+"accounts."
 msgstr "Anna GForgen komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
 #. Type: string
@@ -322,8 +393,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge user mail redirector."
-msgstr "Anna GForgen käyttäjäpostien edelleenohjaajaa isännöivän palvelimen verkkonimi."
+msgid ""
+"Please enter the host name of the server that will host the GForge user mail "
+"redirector."
+msgstr ""
+"Anna GForgen käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
+"verkkonimi."
 
 #. Type: select
 #. Choices
@@ -472,7 +547,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "englanti"
 
@@ -497,9 +571,9 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/web-variables.templates:3001
-msgid "Please choose the default theme for web pages. This must be a valid name."
+msgid ""
+"Please choose the default theme for web pages. This must be a valid name."
 msgstr "Valitse verkkosivujen oletusteema. Tämän tulee olla käypä nimi."
 
 #~ msgid "admin"
 #~ msgstr "admin"
-

Modified: trunk/gforge/debian/po/gl.po
===================================================================
--- trunk/gforge/debian/po/gl.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/gl.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -554,7 +554,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "Inglés"
 

Modified: trunk/gforge/debian/po/nl.po
===================================================================
--- trunk/gforge/debian/po/nl.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/nl.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -38,8 +38,12 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:3001
-msgid "Please enter the hostname of the server that will host the GForge shell accounts."
-msgstr "Wat is de computernaam van de server die de GForge-shellaccounts gaat aanbieden?"
+msgid ""
+"Please enter the hostname of the server that will host the GForge shell "
+"accounts."
+msgstr ""
+"Wat is de computernaam van de server die de GForge-shellaccounts gaat "
+"aanbieden?"
 
 #  Type: string
 #  Description
@@ -55,8 +59,11 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:6001
-msgid "Please enter the hostname of the server that will host the GForge packages."
-msgstr "Wat is de computernaam van de server waarop de GForge-pakketten gehost gaan worden?"
+msgid ""
+"Please enter the hostname of the server that will host the GForge packages."
+msgstr ""
+"Wat is de computernaam van de server waarop de GForge-pakketten gehost gaan "
+"worden?"
 
 #. Type: string
 #. Description
@@ -83,8 +90,12 @@
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:8001
 #: ../gforge-db-postgresql.templates.dsfh-in:10001
-msgid "The GForge administrator account will have full privileges on the system. It will be used to approve the creation of new projects."
-msgstr "De GForge-beheerdersaccount krijgt volledige rechten binnen GForge-systeem, en wordt gebruikt om nieuwe projecten goed te keuren."
+msgid ""
+"The GForge administrator account will have full privileges on the system. It "
+"will be used to approve the creation of new projects."
+msgstr ""
+"De GForge-beheerdersaccount krijgt volledige rechten binnen GForge-systeem, "
+"en wordt gebruikt om nieuwe projecten goed te keuren."
 
 #. Type: string
 #. Description
@@ -107,8 +118,11 @@
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
-msgid "Please enter the IP address of the server that will host the GForge installation."
-msgstr "Wat is de computernaam van de server die de GForge-installatie gaat hosten?"
+msgid ""
+"Please enter the IP address of the server that will host the GForge "
+"installation."
+msgstr ""
+"Wat is de computernaam van de server die de GForge-installatie gaat hosten?"
 
 #. Type: string
 #. Description
@@ -164,14 +178,22 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:12001
-msgid "GForge allows users to define a list of their skills, to be chosen from those present in the database. This list is the initial list of skills that will enter the database."
-msgstr "GForge geeft gebruikers de mogelijkheid om een lijst met hun vaardigheden op te geven, gekozen uit deze aanwezig in de database. Dit is de de initiële lijst van vaardigheden voor de database."
+msgid ""
+"GForge allows users to define a list of their skills, to be chosen from "
+"those present in the database. This list is the initial list of skills that "
+"will enter the database."
+msgstr ""
+"GForge geeft gebruikers de mogelijkheid om een lijst met hun vaardigheden op "
+"te geven, gekozen uit deze aanwezig in de database. Dit is de de initiële "
+"lijst van vaardigheden voor de database."
 
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
-msgstr "Gelieve een met puntkomma's gescheiden lijst van vaardigheidsnamen in te voeren."
+msgstr ""
+"Gelieve een met puntkomma's gescheiden lijst van vaardigheidsnamen in te "
+"voeren."
 
 #  Type: boolean
 #  Description
@@ -190,8 +212,17 @@
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
 #: ../gforge-dns-bind9.templates.dsfh-in:3001
-msgid "You can use a simple DNS setup with wildcards to map all project web-hosts to a single IP address, and direct all the scm-hosts to a single SCM server, or a complex setup which allows many servers as project web servers or SCM servers."
-msgstr "Er kan een eenvoudige DNS-opstelling gebruikt worden die jokers gebruikt om alle project-websites naar een enkel IP-adres en alle scm-hosts naar een enkele SCM-server te mappen. Of u er kan een complexe opstelling gebruikt worden die toelaat meerdere servers als project-webserver of SCM-server te gebruiken."
+msgid ""
+"You can use a simple DNS setup with wildcards to map all project web-hosts "
+"to a single IP address, and direct all the scm-hosts to a single SCM server, "
+"or a complex setup which allows many servers as project web servers or SCM "
+"servers."
+msgstr ""
+"Er kan een eenvoudige DNS-opstelling gebruikt worden die jokers gebruikt om "
+"alle project-websites naar een enkel IP-adres en alle scm-hosts naar een "
+"enkele SCM-server te mappen. Of u er kan een complexe opstelling gebruikt "
+"worden die toelaat meerdere servers als project-webserver of SCM-server te "
+"gebruiken."
 
 #  Type: boolean
 #  Description
@@ -200,8 +231,15 @@
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
 #: ../gforge-dns-bind9.templates.dsfh-in:3001
-msgid "Even if you use a simple DNS setup, you can still use separate machines as project servers; it just assumes that all the project web directories are on the same server with a single SCM server."
-msgstr "Ook bij gebruik van de eenvoudige DNS-opzet heeft kunt u alsnog verschillende machines gebruiken voor de projectservers, de enige aanname is dat alle project-webmappen op dezelfde server staan, en dat u een enkele server heeft voor bronbeheer (SCM)."
+msgid ""
+"Even if you use a simple DNS setup, you can still use separate machines as "
+"project servers; it just assumes that all the project web directories are on "
+"the same server with a single SCM server."
+msgstr ""
+"Ook bij gebruik van de eenvoudige DNS-opzet heeft kunt u alsnog "
+"verschillende machines gebruiken voor de projectservers, de enige aanname is "
+"dat alle project-webmappen op dezelfde server staan, en dat u een enkele "
+"server heeft voor bronbeheer (SCM)."
 
 #  Type: boolean
 #  Description
@@ -216,16 +254,24 @@
 #. Type: boolean
 #. Description
 #: ../gforge-mta-postfix.templates.dsfh-in:3001
-msgid "GForge sends and receives plenty of e-mail to and from the \"${noreply}\" address."
-msgstr "GForge verstuurt en ontvangt een heleboel e-mails van en naar  het adres '${noreply}'."
+msgid ""
+"GForge sends and receives plenty of e-mail to and from the \"${noreply}\" "
+"address."
+msgstr ""
+"GForge verstuurt en ontvangt een heleboel e-mails van en naar  het adres "
+"'${noreply}'."
 
 #  Type: boolean
 #  Description
 #. Type: boolean
 #. Description
 #: ../gforge-mta-postfix.templates.dsfh-in:3001
-msgid "E-mail to that address should be directed to a black hole (/dev/null), unless you have another use for that address."
-msgstr "Tenzij u dat adres voor iets anders gebruikt is het aan te raden om de e-mail naar dat adres om te leiden naar een zwart gat (/dev/null)."
+msgid ""
+"E-mail to that address should be directed to a black hole (/dev/null), "
+"unless you have another use for that address."
+msgstr ""
+"Tenzij u dat adres voor iets anders gebruikt is het aan te raden om de e-"
+"mail naar dat adres om te leiden naar een zwart gat (/dev/null)."
 
 #  Type: string
 #  Description
@@ -240,8 +286,13 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-msgid "Please enter the domain that will host the GForge installation. Some services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr "Wat is het domein waarop uw GForge-installatie gehost wordt? Sommige diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen binnen dat domein."
+msgid ""
+"Please enter the domain that will host the GForge installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Wat is het domein waarop uw GForge-installatie gehost wordt? Sommige "
+"diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen "
+"binnen dat domein."
 
 #  Type: string
 #  Description
@@ -256,8 +307,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-msgid "Please enter the e-mail address of the GForge administrator of this site. It will be used when problems occur."
-msgstr "Wat is het e-mail-adres van de GForge-beheerder op dit systeem? Wordt gebruikt wanneer er problemen optreden."
+msgid ""
+"Please enter the e-mail address of the GForge administrator of this site. It "
+"will be used when problems occur."
+msgstr ""
+"Wat is het e-mail-adres van de GForge-beheerder op dit systeem? Wordt "
+"gebruikt wanneer er problemen optreden."
 
 #  Type: string
 #  Description
@@ -272,8 +327,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "Please enter the name of the GForge system. It is used in various places throughout the system."
-msgstr "Wat is de naam van het GForge-systeem? Deze naam wordt op verschillende plaatsen in het systeem gebruikt."
+msgid ""
+"Please enter the name of the GForge system. It is used in various places "
+"throughout the system."
+msgstr ""
+"Wat is de naam van het GForge-systeem? Deze naam wordt op verschillende "
+"plaatsen in het systeem gebruikt."
 
 #  Type: string
 #  Description
@@ -288,8 +347,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
-msgid "Please enter the IP address (or hostname) of the server that will host the GForge database."
-msgstr "Wat is het IP-adres (of de computernaam) van de server die de GForge-database gaat hosten?"
+msgid ""
+"Please enter the IP address (or hostname) of the server that will host the "
+"GForge database."
+msgstr ""
+"Wat is het IP-adres (of de computernaam) van de server die de GForge-"
+"database gaat hosten?"
 
 #  Type: string
 #  Description
@@ -304,8 +367,11 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Please enter the name of the database that will host the GForge database."
-msgstr "Wat is de naam van de database die als de GForge-database gebruikt gaat worden?"
+msgid ""
+"Please enter the name of the database that will host the GForge database."
+msgstr ""
+"Wat is de naam van de database die als de GForge-database gebruikt gaat "
+"worden?"
 
 #  Type: string
 #  Description
@@ -318,8 +384,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
-msgid "Please enter the username of the database administrator for the server that will host the GForge database."
-msgstr "Wat is de gebruikersnaam van de database-beheerder van de server die de GForge-database gaat hosten?"
+msgid ""
+"Please enter the username of the database administrator for the server that "
+"will host the GForge database."
+msgstr ""
+"Wat is de gebruikersnaam van de database-beheerder van de server die de "
+"GForge-database gaat hosten?"
 
 #  Type: password
 #  Description
@@ -333,7 +403,9 @@
 #. Description
 #: ../dsf-helper/dbpasswd-variables.templates:2001
 msgid "Connections to the database system are authenticated by a password."
-msgstr "Verbindingen met het databasesysteem worden geauthentificeerd via een wachtwoord."
+msgstr ""
+"Verbindingen met het databasesysteem worden geauthentificeerd via een "
+"wachtwoord."
 
 #. Type: password
 #. Description
@@ -346,8 +418,10 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge packages."
-msgstr "Wat is de computernaam van de server die de GForge-pakketten gaat hosten?"
+msgid ""
+"Please enter the host name of the server that will host the GForge packages."
+msgstr ""
+"Wat is de computernaam van de server die de GForge-pakketten gaat hosten?"
 
 #. Type: string
 #. Description
@@ -360,8 +434,15 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
-msgid "The members of the news admin group can approve news for the GForge main page. This group's ID must not be 1. This should be changed only if you upgrade from a previous version and want to keep the data."
-msgstr "De leden van de niews-beheerdersgroep kunnen nieuws voor de GForge-hoofdpagina goedkeuren. Deze groep-ID mag niet 1 zijn. Dit optie is enkel van belang als u opwaardeerd van een eerdere versie en uw gegevens wilt bewaren."
+msgid ""
+"The members of the news admin group can approve news for the GForge main "
+"page. This group's ID must not be 1. This should be changed only if you "
+"upgrade from a previous version and want to keep the data."
+msgstr ""
+"De leden van de niews-beheerdersgroep kunnen nieuws voor de GForge-"
+"hoofdpagina goedkeuren. Deze groep-ID mag niet 1 zijn. Dit optie is enkel "
+"van belang als u opwaardeerd van een eerdere versie en uw gegevens wilt "
+"bewaren."
 
 #. Type: string
 #. Description
@@ -388,16 +469,23 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge mailing lists."
-msgstr "Wat is de computernaam van de server die de GForge-e-maillijsten gaat hosten?"
+msgid ""
+"Please enter the host name of the server that will host the GForge mailing "
+"lists."
+msgstr ""
+"Wat is de computernaam van de server die de GForge-e-maillijsten gaat hosten?"
 
 #  Type: string
 #  Description
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge shell accounts."
-msgstr "Wat is de computernaam van de server die de GForge-shellaccounts gaat aanbieden?"
+msgid ""
+"Please enter the host name of the server that will host the GForge shell "
+"accounts."
+msgstr ""
+"Wat is de computernaam van de server die de GForge-shellaccounts gaat "
+"aanbieden?"
 
 #  Type: string
 #  Description
@@ -412,8 +500,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge user mail redirector."
-msgstr "Wat is de computernaam van de server verantwoordelijk voor het doorsturen van de mail voor GForge-gebruikers?"
+msgid ""
+"Please enter the host name of the server that will host the GForge user mail "
+"redirector."
+msgstr ""
+"Wat is de computernaam van de server verantwoordelijk voor het doorsturen "
+"van de mail voor GForge-gebruikers?"
 
 #  Type: select
 #  DefaultChoice
@@ -608,7 +700,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "Dutch"
 
@@ -641,6 +732,8 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/web-variables.templates:3001
-msgid "Please choose the default theme for web pages. This must be a valid name."
-msgstr "Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam te zijn."
-
+msgid ""
+"Please choose the default theme for web pages. This must be a valid name."
+msgstr ""
+"Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam te "
+"zijn."

Modified: trunk/gforge/debian/po/pt.po
===================================================================
--- trunk/gforge/debian/po/pt.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/pt.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -567,7 +567,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "Inglês[ Idioma pré-definido]"
 

Modified: trunk/gforge/debian/po/ru.po
===================================================================
--- trunk/gforge/debian/po/ru.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/ru.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -15,7 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: string
 #. Description
@@ -44,7 +45,8 @@
 #. Type: string
 #. Description
 #: ../gforge-db-postgresql.templates.dsfh-in:6001
-msgid "Please enter the hostname of the server that will host the GForge packages."
+msgid ""
+"Please enter the hostname of the server that will host the GForge packages."
 msgstr "Введите имя сервера, на котором будут расположены пакеты GForge."
 
 #. Type: string
@@ -95,7 +97,8 @@
 msgid ""
 "Please enter the IP address of the server that will host the GForge "
 "installation."
-msgstr "Введите IP-адрес сервера, на котором будет располагаться установка GForge."
+msgstr ""
+"Введите IP-адрес сервера, на котором будет располагаться установка GForge."
 
 #. Type: string
 #. Description
@@ -264,7 +267,8 @@
 msgid ""
 "Please enter the name of the GForge system. It is used in various places "
 "throughout the system."
-msgstr "Введите имя системы GForge. Оно используется в разных местах по всей системе."
+msgstr ""
+"Введите имя системы GForge. Оно используется в разных местах по всей системе."
 
 #. Type: string
 #. Description
@@ -291,7 +295,8 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Please enter the name of the database that will host the GForge database."
+msgid ""
+"Please enter the name of the database that will host the GForge database."
 msgstr "Введите имя базы данных, которая будет содержать базу данных GForge."
 
 #. Type: string
@@ -331,8 +336,10 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the GForge packages."
-msgstr "Введите имя хоста сервера, на котором будут располагаться пакеты GForge."
+msgid ""
+"Please enter the host name of the server that will host the GForge packages."
+msgstr ""
+"Введите имя хоста сервера, на котором будут располагаться пакеты GForge."
 
 #. Type: string
 #. Description
@@ -402,7 +409,8 @@
 msgid ""
 "Please enter the host name of the server that will host the GForge user mail "
 "redirector."
-msgstr "Введите имя сервера, который будет перенаправлять почту пользователей GForge."
+msgstr ""
+"Введите имя сервера, который будет перенаправлять почту пользователей GForge."
 
 #. Type: select
 #. Choices
@@ -551,7 +559,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "русский"
 
@@ -576,8 +583,8 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/web-variables.templates:3001
-msgid "Please choose the default theme for web pages. This must be a valid name."
+msgid ""
+"Please choose the default theme for web pages. This must be a valid name."
 msgstr ""
 "Выберите тему по умолчанию для веб-страниц. Должно быть указано допустимое "
 "имя."
-

Modified: trunk/gforge/debian/po/vi.po
===================================================================
--- trunk/gforge/debian/po/vi.po	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/po/vi.po	2009-03-24 18:28:48 UTC (rev 7237)
@@ -549,7 +549,6 @@
 #. Type: select
 #. DefaultChoice
 #: ../dsf-helper/web-variables.templates:2002
-#| msgid "Default language:"
 msgid "English[ Default language]"
 msgstr "Tiếng Việt [Ngôn ngữ mặc định]"
 
@@ -576,4 +575,4 @@
 #: ../dsf-helper/web-variables.templates:3001
 msgid ""
 "Please choose the default theme for web pages. This must be a valid name."
-msgstr "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."
\ No newline at end of file
+msgstr "Hãy chọn sắc thái mặc định cho trang Web: nó phải là một tên hợp lệ."

Modified: trunk/gforge/debian/rules
===================================================================
--- trunk/gforge/debian/rules	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/debian/rules	2009-03-24 18:28:48 UTC (rev 7237)
@@ -10,6 +10,16 @@
 PACKAGE=gforge
 include /usr/share/dpatch/dpatch.make
 
+# This one should be declared like other when it will be unified with rpm
+CRONFILESLIST=debian/$(PACKAGE)-lists-mailman.cron.d debian/$(PACKAGE)-web-apache2.cron.d debian/$(PACKAGE)-db-postgresql.cron.d debian/$(PACKAGE)-dns-bind9.cron.d debian/$(PACKAGE)-plugin-scmcvs.cron.d debian/$(PACKAGE)-ftp-proftpd.cron.d debian/$(PACKAGE)-shell-postgresql.cron.d debian/$(PACKAGE)-plugin-scmsvn.cron.d
+DIRSFILESLIST=$(patsubst dirs/%,debian/$(PACKAGE)-%.dirs,$(wildcard dirs/[a-z]*))
+INSTALLFILESLIST=$(patsubst install/%,debian/$(PACKAGE)-%.install,$(wildcard install/[a-z]*))
+
+listecho: 
+	@echo $(CRONFILESLIST)
+	@echo $(DIRSFILESLIST)
+	@echo $(INSTALLFILESLIST)
+
 remove-binary-files:
 	# Remove files in contrib, especially binaries that break dpkg-source
 #	find contrib/ -name CVS -prune -not -name CVS -or -type f | xargs rm -f
@@ -17,6 +27,33 @@
 #	rm -f www/themes/gforge/images/es_*
 	sh $(CURDIR)/deb-specific/manage-uufiles.sh clean
 
+cronfiles: $(CRONFILESLIST)
+
+dirsfiles: $(DIRSFILESLIST)
+
+installfiles: $(INSTALLFILESLIST)
+
+conffiles: cronfiles dirsfiles installfiles
+
+debian/$(PACKAGE)-%.cron.d:
+	@echo "Creating $@"
+	@if [ "$@" = "$(PACKAGE)-db-postgresql.cron.d" ] ; then \
+	cat $(CURDIR)/cron.d/00phpcron > $@ ; \
+	cat $(CURDIR)/cron.d/db-postgresql >> $@ ; \
+	cat $(CURDIR)/cron.d/db-postgresql-2 >> $@ ; \
+	else \
+		echo "copy $(CURDIR)/cron.d/$* to $@" ; \
+		cp $(CURDIR)/cron.d/$* $@ ; \
+	fi
+
+debian/$(PACKAGE)-%.dirs:
+	@echo "Creating $@"
+	cp $(CURDIR)/dirs/$* $@ 
+
+debian/$(PACKAGE)-%.install:
+	@echo "Creating $@"
+	cp $(CURDIR)/install/$* $@ 
+
 configure: configure-stamp debian/po/templates.pot
 configure-stamp: remove-binary-files
 	dh_testdir
@@ -46,6 +83,9 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
+	rm -f $(CURDIR)/debian/*.cron.d
+	rm -f $(CURDIR)/debian/*.dirs
+	rm -f $(CURDIR)/debian/*.install
 	rm -f cvssh.1 gforge-config.1
 
 	rm -rf locales/*
@@ -57,194 +97,45 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
+
+	# Generate conffiles *.cron.d *.dirs *.install
+	$(CURDIR)/debian/rules conffiles
+
 	dh_installdirs
 
 	# Preprocess files with DSF-Helper
 	perl $(CURDIR)/deb-specific/dsf-helper.pl
 
-	# gforge
-	# (gforge is a meta-package and needs no files)
+	# Install files
+	#dh_install --fail-missing -X.svn -X.arch-ids -X.bzr -X.cvsignore --sourcedir=$(CURDIR)
+	dh_install -X.svn -X.arch-ids -X.bzr -X.cvsignore --sourcedir=$(CURDIR)
 
-	# gforge-plugin-scmcvs
-	install -m 755 deb-specific/install-cvs.sh     $(CURDIR)/debian/gforge-plugin-scmcvs/usr/lib/gforge/plugins/scmcvs/bin/
-	install -m 755 deb-specific/update-user-group-ssh.sh $(CURDIR)/debian/gforge-plugin-scmcvs/usr/lib/gforge/plugins/scmcvs/bin/
-	cp -r deb-specific/scmcvs/cronjobs/* $(CURDIR)/debian/gforge-plugin-scmcvs/usr/share/gforge/plugins/scmcvs/cronjobs
-	cp -r plugins/scmcvs/bin/* $(CURDIR)/debian/gforge-plugin-scmcvs/usr/lib/gforge/plugins/scmcvs/bin/
-	cp -r plugins/scmcvs/sbin/* $(CURDIR)/debian/gforge-plugin-scmcvs/usr/share/gforge/plugins/scmcvs/sbin/
-	chmod 755 $(CURDIR)/debian/gforge-plugin-scmcvs/usr/share/gforge/plugins/scmcvs/sbin/*
-	cp -r plugins/scmcvs/common/* $(CURDIR)/debian/gforge-plugin-scmcvs/usr/share/gforge/plugins/scmcvs/common/
-	cp -r plugins/scmcvs/cronjobs/* $(CURDIR)/debian/gforge-plugin-scmcvs/usr/share/gforge/plugins/scmcvs/cronjobs/
-	cp -r plugins/scmcvs/etc/plugins/scmcvs/* $(CURDIR)/debian/gforge-plugin-scmcvs/etc/gforge/plugins/scmcvs/
+	# Install few links
+	ln -s database-pgsql.php $(CURDIR)/debian/$(PACKAGE)-common/usr/share/$(PACKAGE)/common/include/database.php
+	ln -s /usr/share/mediawiki/skins/$(PACKAGE)/loader.php $(CURDIR)/debian/$(PACKAGE)-plugin-mediawiki/etc/mediawiki-extensions/extensions-available/GforgeAuth.php
 
-	# gforge-plugin-scmsvn
-	install -m 755 deb-specific/install-svn.sh     $(CURDIR)/debian/gforge-plugin-scmsvn/usr/lib/gforge/plugins/scmsvn/bin/
-	cp -r deb-specific/scmsvn/cronjobs/* $(CURDIR)/debian/gforge-plugin-scmsvn/usr/share/gforge/plugins/scmsvn/cronjobs
-	cp -r plugins/scmsvn/bin/* $(CURDIR)/debian/gforge-plugin-scmsvn/usr/lib/gforge/plugins/scmsvn/bin/
-	cp -r plugins/scmsvn/common/* $(CURDIR)/debian/gforge-plugin-scmsvn/usr/share/gforge/plugins/scmsvn/common/
-	cp -r plugins/scmsvn/cronjobs/* $(CURDIR)/debian/gforge-plugin-scmsvn/usr/share/gforge/plugins/scmsvn/cronjobs/
-	rm -f $(CURDIR)/debian/gforge-plugin-scmsvn/usr/share/gforge/plugins/scmsvn/cronjobs/README
-	find $(CURDIR)/debian/gforge-plugin-scmsvn/usr/share/gforge/plugins/scmsvn/cronjobs/ -type f | xargs chmod 0755
-	cp -r plugins/scmsvn/etc/plugins/scmsvn/* $(CURDIR)/debian/gforge-plugin-scmsvn/etc/gforge/plugins/scmsvn/
-
-	# gforge-plugin-scmbzr
-	# cp -r plugins/scmbzr/bin/* $(CURDIR)/debian/gforge-plugin-scmbzr/usr/lib/gforge/plugins/scmbzr/bin/
-	cp -r plugins/scmbzr/common/* $(CURDIR)/debian/gforge-plugin-scmbzr/usr/share/gforge/plugins/scmbzr/common/
-	# cp -r plugins/scmbzr/cronjobs/* $(CURDIR)/debian/gforge-plugin-scmbzr/usr/share/gforge/plugins/scmbzr/cronjobs/
-	cp -r plugins/scmbzr/etc/plugins/scmbzr/* $(CURDIR)/debian/gforge-plugin-scmbzr/etc/gforge/plugins/scmbzr/
-
-	# gforge-plugin-mediawiki
-	cp -r plugins/mediawiki/common/* $(CURDIR)/debian/gforge-plugin-mediawiki/usr/share/gforge/plugins/mediawiki/common/
-	cp -r plugins/mediawiki/www/* $(CURDIR)/debian/gforge-plugin-mediawiki/usr/share/gforge/www/plugins/mediawiki/
-	cp -r plugins/mediawiki/mediawiki-skin/* $(CURDIR)/debian/gforge-plugin-mediawiki/usr/share/mediawiki/skins/
-	cp -r plugins/mediawiki/etc/httpd.d/* $(CURDIR)/debian/gforge-plugin-mediawiki/usr/share/gforge/etc/httpd.d/
-	ln -s /usr/share/mediawiki/skins/gforge/loader.php $(CURDIR)/debian/gforge-plugin-mediawiki/etc/mediawiki-extensions/extensions-available/GforgeAuth.php
-
-	# gforge-common
-	install -m 644 etc/httpd.d/[0-9][0-9]*            $(CURDIR)/debian/gforge-common/usr/share/gforge/etc/httpd.d/
-	install -m 644 etc/httpd.d/httpd*                 $(CURDIR)/debian/gforge-common/usr/share/gforge/etc/httpd.d/
-	install -m 644 etc/local.d/[0-9][0-9]*            $(CURDIR)/debian/gforge-common/usr/share/gforge/etc/local.d/
-	install -m 644 etc/templates/*\.*                 $(CURDIR)/debian/gforge-common/usr/share/gforge/etc/templates/
-	install -m 755 setup                               $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	install -m 755 deb-specific/cvssh.pl               $(CURDIR)/debian/gforge-common/bin/cvssh
+	# Fix permissions
+	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -type f -exec chmod 644 {} \;  ; done
+	-chmod 755 $(CURDIR)/debian/*/*/*/*/bin/* $(CURDIR)/debian/*/*/*/*/cronjobs/* \
+		$(CURDIR)/debian/*/bin/*  $(CURDIR)/debian/*/usr/share/*/plugins/*/bin/* \
+		$(CURDIR)/debian/*/usr/share/*/plugins/*/cronjobs/*
 	#
-	install -m 755 deb-specific/install-chroot.sh     $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	install -m 755 deb-specific/install-ssh.sh        $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	install -m 755 utils/fill-in-the-blanks.pl        $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	install -m 755 deb-specific/gforge-config         $(CURDIR)/debian/gforge-common/usr/sbin/
-	install -m 644 utils/include.pl                   $(CURDIR)/debian/gforge-common/usr/lib/gforge/lib/
-	#
-	install -m 755 deb-specific/user_dump_update.pl   $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	install -m 755 deb-specific/group_dump_update.pl  $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-#	install -m 644 cronjobs/cvs-cron/default_page.php $(CURDIR)/debian/gforge-common/usr/lib/gforge/lib/
-	install -m 755 deb-specific/ssh_dump_update.pl    $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	#
-	install -m 755 deb-specific/update-user-group-ssh.sh $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	#
-	cp -r common $(CURDIR)/debian/gforge-common/usr/share/gforge/
-	ln -s database-pgsql.php $(CURDIR)/debian/gforge-common/usr/share/gforge/common/include/database.php
-	find $(CURDIR)/debian/gforge-common/usr/share/gforge/common -type d -exec chmod 0755 {} \;
-	find $(CURDIR)/debian/gforge-common/usr/share/gforge/common -type f -exec chmod 0644 {} \;
-	find $(CURDIR)/debian/gforge-common/usr/share/gforge/common/docman/engine/ -type f -name \*.php -not -name \*.inc.php -exec chmod 0755 {} \;
-	find $(CURDIR)/debian/gforge-common/usr/share/gforge/common/docman/engine/ -type f -name \*.sh -exec chmod 0755 {} \;
-	install -m 755 cronjobs/create_scm_repos.php $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	cp -r locales/* $(CURDIR)/debian/gforge-common/usr/share/locale/
-
-	# gforge/debian/gforge-web-apache2
-	cp -r www $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/
-	rm $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/plugins/mediawiki
-	rm $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/plugins/*
-	install -m 644 www/index_std.php $(CURDIR)/debian/gforge-web-apache2/etc/gforge/custom/
-	find $(CURDIR)/debian/gforge-web-apache2 -name \*.uu -type f | xargs rm -f
-	rm -f $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/themes/gforge/COPYING
-	find $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www -type d -exec chmod 0755 {} \;
-	find $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www -type f -exec chmod 0644 {} \;
-	find $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www -name '*.py' -exec chmod 0755 {} \;
-	# Remove empty theme directories
-	for i in $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/themes/* ; do [ -d $$i ] && [ $$(find $$i -type f | wc -l) = 0 ] && rm -rf $$i || true ; done
-
-	chown www-data  $(CURDIR)/debian/gforge-web-apache2/var/lib/gforge/download
-	install -o www-data -m 755 -d $(CURDIR)/debian/gforge-web-apache2/var/cache/gforge
-	install -m 755 utils/install-apache.sh $(CURDIR)/debian/gforge-web-apache2/usr/lib/gforge/bin/
-	install -m 755 deb-specific/create-vhosts.sh $(CURDIR)/debian/gforge-web-apache2/usr/lib/gforge/bin/
-	install -m 755 deb-specific/prepare-vhosts-file.pl $(CURDIR)/debian/gforge-web-apache2/usr/lib/gforge/bin/
-
+	chmod 755 $(CURDIR)/debian/$(PACKAGE)-db-postgresql/usr/share/*/db/*.php
+	chmod 644 $(CURDIR)/debian/$(PACKAGE)-db-postgresql/usr/share/gforge/cronjobs/*.inc
 	# viewvc rights
-	find $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/scm/viewvc -type f -exec chmod 0644 {} \;
-	grep -ril '^#!' $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/scm/viewvc | xargs chmod 0755
-
-	# dojo toolkit
-	#chmod 0755 $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/dojo/src/storage/storage.sh
-
-	# move some files from gforge/debian/gforge-web-apache2 to gforge-common as there are needed by postgress upgrade
-	# these files should be moved one day in common/
-
-	mv $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/include/squal_pre.php \
-		$(CURDIR)/debian/gforge-common/usr/share/gforge/www/include
-	mv $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/include/squal_exit.php \
-		$(CURDIR)/debian/gforge-common/usr/share/gforge/www/include
-	mv $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/include/pre.php \
-		$(CURDIR)/debian/gforge-common/usr/share/gforge/www/include
-	mv $(CURDIR)/debian/gforge-web-apache2/usr/share/gforge/www/include/vote_function.php \
-		$(CURDIR)/debian/gforge-common/usr/share/gforge/www/include
-
-	# gforge-db-postgresql
-	install -m 644 deb-specific/sf-2.6-complete.sql $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 deb-specific/sf2.5-to-sf2.6.sql $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
+	find $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/scm/viewvc -type f -exec chmod 0644 {} \;
+	grep -ril '^#!' $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/scm/viewvc | xargs chmod 0755
 	#
-	install -m 755 cronjobs/calculate_user_metric.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/db_trove_maint.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/project_cleanup.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/rating_stats.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/db_project_sums.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/check_stale_tracker_items.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/project_weekly_metric.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/rotate_activity.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
+	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 {} \;
 	#
-	install -m 755 cronjobs/site_stats.php        $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 644 cronjobs/stats_site.inc        $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/cronjobs/
-	install -m 644 cronjobs/stats_projects.inc    $(CURDIR)/debian/gforge-db-postgresql/usr/share/gforge/cronjobs/
+	rm -f $(CURDIR)/debian/$(PACKAGE)-plugin-scm*/usr/share/*/plugins/scm*/*/README
+	chmod 755 $(CURDIR)/debian/$(PACKAGE)-plugin-scmcvs/usr/share/*/plugins/scmcvs/sbin/*
+	# remove windows files
+	rm -rf $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/scm/viewvc/windows
 	#
-	install -m 755 cronjobs/reporting_cron.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	# 
-	install -m 755 cronjobs/db_stats_agg.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/massmail.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/vacuum.php $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 cronjobs/gforge-db-backup.sh $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	#
-	install -m 755 cronjobs/ftp_create_group_access.php $(CURDIR)/debian/gforge-ftp-proftpd/usr/lib/gforge/bin/
-	#
-	install -m 755 deb-specific/stats_projects_logparse.pl $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 deb-specific/get_news_notapproved.pl $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 deb-specific/install-db.sh $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 deb-specific/db-upgrade.pl $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 644 deb-specific/sqlparser.pm $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/lib/
-	install -m 644 deb-specific/sqlhelper.pm $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/lib/
-	install -m 755 deb-specific/sf-add-skill $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 deb-specific/register-theme $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
-	install -m 755 deb-specific/unregister-theme $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/bin/
+	rm -f $(CURDIR)/debian/$(PACKAGE)-web-apache2/usr/share/*/www/themes/gforge/COPYING
 
-	install -m 755 deb-specific/register-plugin $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	install -m 755 deb-specific/unregister-plugin $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
-	#
-	install -m 644 deb-specific/view_bug.sql      $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 deb-specific/view_patch.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	#
-	install -m 644 db/20021125.sql $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/200212*.sql  $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/2003*.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 755 db/2004*php     $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/2004*.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 755 db/2005*php     $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/2005*.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/2006*.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/timetracking-init.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/20070924-forum-perm.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/20070924-project-perm.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-	install -m 644 db/20070924-artifact-perm.sql    $(CURDIR)/debian/gforge-db-postgresql/usr/lib/gforge/db/
-
-	# 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/
-
-	# gforge-shell-postgresql
-	install -m 755 utils/install-nsspgsql.sh $(CURDIR)/debian/gforge-shell-postgresql/usr/lib/gforge/bin/
-
-	# gforge-ftp-proftpd
-	install -m 755 deb-specific/install-ftp.sh $(CURDIR)/debian/gforge-ftp-proftpd/usr/lib/gforge/bin/
-	install -m 644 deb-specific/sf-proftpd.conf $(CURDIR)/debian/gforge-ftp-proftpd/etc/gforge/
-
-	# gforge-dns-bind9
-	install -m 755 deb-specific/install-dns.sh $(CURDIR)/debian/gforge-dns-bind9/usr/lib/gforge/bin/
-	install -m 644 deb-specific/dns.head.template $(CURDIR)/debian/gforge-dns-bind9/var/lib/gforge/bind/
-	install -m 644 deb-specific/dns.simple.template $(CURDIR)/debian/gforge-dns-bind9/var/lib/gforge/bind/
-	install -m 755 deb-specific/dns_conf.pl $(CURDIR)/debian/gforge-dns-bind9/usr/lib/gforge/bin/
-
-	# gforge-lists-mailman
-	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/
-
 	# Remove Snoopy class from binary packages (provided by libphp-snoopy)
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -name Snoopy.class.php | xargs rm -rf ; done
 
@@ -253,6 +144,7 @@
 	# Also remove uuencoded files
 	for i in $(addprefix $(CURDIR)/debian/,$(shell dh_listpackages)) ; do find $$i -name \*.uu | xargs echo rm ; done
 
+
 binary-indep: build install
 	dh_testdir
 	dh_testroot
@@ -271,7 +163,7 @@
 	#dh_link
 	dh_strip
 	dh_compress
-	#dh_fixperms
+	 dh_fixperms
 	#dh_makeshlibs
 	dh_installdeb
 	#dh_perl

Modified: trunk/gforge/docs/README.KnownBugs
===================================================================
--- trunk/gforge/docs/README.KnownBugs	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/docs/README.KnownBugs	2009-03-24 18:28:48 UTC (rev 7237)
@@ -1,7 +1,7 @@
 Upgrading with 20021216.sql
 	 DBD::Pg::st execute failed: ERROR: Cannot
 	 insert a duplicate key into unique index themes_pkey at
-	 /usr/lib/gforge/bin/db-upgrade.pl
+	 /usr/share/gforge/bin/db-upgrade.pl
 	 Last SQL query was:
 	 INSERT INTO themes (dirname, fullname) SELECT
 	 dirname,fullname FROM themes where theme_id=1;

Modified: trunk/gforge/docs/README.Plugins
===================================================================
--- trunk/gforge/docs/README.Plugins	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/docs/README.Plugins	2009-03-24 18:28:48 UTC (rev 7237)
@@ -132,7 +132,7 @@
 CallHook() method is called from that place.
 
   Registering your plugin is done by providing a
-/usr/lib/gforge/plugins/<pluginname>/include/<pluginname>-init.php.
+/usr/share/gforge/plugins/<pluginname>/include/<pluginname>-init.php.
 It will be parsed by the PluginManager object.  That file should
 contain a call to register_plugin(), passing it an object of the
 appropriate class.  See the helloworld plugin for an example.

Modified: trunk/gforge/docs/docbook/docbook/installation_guide/installation_guide.xml
===================================================================
--- trunk/gforge/docs/docbook/docbook/installation_guide/installation_guide.xml	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/docs/docbook/docbook/installation_guide/installation_guide.xml	2009-03-24 18:28:48 UTC (rev 7237)
@@ -866,7 +866,7 @@
 			<section>
 				<title>Perl</title>
 				<para>If you want to use some of the Perl scripts that access the database, you'll need the <literal>DBI</literal> and <literal>DBD::Pg</literal> Perl modules.  On Red Hat systems (and variants), you can get them by installing the <literal>libdbi</literal> and <literal>libdbd-pgsql</literal> packages.  On Debian systems (and variants), the packages are called <literal>libdbi-perl</literal> and <literal>libdbd-pg-perl</literal>.</para>
-				<para>You'll also need to install <filename>utils/include.pl</filename> to <filename class="directory">/usr/lib/gforge/lib/</filename>, and put some configuration variables into <filename class="directory">/etc/gforge/local.pl</filename>.  In particular, you'll need something like the following in <filename>local.pl</filename>:</para>
+				<para>You'll also need to install <filename>utils/include.pl</filename> to <filename class="directory">/usr/share/gforge/lib/</filename>, and put some configuration variables into <filename class="directory">/etc/gforge/local.pl</filename>.  In particular, you'll need something like the following in <filename>local.pl</filename>:</para>
 <programlisting>
 $sys_default_domain = 'gforge.company.com' ;
 $sys_dbhost = '192.168.12.34' ;

Modified: trunk/gforge/docs/migrating-to-gforge-REPORT.txt
===================================================================
--- trunk/gforge/docs/migrating-to-gforge-REPORT.txt	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/docs/migrating-to-gforge-REPORT.txt	2009-03-24 18:28:48 UTC (rev 7237)
@@ -149,7 +149,7 @@
    ** This of course only needs to be done if Step 5 indicates failure.
 
    # cd /var/lib/gforge/
-   # /usr/lib/gforge/bin/install-db.sh restore sf_dump_for_gforge.ko  
+   # /usr/share/gforge/bin/install-db.sh restore sf_dump_for_gforge.ko  
 
    ** Reinstall the gforge-db-postgresql Debian package (this will bring the
    ** database schema up-to-date.

Modified: trunk/gforge/etc/gforge.conf.example
===================================================================
--- trunk/gforge/etc/gforge.conf.example	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/etc/gforge.conf.example	2009-03-24 18:28:48 UTC (rev 7237)
@@ -32,7 +32,7 @@
 cronolog_path=/usr/bin/cronolog
 sys_sendmail_path=/usr/sbin/sendmail
 sys_path_to_jpgraph=/path/to/jpgraph
-sys_path_to_scmweb=/usr/lib/gforge/bin/
+sys_path_to_scmweb=/usr/share/gforge/bin/
 gforge_chroot=
 gforge_etc=/etc
 sys_custom_path=/path/to/gforge/etc/custom
@@ -44,7 +44,7 @@
 sys_urlroot=/path/to/gforge/www/
 sys_jabber_pass=
 usr_share_gforge=/path/to/gforge
-usr_lib_gforge=/path/to/usr/lib/gforge
+usr_lib_gforge=/path/to/usr/share/gforge
 var_lib_gforge=/path/to/var/lib/gforge
 var_log_gforge=/path/to/var/log/gforge
 sys_show_source=0

Modified: trunk/gforge/etc/httpd.conf.example
===================================================================
--- trunk/gforge/etc/httpd.conf.example	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/etc/httpd.conf.example	2009-03-24 18:28:48 UTC (rev 7237)
@@ -70,7 +70,7 @@
 		Include   /etc/httpd.secrets
 	</Directory>
 
-	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/lib/gforge/plugins/$1/cgi-bin/$2
+	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
 
 	# Projects and Users script
 	<Location /projects>
@@ -132,7 +132,7 @@
 		Include   /etc/httpd.secrets
 	</Directory>
 
-	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/lib/gforge/plugins/$1/cgi-bin/$2
+	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
 
 	# Projects and Users script
 	<Location /projects>

Modified: trunk/gforge/etc/httpd.d/06maindirhttp
===================================================================
--- trunk/gforge/etc/httpd.d/06maindirhttp	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/etc/httpd.d/06maindirhttp	2009-03-24 18:28:48 UTC (rev 7237)
@@ -25,7 +25,7 @@
 		Include   {gforge_etc}/httpd.secrets
 	</Directory>
 
-	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/lib/gforge/plugins/$1/cgi-bin/$2
+	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
 
 	# Projects and Users script
 	<Location /projects>

Modified: trunk/gforge/etc/httpd.d/07maindirhttp.ssl
===================================================================
--- trunk/gforge/etc/httpd.d/07maindirhttp.ssl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/etc/httpd.d/07maindirhttp.ssl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -25,7 +25,7 @@
 		Include   {gforge_etc}/httpd.secrets
 	</Directory>
 
-	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/lib/gforge/plugins/$1/cgi-bin/$2
+	ScriptAliasMatch ^/plugins/([^/]*)/cgi-bin/(.*) /usr/share/gforge/plugins/$1/cgi-bin/$2
 
 	# Projects and Users script
 	<Location /projects>

Modified: trunk/gforge/etc/local.pl.example
===================================================================
--- trunk/gforge/etc/local.pl.example	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/etc/local.pl.example	2009-03-24 18:28:48 UTC (rev 7237)
@@ -9,8 +9,8 @@
 $sys_lists_host = 'lists.gforge.company.com' ;
 $sys_dns1_host = 'ns1.gforge.company.com' ;
 $sys_dns2_host = 'ns2.gforge.company.com' ;
-$FTPINCOMING_DIR = '/usr/lib/gforge/ftp/incoming' ;
-$FTPFILES_DIR = '/usr/lib/gforge/download' ;
+$FTPINCOMING_DIR = '/usr/share/gforge/ftp/incoming' ;
+$FTPFILES_DIR = '/usr/share/gforge/download' ;
 $sys_urlroot='/usr/share/gforge/www/' ;
 $sf_cache_dir = '/var/cache/gforge' ;
 $sys_name = 'MyGForge' ;

Modified: trunk/gforge/etc/templates/local.pl
===================================================================
--- trunk/gforge/etc/templates/local.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/etc/templates/local.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -9,8 +9,8 @@
 $sys_lists_host = '{lists_host}' ;
 $sys_dns1_host = 'ns1.{domain_name}' ;
 $sys_dns2_host = 'ns2.{domain_name}' ;
-$FTPINCOMING_DIR = '/usr/lib/gforge/ftp/incoming' ;
-$FTPFILES_DIR = '/usr/lib/gforge/download' ;
+$FTPINCOMING_DIR = '/usr/share/gforge/ftp/incoming' ;
+$FTPFILES_DIR = '/usr/share/gforge/download' ;
 $sys_urlroot='/usr/share/gforge/www/' ;
 $sf_cache_dir = '/var/cache/gforge' ;
 $sys_name = '{system_name}' ;

Modified: trunk/gforge/plugins/cvstracker/Makefile
===================================================================
--- trunk/gforge/plugins/cvstracker/Makefile	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/cvstracker/Makefile	2009-03-24 18:28:48 UTC (rev 7237)
@@ -8,34 +8,34 @@
 	find | grep "~$$"	
 
 import:
-	cp -rf /usr/lib/gforge/plugins/cvstracker/bin/* bin/ 
-	cp -rf /usr/lib/gforge/plugins/cvstracker/common/* common/
-	cp -rf /usr/lib/gforge/plugins/cvstracker/db/* db/
+	cp -rf /usr/share/gforge/plugins/cvstracker/bin/* bin/ 
+	cp -rf /usr/share/gforge/plugins/cvstracker/common/* common/
+	cp -rf /usr/share/gforge/plugins/cvstracker/db/* db/
 	cp -rf /usr/share/gforge/www/plugins/cvstracker/* www/
 
 install:
-	cp -r bin/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/bin/
-	cp -r common/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/common/
-	cp -r db/* $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/db/
+	cp -r bin/* $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/bin/
+	cp -r common/* $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/common/
+	cp -r db/* $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/db/
 	cp -r etc/* $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/
 	cp -r www/* $(DESTDIR)/usr/share/gforge/www/plugins/$(PLUGIN)/
 	cp -r debian/cron.d /etc/cron.d/gforge-plugin-$(PLUGIN)
 	install -m 0644 httpd.conf $(DESTDIR)/etc/gforge/httpd.d/50$(PLUGIN)
 	find $(DESTDIR)/ -name CVS -type d | xargs rm -rf
-	find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/bin/ -type f | xargs chmod 0755
-	find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/common/ -type f | xargs chmod 0644
-	find $(DESTDIR)/usr/lib/gforge/plugins/$(PLUGIN)/db/ -type f | xargs chmod 0644
+	find $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/bin/ -type f | xargs chmod 0755
+	find $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/common/ -type f | xargs chmod 0644
+	find $(DESTDIR)/usr/share/gforge/plugins/$(PLUGIN)/db/ -type f | xargs chmod 0644
 	find $(DESTDIR)/etc/gforge/plugins/$(PLUGIN)/ -type f | xargs chmod 0644
 	find $(DESTDIR)/usr/share/gforge/www/plugins/$(PLUGIN)/ -type f | xargs chmod 0644
-	/usr/lib/gforge/bin/fill-in-the-blanks.pl \
+	/usr/share/gforge/bin/fill-in-the-blanks.pl \
 	$(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf.tmpl \
 	$(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf \
         $(DESTDIR)/etc/gforge/gforge.conf
 	chmod 0644 $(DESTDIR)/etc/gforge/plugins/cvstracker/cvstracker.conf
-	$(DESTDIR)/usr/lib/gforge/plugins/cvstracker/bin/db-upgrade.pl
-	$(DESTDIR)/usr/lib/gforge/bin/register-plugin cvstracker "cvstracker"	
+	$(DESTDIR)/usr/share/gforge/plugins/cvstracker/bin/db-upgrade.pl
+	$(DESTDIR)/usr/share/gforge/bin/register-plugin cvstracker "cvstracker"	
 
 uninstall:
-	$(DESTDIR)/usr/lib/gforge/plugins/cvstracker/bin/db-delete.pl
-	$(DESTDIR)/usr/lib/gforge/bin/unregister-plugin cvstracker "cvstracker"  
+	$(DESTDIR)/usr/share/gforge/plugins/cvstracker/bin/db-delete.pl
+	$(DESTDIR)/usr/share/gforge/bin/unregister-plugin cvstracker "cvstracker"  
 	rm -f /etc/cron.d/gforge-plugin-$(PLUGIN)

Modified: trunk/gforge/plugins/cvstracker/rpm-specific/cron.d/gforge-plugin-cvstracker
===================================================================
(Binary files differ)

Modified: trunk/gforge/plugins/eirc/bin/db-delete.pl
===================================================================
--- trunk/gforge/plugins/eirc/bin/db-delete.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/eirc/bin/db-delete.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,8 +26,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;

Modified: trunk/gforge/plugins/externalsearch/bin/db-delete.pl
===================================================================
--- trunk/gforge/plugins/externalsearch/bin/db-delete.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/externalsearch/bin/db-delete.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,8 +26,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;

Modified: trunk/gforge/plugins/externalsearch/bin/db-upgrade.pl
===================================================================
--- trunk/gforge/plugins/externalsearch/bin/db-upgrade.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/externalsearch/bin/db-upgrade.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,8 +26,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;
@@ -48,7 +48,7 @@
     $version = &get_db_version ;
     $target = "0.1" ;
     if (is_lesser $version, $target) {
-	my @filelist = ( "/usr/lib/gforge/plugins/$pluginname/lib/$pluginname-init.sql" ) ;
+	my @filelist = ( "/usr/share/gforge/plugins/$pluginname/lib/$pluginname-init.sql" ) ;
 	
 	foreach my $file (@filelist) {
 	    debug "Processing $file" ;

Modified: trunk/gforge/plugins/fckeditor/README
===================================================================
--- trunk/gforge/plugins/fckeditor/README	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/fckeditor/README	2009-03-24 18:28:48 UTC (rev 7237)
@@ -9,7 +9,7 @@
 
 Installation:
 
-- files from common/ go to /usr/lib/gforge/plugins/fckeditor/common
+- files from common/ go to /usr/share/gforge/plugins/fckeditor/common
 
 Setup:
 

Modified: trunk/gforge/plugins/ldapextauth/README
===================================================================
--- trunk/gforge/plugins/ldapextauth/README	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/ldapextauth/README	2009-03-24 18:28:48 UTC (rev 7237)
@@ -10,15 +10,15 @@
 Installation:
 
 - files from etc/ go to /etc/gforge/plugins/ldapextauth
-- files from bin/ go to /usr/lib/gforge/plugins/ldapextauth/bin
-- files from include/ go to /usr/lib/gforge/plugins/ldapextauth/include
+- files from bin/ go to /usr/share/gforge/plugins/ldapextauth/bin
+- files from include/ go to /usr/share/gforge/plugins/ldapextauth/include
 
 Setup:
 
 - customise files in /etc/gforge/plugins/ldapextauth to match your
 LDAP installation (server, base DN, and mapping)
-- /usr/lib/gforge/plugins/ldapextauth/bin/db-upgrade.pl
-- /usr/lib/gforge/bin/register-plugin ldapextauth "LDAP external authentication"
+- /usr/share/gforge/plugins/ldapextauth/bin/db-upgrade.pl
+- /usr/share/gforge/bin/register-plugin ldapextauth "LDAP external authentication"
 
 Voilà, you can now log into Gforge with your existing loginname and
 password.  Your account will be created the first time you log in

Modified: trunk/gforge/plugins/ldapextauth/bin/db-delete.pl
===================================================================
--- trunk/gforge/plugins/ldapextauth/bin/db-delete.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/ldapextauth/bin/db-delete.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,8 +26,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;

Modified: trunk/gforge/plugins/ldapextauth/bin/db-upgrade.pl
===================================================================
--- trunk/gforge/plugins/ldapextauth/bin/db-upgrade.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/ldapextauth/bin/db-upgrade.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,8 +26,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;
@@ -51,7 +51,7 @@
     $target = "1.0" ;
     if (is_lesser $version, $target) {
 	my @filelist = (
-			# "/usr/lib/gforge/plugins/$pluginname/lib/$pluginname-init.sql",
+			# "/usr/share/gforge/plugins/$pluginname/lib/$pluginname-init.sql",
 			) ;
 	
 	foreach my $file (@filelist) {

Modified: trunk/gforge/plugins/mediawiki/bin/db-delete.pl
===================================================================
--- trunk/gforge/plugins/mediawiki/bin/db-delete.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/mediawiki/bin/db-delete.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -26,8 +26,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;

Modified: trunk/gforge/plugins/mediawiki/bin/db-upgrade.pl
===================================================================
--- trunk/gforge/plugins/mediawiki/bin/db-upgrade.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/mediawiki/bin/db-upgrade.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -28,8 +28,8 @@
 sub debug ( $ ) ;
 sub parse_sql_file ( $ ) ;
 
-require ("/usr/lib/gforge/lib/include.pl") ; # Include a few predefined functions 
-require ("/usr/lib/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
+require ("/usr/share/gforge/lib/include.pl") ; # Include a few predefined functions 
+require ("/usr/share/gforge/lib/sqlparser.pm") ; # Our magic SQL parser
 
 debug "You'll see some debugging info during this installation." ;
 debug "Do not worry unless told otherwise." ;
@@ -50,7 +50,7 @@
     $version = &get_db_version ;
     $target = "0.1" ;
     if (is_lesser $version, $target) {
-	my @filelist = ( "/usr/lib/gforge/plugins/$pluginname/lib/$pluginname-init.sql" ) ;
+	my @filelist = ( "/usr/share/gforge/plugins/$pluginname/lib/$pluginname-init.sql" ) ;
 	
 	foreach my $file (@filelist) {
 	    debug "Processing $file" ;

Modified: trunk/gforge/plugins/quota_management/cronjobs/quota_update.pl
===================================================================
--- trunk/gforge/plugins/quota_management/cronjobs/quota_update.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/quota_management/cronjobs/quota_update.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -15,7 +15,7 @@
 use DBI;
 use Quota;
 
-require("/usr/lib/gforge/lib/include.pl");
+require("/usr/share/gforge/lib/include.pl");
 
 my $BLOCK_SIZE=$ENV{'BLOCK_SIZE'} || 1024;
 
@@ -61,4 +61,4 @@
 
 ### Main ###
 &db_connect;
-&update_quota;
\ No newline at end of file
+&update_quota;

Modified: trunk/gforge/plugins/scmccase/README
===================================================================
--- trunk/gforge/plugins/scmccase/README	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/scmccase/README	2009-03-24 18:28:48 UTC (rev 7237)
@@ -11,9 +11,9 @@
 Installation:
 
 - files from etc/ go to /etc/gforge/plugins/scmsvn
-- files from bin/ go to /usr/lib/gforge/plugins/scmsvn/bin
-- files from common/ go to /usr/lib/gforge/plugins/scmsvn/common
-- files from db/ go to  /usr/lib/gforge/plugins/scmsvn/db
+- files from bin/ go to /usr/share/gforge/plugins/scmsvn/bin
+- files from common/ go to /usr/share/gforge/plugins/scmsvn/common
+- files from db/ go to  /usr/share/gforge/plugins/scmsvn/db
 
 Setup:
 
@@ -21,8 +21,8 @@
 preferences (Clear Case server, and whether to enable Clear Case by
 default for new projects)
 - setup the crontab from debian/cron.d
-- /usr/lib/gforge/plugins/scmsvn/bin/db-upgrade.pl
-- /usr/lib/gforge/bin/register-plugin scmccase "Clear Case"
+- /usr/share/gforge/plugins/scmsvn/bin/db-upgrade.pl
+- /usr/share/gforge/bin/register-plugin scmccase "Clear Case"
 
  -- Roland Mas <lolando at debian.org>, Tue May 18 22:14:38 2004
 

Modified: trunk/gforge/plugins/svntracker/README
===================================================================
--- trunk/gforge/plugins/svntracker/README	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/svntracker/README	2009-03-24 18:28:48 UTC (rev 7237)
@@ -33,17 +33,17 @@
 
 1.2.1 Install the database
 	You'll find this file within this package. Just run it without parameters.
-        /usr/lib/gforge/plugins/svntracker/bin/db-upgrade.pl
+        /usr/share/gforge/plugins/svntracker/bin/db-upgrade.pl
 
 1.2.2 Register the plugin
 	You'll find the script register-plugin with your current Gforge installation. 
 Use it in the following way.
-        /usr/lib/gforge/bin/register-plugin svntracker "svntracker"
+        /usr/share/gforge/bin/register-plugin svntracker "svntracker"
 
 1.2.3 Install the cron file
    	You should install a cron file in /etc/cron.d/gforge-plugin-svntracker like this:
 
-   35 1 * * * root [ -x /usr/lib/gforge/plugins/svntracker/bin/update_postcommit.php ] && /usr/lib/gforge/plugins/svntracker/bin/update_postcommit.php -d include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include
+   35 1 * * * root [ -x /usr/share/gforge/plugins/svntracker/bin/update_postcommit.php ] && /usr/share/gforge/plugins/svntracker/bin/update_postcommit.php -d include_path=/etc/gforge:/usr/share/gforge/:/usr/share/gforge/www/include
 
 1.2.4 Configure the plugin
 

Modified: trunk/gforge/plugins/svntracker/rpm-specific/cron.d/gforge-plugin-svntracker
===================================================================
--- trunk/gforge/plugins/svntracker/rpm-specific/cron.d/gforge-plugin-svntracker	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/plugins/svntracker/rpm-specific/cron.d/gforge-plugin-svntracker	2009-03-24 18:28:48 UTC (rev 7237)
@@ -1,7 +1,7 @@
 
 # Change path to the GForge directory.
 GFORGE="/usr/share/gforge"
-GFORGE_PLUGINS="/usr/lib/gforge/plugins"
+GFORGE_PLUGINS="/usr/share/gforge/plugins"
 
 # Change paths to the GForge directory.
 # Don't reference $GFORGE because this won't work!
@@ -14,4 +14,4 @@
 #
 #       Updates the loginfo files to include CVS Tracker
 #
-30 * * * * root $PHP $GFORGE_PLUGINS/svntracker/bin/update_postcommit.php
\ No newline at end of file
+30 * * * * root $PHP $GFORGE_PLUGINS/svntracker/bin/update_postcommit.php

Modified: trunk/gforge/rpm-specific/conf/gforge.conf
===================================================================
--- trunk/gforge/rpm-specific/conf/gforge.conf	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/rpm-specific/conf/gforge.conf	2009-03-24 18:28:48 UTC (rev 7237)
@@ -27,7 +27,7 @@
 cgidir=/usr/local/gforge/cgi-bin
 cronolog_path=/usr/sbin/cronolog
 sys_path_to_jpgraph=/var/www/jpgraph/
-sys_path_to_scmweb=/usr/lib/gforge/plugins/scmcvs/cgi-bin
+sys_path_to_scmweb=/usr/share/gforge/plugins/scmcvs/cgi-bin
 gforge_chroot=/var/lib/gforge/chroot
 gforge_etc=/etc/gforge
 sys_custom_path=/etc/gforge/custom
@@ -80,6 +80,6 @@
 sys_project_reg_restricted=true
 sys_user_reg_restricted=false
 sys_localinc=/etc/gforge/local.inc
-sys_plugins_path=/usr/lib/gforge/plugins/
+sys_plugins_path=/usr/share/gforge/plugins/
 sys_sslcrt=
 sys_sslkey=

Modified: trunk/gforge/setup
===================================================================
--- trunk/gforge/setup	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/setup	2009-03-24 18:28:48 UTC (rev 7237)
@@ -52,7 +52,7 @@
 	DEFAULTcronolog_path=$(findcronolog)
 	DEFAULTsys_sendmail_path=$(findsendmail)
 	DEFAULTsys_path_to_jpgraph=/usr/share/jpgraph/
-	DEFAULTsys_path_to_scmweb=/usr/lib/gforge/bin/
+	DEFAULTsys_path_to_scmweb=/usr/share/gforge/bin/
 	DEFAULTgforge_chroot=$CHROOT
 	DEFAULTgforge_etc=$ETCDIR
 	DEFAULTsys_custom_path=$ETCDIR/custom
@@ -463,14 +463,14 @@
 			shift
 			ETCDIR=/etc/gforge
 			ETCTEMPLATEDIR=/usr/share/gforge/etc
-			BINDIR=/usr/lib/gforge/bin
-			CGIDIR=/usr/lib/gforge/cgi-bin
+			BINDIR=/usr/share/gforge/bin
+			CGIDIR=/usr/share/gforge/cgi-bin
 			GFGDIR=''
 			HOMEPATH=/home/users
 			GROUPPATH=/home/groups
 			CHROOT=/var/lib/gforge/chroot
 			SHAREDIR=/usr/share/gforge
-			LIBDIR=/usr/lib/gforge
+			LIBDIR=/usr/share/gforge
 			CONFFILEOUTDIR=/etc/gforge
 			CONFFILEIN=/etc/gforge/gforge.conf
 			CONFFILEOUT=/etc/gforge/gforge.conf

Modified: trunk/gforge/utils/install-apache.sh
===================================================================
--- trunk/gforge/utils/install-apache.sh	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/utils/install-apache.sh	2009-03-24 18:28:48 UTC (rev 7237)
@@ -87,7 +87,7 @@
 PHP_ETC_LIST="$RESULT"
 export APACHE_ETC_LIST GFORGE_ETC_LIST PHP_ETC_LIST
 
-[ -z "$gforgebin" ] && gforgebin="/usr/lib/gforge/bin"
+[ -z "$gforgebin" ] && gforgebin="/usr/share/gforge/bin"
 set $GFORGE_ETC_LIST
 gforgeconffile=$1
 echo Using $gforgeconffile

Modified: trunk/gforge/utils/ldap/sql2ldif.pl
===================================================================
--- trunk/gforge/utils/ldap/sql2ldif.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/utils/ldap/sql2ldif.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -9,7 +9,7 @@
 use DBI;
 
 #require("base64.pl");  # Include all the predefined functions
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 $chroot="/var/lib/gforge/chroot";
 &db_connect;
 

Modified: trunk/gforge/utils/underworld-dummy/dns_conf.pl
===================================================================
--- trunk/gforge/utils/underworld-dummy/dns_conf.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/utils/underworld-dummy/dns_conf.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -3,7 +3,7 @@
 use DBI;
 use POSIX qw(strftime);
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 &db_connect;
 

Modified: trunk/gforge/utils/underworld-dummy/dump_database.pl
===================================================================
--- trunk/gforge/utils/underworld-dummy/dump_database.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/utils/underworld-dummy/dump_database.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -4,7 +4,7 @@
 #		     scripts can process it without needing to access the database.
 use DBI;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 my $user_array = ();
 my $group_array = ();

Modified: trunk/gforge/utils/underworld-dummy/ssh_dump.pl
===================================================================
--- trunk/gforge/utils/underworld-dummy/ssh_dump.pl	2009-03-24 18:25:59 UTC (rev 7236)
+++ trunk/gforge/utils/underworld-dummy/ssh_dump.pl	2009-03-24 18:28:48 UTC (rev 7237)
@@ -4,7 +4,7 @@
 #
 use DBI;
 
-require("/usr/lib/gforge/lib/include.pl");  # Include all the predefined functions
+require("/usr/share/gforge/lib/include.pl");  # Include all the predefined functions
 
 my $ssh_array = ();
 




More information about the Fusionforge-commits mailing list